Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

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
+})();