update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / style / editor_plugin_src.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
index 5f7755f1840afafe0170d115335c567c2a5ecaa4..eaa7c7713adaf4a1f85c620c00cbafc10e85fd6e 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
@@ -13,14 +13,30 @@
                init : function(ed, url) {\r
                        // Register commands\r
                        ed.addCommand('mceStyleProps', function() {\r
+\r
+                               var applyStyleToBlocks = false;\r
+                               var blocks = ed.selection.getSelectedBlocks();\r
+                               var styles = [];\r
+\r
+                               if (blocks.length === 1) {\r
+                                       styles.push(ed.selection.getNode().style.cssText);\r
+                               }\r
+                               else {\r
+                                       tinymce.each(blocks, function(block) {\r
+                                               styles.push(ed.dom.getAttrib(block, 'style'));\r
+                                       });\r
+                                       applyStyleToBlocks = true;\r
+                               }\r
+\r
                                ed.windowManager.open({\r
                                        file : url + '/props.htm',\r
                                        width : 480 + parseInt(ed.getLang('style.delta_width', 0)),\r
-                                       height : 320 + parseInt(ed.getLang('style.delta_height', 0)),\r
+                                       height : 340 + parseInt(ed.getLang('style.delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
+                                       applyStyleToBlocks : applyStyleToBlocks,\r
                                        plugin_url : url,\r
-                                       style_text : ed.selection.getNode().style.cssText\r
+                                       styles : styles\r
                                });\r
                        });\r
 \r
@@ -52,4 +68,4 @@
 \r
        // Register plugin\r
        tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);\r
-})();
\ No newline at end of file
+})();\r