Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tinymce
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sigfried Arnold
tinymce
Commits
0a1c30ef
Commit
0a1c30ef
authored
9 years ago
by
Stefan Galinski
Browse files
Options
Downloads
Patches
Plain Diff
[BUGFIX] editor not loaded in IE11
Fixes: #65567
parent
c8feee41
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Classes/Loader.php
+8
-2
8 additions, 2 deletions
Classes/Loader.php
Contrib/WeakMap/WeakMap.js
+46
-0
46 additions, 0 deletions
Contrib/WeakMap/WeakMap.js
Resources/Public/JavaScript/Loader.js
+1
-1
1 addition, 1 deletion
Resources/Public/JavaScript/Loader.js
with
55 additions
and
3 deletions
Classes/Loader.php
+
8
−
2
View file @
0a1c30ef
...
...
@@ -52,7 +52,7 @@ class Loader {
*
* @var array
*/
protected
$tinymceConfiguration
=
array
()
;
protected
$tinymceConfiguration
=
[]
;
/**
* Initialization flag
...
...
@@ -166,6 +166,9 @@ class Loader {
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Contrib/tinymce/tinymce.min.js'
;
$output
=
'<script type="text/javascript" src="'
.
$script
.
'"></script>'
;
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Contrib/WeakMap/WeakMap.js'
;
$output
.
=
'<script type="text/javascript" src="'
.
$script
.
'"></script>'
;
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Contrib/MutationObserver/MutationObserver.js'
;
$output
.
=
'<script type="text/javascript" src="'
.
$script
.
'"></script>'
;
...
...
@@ -200,6 +203,9 @@ class Loader {
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Contrib/MutationObserver/MutationObserver.js'
;
$pageRenderer
->
addJsLibrary
(
'MutationObserver'
,
$script
,
'text/javascript'
,
FALSE
,
TRUE
,
''
,
TRUE
);
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Contrib/WeakMap/WeakMap.js'
;
$pageRenderer
->
addJsLibrary
(
'WeakMap'
,
$script
,
'text/javascript'
,
FALSE
,
TRUE
,
''
,
TRUE
);
$script
=
$GLOBALS
[
'BACK_PATH'
]
.
$pathToTinyMceExtension
.
'Resources/Public/JavaScript/Loader.js'
;
$pageRenderer
->
addJsFile
(
$script
,
'text/javascript'
,
FALSE
,
TRUE
,
''
,
TRUE
);
...
...
@@ -214,7 +220,7 @@ class Loader {
* @return array
*/
protected
function
prepareTinyMCEConfiguration
(
$configuration
)
{
$configurationArray
=
array
()
;
$configurationArray
=
[]
;
// try to resolve a potential TYPO3 file path
$configurationFile
=
GeneralUtility
::
getFileAbsFileName
(
$configuration
);
...
...
This diff is collapsed.
Click to expand it.
Contrib/WeakMap/WeakMap.js
0 → 100644
+
46
−
0
View file @
0a1c30ef
/*
* Copyright 2012 The Polymer Authors. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/
if
(
typeof
WeakMap
===
'
undefined
'
)
{
(
function
()
{
var
defineProperty
=
Object
.
defineProperty
;
var
counter
=
Date
.
now
()
%
1
e9
;
var
WeakMap
=
function
()
{
this
.
name
=
'
__st
'
+
(
Math
.
random
()
*
1
e9
>>>
0
)
+
(
counter
++
+
'
__
'
);
};
WeakMap
.
prototype
=
{
set
:
function
(
key
,
value
)
{
var
entry
=
key
[
this
.
name
];
if
(
entry
&&
entry
[
0
]
===
key
)
entry
[
1
]
=
value
;
else
defineProperty
(
key
,
this
.
name
,
{
value
:
[
key
,
value
],
writable
:
true
});
return
this
;
},
get
:
function
(
key
)
{
var
entry
;
return
(
entry
=
key
[
this
.
name
])
&&
entry
[
0
]
===
key
?
entry
[
1
]
:
undefined
;
},
delete
:
function
(
key
)
{
var
entry
=
key
[
this
.
name
];
if
(
!
entry
)
return
false
;
var
hasValue
=
entry
[
0
]
===
key
;
entry
[
0
]
=
entry
[
1
]
=
undefined
;
return
hasValue
;
},
has
:
function
(
key
)
{
var
entry
=
key
[
this
.
name
];
if
(
!
entry
)
return
false
;
return
entry
[
0
]
===
key
;
}
};
window
.
WeakMap
=
WeakMap
;
})();
}
This diff is collapsed.
Click to expand it.
Resources/Public/JavaScript/Loader.js
+
1
−
1
View file @
0a1c30ef
...
...
@@ -32,7 +32,7 @@ SG.TinyMceLoader = function(tinymce, options) {
return
console
.
error
(
'
Couldn
\'
t load dependency tinyMCE, break here.
'
);
}
if
(
!
MutationObserver
)
{
if
(
!
window
.
MutationObserver
)
{
return
console
.
error
(
'
Couldn
\'
t load dependency MutationObserver, break here.
'
)
}
...
...
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