diff options
author | tony baldwin <tonybaldwin@gmx.com> | 2012-03-21 01:36:23 -0400 |
---|---|---|
committer | tony baldwin <tonybaldwin@gmx.com> | 2012-03-21 01:36:23 -0400 |
commit | e5c29fcc786cee73c08247824cb87e9ed65a2c36 (patch) | |
tree | 1e5a6fcf5ba20e5effdd60e6d6ffa5fadb11d9d7 /library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js | |
parent | cf17606d0f6200296b1e6d67f9ae3fb797e0df69 (diff) | |
parent | b4a2dae0850ed72b61b008e44efa98f300ccd640 (diff) | |
download | volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.gz volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.tar.bz2 volse-hubzilla-e5c29fcc786cee73c08247824cb87e9ed65a2c36.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js')
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js | 22 |
1 files changed, 19 insertions, 3 deletions
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 5f7755f18..eaa7c7713 100755..100644 --- 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) {
// Register commands
ed.addCommand('mceStyleProps', function() {
+
+ var applyStyleToBlocks = false;
+ var blocks = ed.selection.getSelectedBlocks();
+ var styles = [];
+
+ if (blocks.length === 1) {
+ styles.push(ed.selection.getNode().style.cssText);
+ }
+ else {
+ tinymce.each(blocks, function(block) {
+ styles.push(ed.dom.getAttrib(block, 'style'));
+ });
+ applyStyleToBlocks = true;
+ }
+
ed.windowManager.open({
file : url + '/props.htm',
width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
- height : 320 + parseInt(ed.getLang('style.delta_height', 0)),
+ height : 340 + parseInt(ed.getLang('style.delta_height', 0)),
inline : 1
}, {
+ applyStyleToBlocks : applyStyleToBlocks,
plugin_url : url,
- style_text : ed.selection.getNode().style.cssText
+ styles : styles
});
});
@@ -52,4 +68,4 @@ // Register plugin
tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
-})();
\ No newline at end of file +})();
|