mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-11 12:20:22 +00:00
TinyMCE: update to 4.1.3, changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt, fixes #29166
git-svn-id: https://develop.svn.wordpress.org/trunk@29458 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
(function() {
|
||||
var menuCtrl;
|
||||
|
||||
module("tinymce.plugins.ImportCSS", {
|
||||
setupModule: function() {
|
||||
QUnit.stop();
|
||||
@@ -16,6 +18,11 @@
|
||||
},
|
||||
|
||||
teardown: function() {
|
||||
if (menuCtrl) {
|
||||
menuCtrl.remove();
|
||||
menuCtrl = null;
|
||||
}
|
||||
|
||||
editor.contentCSS = [];
|
||||
delete editor.settings.importcss_file_filter;
|
||||
delete editor.settings.importcss_merge_classes;
|
||||
@@ -26,8 +33,12 @@
|
||||
});
|
||||
|
||||
function fireFormatsMenuEvent(styleSheets, items) {
|
||||
menuCtrl = tinymce.ui.Factory.create('menu', {
|
||||
items: items
|
||||
}).renderTo(document.getElementById('view'));
|
||||
|
||||
return editor.fire('renderFormatsMenu', {
|
||||
control: tinymce.ui.Factory.create('menu', {items: items}).renderTo(document.getElementById('view')),
|
||||
control: menuCtrl,
|
||||
doc: {
|
||||
styleSheets: styleSheets
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user