Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
1cded1d1
Commit
1cded1d1
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-696: fix an issue with tinymce and Firefox 17
parent
31e2804b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/webapp/static/js/functions.js
+8
-7
8 additions, 7 deletions
src/main/webapp/static/js/functions.js
src/main/webapp/static/js/js.plugins.min.js
+1
-1
1 addition, 1 deletion
src/main/webapp/static/js/js.plugins.min.js
with
9 additions
and
8 deletions
src/main/webapp/static/js/functions.js
+
8
−
7
View file @
1cded1d1
...
...
@@ -245,19 +245,20 @@ function b_initEmPxFactor() {
function
o_getMainWin
()
{
try
{
if
(
window
.
opener
&&
window
.
opener
.
OPOL
)
{
// use the opener when opener window is an OpenOLAT window
return
window
.
opener
;
}
else
if
(
window
.
OPOL
)
{
if
(
window
.
OPOL
)
{
// other cases the current window is the main window
return
window
;
}
}
else
if
(
window
.
opener
&&
window
.
opener
.
OPOL
)
{
// use the opener when opener window is an OpenOLAT window
return
window
.
opener
;
}
}
catch
(
e
)
{
if
(
o_info
.
debug
)
{
// add webbrowser console log
o_logerr
(
'
Exception while getting main window. rror::"
'
+
showerror
(
e
));
}
if
(
B_AjaxLogger
.
isDebugEnabled
())
{
// add ajax logger
B_AjaxLogger
.
logDebug
(
'
Exception while getting main window. rror::"
'
+
showerror
(
e
),
"
functions.js
"
);
if
(
console
)
{
// add ajax logger
console
.
log
(
'
Exception while getting main window. rror::"
'
+
showerror
(
e
),
"
functions.js
"
);
console
.
log
(
e
);
}
}
throw
"
Can not find main OpenOLAT window
"
;
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/static/js/js.plugins.min.js
+
1
−
1
View file @
1cded1d1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment