git-svn-id: https://develop.svn.wordpress.org/trunk@29458 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2014-08-09 20:55:34 +00:00
parent e23c1ae3ff
commit f8fed596ec
20 changed files with 459 additions and 240 deletions
+12 -1
View File
@@ -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
}