ckeditor 3.4.2 → 3.4.3.pre

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/panel/plugin.js

@@ -31,7 +31,7 @@ CKEDITOR.ui.panel = function( document, definition )
 			css : []
 		});
 
-	this.id = CKEDITOR.tools.getNextNumber();
+	this.id = CKEDITOR.tools.getNextId();
 	this.document = document;
 
 	this._ =
@@ -73,7 +73,7 @@ CKEDITOR.ui.panel.prototype =
 	 */
 	render : function( editor, output )
 	{
-		var id = 'cke_' + this.id;
+		var id = this.id;
 
 		output.push(
 			'<div class="', editor.skinClass ,'"' +
@@ -130,7 +130,7 @@ CKEDITOR.ui.panel.prototype =
 		{
 			if ( this.forceIFrame || this.css.length )
 			{
-				var iframe = this.document.getById( 'cke_' + this.id + '_frame' ),
+				var iframe = this.document.getById( this.id + '_frame' ),
 					parentDiv = iframe.getParent(),
 					dir = parentDiv.getAttribute( 'dir' ),
 					className = parentDiv.getParent().getAttribute( 'class' ),
@@ -170,10 +170,11 @@ CKEDITOR.ui.panel.prototype =
 				// Register the CKEDITOR global.
 				win.$.CKEDITOR = CKEDITOR;
 
-				doc.on( 'keydown', function( evt )
+				// Arrow keys for scrolling is only preventable with 'keypress' event in Opera (#4534).
+				doc.on( 'key' + ( CKEDITOR.env.opera? 'press':'down' ), function( evt )
 					{
 						var keystroke = evt.data.getKeystroke(),
-							dir = this.document.getById( 'cke_' + this.id ).getAttribute( 'dir' );
+							dir = this.document.getById( this.id ).getAttribute( 'dir' );
 
 						// Delegate key processing to block.
 						if ( this._.onKeyDown && this._.onKeyDown( keystroke ) === false )
@@ -186,7 +187,7 @@ CKEDITOR.ui.panel.prototype =
 						if ( keystroke == 27 || keystroke == ( dir == 'rtl' ? 39 : 37 ) )
 						{
 							if ( this.onEscape && this.onEscape( keystroke ) === false )
-								evt.data.preventDefault( );
+								evt.data.preventDefault();
 						}
 					},
 					this );
@@ -195,7 +196,7 @@ CKEDITOR.ui.panel.prototype =
 				holder.unselectable();
 			}
 			else
-				holder = this.document.getById( 'cke_' + this.id );
+				holder = this.document.getById( this.id );
 
 			this._.holder = holder;
 		}
@@ -225,7 +226,7 @@ CKEDITOR.ui.panel.prototype =
 			block = blocks[ name ],
 			current = this._.currentBlock,
 			holder = this.forceIFrame ?
-				this.document.getById( 'cke_' + this.id + '_frame' )
+				this.document.getById( this.id + '_frame' )
 				: this._.holder;
 
 		// Disable context menu for block panel.
@@ -317,7 +318,7 @@ CKEDITOR.ui.panel.block = CKEDITOR.tools.createClass(
 
 			// Safari need focus on the iframe window first(#3389), but we need
 			// lock the blur to avoid hiding the panel.
-			if ( CKEDITOR.env.webkit )
+			if ( CKEDITOR.env.webkit || CKEDITOR.env.opera )
 				item.getDocument().getWindow().focus();
 			item.focus();
 

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/panelbutton/plugin.js

@@ -113,7 +113,7 @@ CKEDITOR.UI_PANELBUTTON = 4;
 							me.onOpen();
 					};
 
-				panel.onHide = function()
+				panel.onHide = function( preventOnClose )
 					{
 						if ( me.className )
 							this.element.getFirst().removeClass( me.className + '_panel' );
@@ -122,7 +122,7 @@ CKEDITOR.UI_PANELBUTTON = 4;
 
 						_.on = 0;
 
-						if ( me.onClose )
+						if ( !preventOnClose && me.onClose )
 							me.onClose();
 					};
 

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/pastefromword/filter/default.js

@@ -118,7 +118,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		return result;
 	};
 
-	var cssLengthRelativeUnit = /^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
+	var cssLengthRelativeUnit = /^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
 	var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/;		// e.g. 0px 0pt 0px
 
 	var listBaseIndent = 0,
@@ -219,7 +219,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									{
 										// Be able to deal with component/short-hand form style.
 										var values = margin.split( ' ' );
-										margin = values[ 3 ] || values[ 1 ] || values [ 0 ];
+										margin = CKEDITOR.plugins.pastefromword.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
 										margin = parseInt( margin, 10 );
 
 										// Figure out the indent unit by looking at the first increament.

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/popup/plugin.js

@@ -54,7 +54,7 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 			popupWindow.focus();
 			popupWindow.location.href = url;
 		}
-		catch (e)
+		catch ( e )
 		{
 			popupWindow = window.open( url, null, options, true );
 		}

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/removeformat/plugin.js

@@ -35,7 +35,7 @@ CKEDITOR.plugins.removeformat =
 					( editor._.removeAttributes = editor.config.removeFormatAttributes.split( ',' ) );
 
 				var filter = CKEDITOR.plugins.removeformat.filter;
-				var ranges = editor.getSelection().getRanges( true ),
+				var ranges = editor.getSelection().getRanges( 1 ),
 					iterator = ranges.createIterator(),
 					range;
 
@@ -50,8 +50,8 @@ CKEDITOR.plugins.removeformat =
 					var bookmark = range.createBookmark();
 
 					// The style will be applied within the bookmark boundaries.
-					var startNode	= bookmark.startNode;
-					var endNode		= bookmark.endNode;
+					var startNode	= bookmark.startNode,
+						endNode		= bookmark.endNode;
 
 					// We need to check the selection boundaries (bookmark spans) to break
 					// the code in a way that we can properly remove partially selected nodes.
@@ -66,8 +66,8 @@ CKEDITOR.plugins.removeformat =
 					var breakParent = function( node )
 					{
 						// Let's start checking the start boundary.
-						var path = new CKEDITOR.dom.elementPath( node );
-						var pathElements = path.elements;
+						var path = new CKEDITOR.dom.elementPath( node ),
+							pathElements = path.elements;
 
 						for ( var i = 1, pathElement ; pathElement = pathElements[ i ] ; i++ )
 						{
@@ -103,7 +103,7 @@ CKEDITOR.plugins.removeformat =
 						{
 							// Remove elements nodes that match with this style rules.
 							if ( tagsRegex.test( currentNode.getName() ) )
-								currentNode.remove( true );
+								currentNode.remove( 1 );
 							else
 							{
 								currentNode.removeAttributes( removeAttributes );

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/resize/plugin.js

@@ -83,9 +83,9 @@ CKEDITOR.plugins.add( 'resize',
 					if ( event.data.space == 'bottom' )
 					{
 						var direction = '';
-						if ( resizeHorizontal && !resizeVertical)
+						if ( resizeHorizontal && !resizeVertical )
 							direction = ' cke_resizer_horizontal';
-						if ( !resizeHorizontal && resizeVertical)
+						if ( !resizeHorizontal && resizeVertical )
 							direction = ' cke_resizer_vertical';
 
 						event.data.html += '<div class="cke_resizer' + direction + '"' +

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/richcombo/plugin.js

@@ -239,7 +239,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 						me.onOpen();
 				};
 
-			panel.onHide = function()
+			panel.onHide = function( preventOnClose )
 				{
 					if ( me.className )
 						this.element.getFirst().removeClass( me.className + '_panel' );
@@ -248,7 +248,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 
 					me._.on = 0;
 
-					if ( me.onClose )
+					if ( !preventOnClose && me.onClose )
 						me.onClose();
 				};
 

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/scayt/dialogs/options.js

@@ -11,44 +11,49 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 		tags = [],
 		i,
 		contents = [],
-		userDicActive = false,
+		userDicActive = 0,
 		dic_buttons = [
 			// [0] contains buttons for creating
 			"dic_create,dic_restore",
 			// [1] contains buton for manipulation
 			"dic_rename,dic_delete"
 		],
-		optionsIds= [ 'mixedCase','mixedWithDigits','allCaps','ignoreDomainNames' ];
+		optionsIds = [ 'mixedCase', 'mixedWithDigits', 'allCaps', 'ignoreDomainNames' ];
 
 	// common operations
 
-	function getBOMAllOptions () {
+	function getBOMAllOptions()
+	{
 		 return document.forms.optionsbar["options"];
 	}
-	function getBOMAllLangs () {
+	function getBOMAllLangs()
+	{
 		 return document.forms.languagesbar["scayt_lang"];
 	}
 
-	function setCheckedValue(radioObj, newValue) {
-		if (!radioObj)
+	function setCheckedValue( radioObj, newValue )
+	{
+		if ( !radioObj )
 			return;
 		var radioLength = radioObj.length;
-		if (radioLength == undefined) {
-			radioObj.checked = (radioObj.value == newValue.toString());
+		if ( radioLength == undefined )
+		{
+			radioObj.checked = radioObj.value == newValue.toString();
 			return;
 		}
-		for (var i = 0; i < radioLength; i++) {
+		for ( var i = 0; i < radioLength; i++ )
+		{
 			radioObj[i].checked = false;
-			if (radioObj[i].value == newValue.toString()) {
+			if ( radioObj[i].value == newValue.toString() )
 				radioObj[i].checked = true;
-			}
 		}
 	}
 
+	var lang = editor.lang.scayt;
 	var tags_contents =  [
 				{
 					id : 'options',
-					label : editor.lang.scayt.optionsTab,
+					label : lang.optionsTab,
 					elements : [
 						{
 							type : 'html',
@@ -77,7 +82,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 				},
 				{
 					id : 'langs',
-					label : editor.lang.scayt.languagesTab,
+					label : lang.languagesTab,
 					elements : [
 						{
 							type : 'html',
@@ -92,7 +97,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 				},
 				{
 					id : 'dictionaries',
-					label : editor.lang.scayt.dictionariesTab,
+					label : lang.dictionariesTab,
 					elements : [
 						{
 							type : 'html',
@@ -123,7 +128,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 				},
 				{
 					id : 'about',
-					label : editor.lang.scayt.aboutTab,
+					label : lang.aboutTab,
 					elements : [
 						{
 							type : 'html',
@@ -136,7 +141,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 			];
 
 	var dialogDefiniton = {
-		title : editor.lang.scayt.title,
+		title : lang.title,
 		minWidth : 360,
 		minHeight : 220,
 		onShow : function()
@@ -183,10 +188,10 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 		onCancel: function()
 		{
 			var o = getBOMAllOptions();
-			for (i in o)
+			for ( var i in o )
 				o[i].checked = false;
 
-			setCheckedValue(getBOMAllLangs(),"");
+			setCheckedValue( getBOMAllLangs(), "" );
 		},
 		contents : contents
 	};
@@ -195,20 +200,20 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 
 	tags = CKEDITOR.plugins.scayt.uiTabs;
 
-	for ( i in tags )
+	for ( var i in tags )
 	{
 		if ( tags[ i ] == 1 )
 			contents[ contents.length ] = tags_contents[ i ];
 	}
 	if ( tags[2] == 1 )
-		userDicActive = true;
+		userDicActive = 1;
 
 
 	var init_with_captions = function()
 	{
 		var dialog = this,
 			lang_list = dialog.data.scayt.getLangList(),
-			buttons = [ 'dic_create','dic_delete','dic_rename','dic_restore' ],
+			buttons = [ 'dic_create', 'dic_delete', 'dic_rename', 'dic_restore' ],
 			labels = optionsIds,
 			i;
 
@@ -282,9 +287,9 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 		};
 
 		var langList = [];
-		if (tags[1] ==1 )
+		if ( tags[1] ==1 )
 		{
-			for ( i in lang_list.rtl )
+			for ( var i in lang_list.rtl )
 				langList[ langList.length ] = createOption( i, lang_list.ltr );
 
 			for ( i in lang_list.ltr )
@@ -314,15 +319,15 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 			var err_massage = captions["err_dic_create"];
 			var suc_massage = captions["succ_dic_create"];
 
-			window.scayt.createUserDictionary(dic_name,
-				function(arg)
+			window.scayt.createUserDictionary( dic_name,
+				function( arg )
 				{
 					hide_dic_buttons ( all_buttons );
 					display_dic_buttons ( dic_buttons[1] );
 					suc_massage = suc_massage.replace("%s" , arg.dname );
 					dic_success_message (suc_massage);
 				},
-				function(arg)
+				function( arg )
 				{
 					err_massage = err_massage.replace("%s" ,arg.dname );
 					dic_error_message ( err_massage + "( "+ (arg.message || "") +")");
@@ -336,14 +341,14 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 			// try to rename dictionary
 			var err_massage = captions["err_dic_rename"] || "";
 			var suc_massage = captions["succ_dic_rename"] || "";
-			window.scayt.renameUserDictionary(dic_name,
-				function(arg)
+			window.scayt.renameUserDictionary( dic_name,
+				function( arg )
 					{
 						suc_massage = suc_massage.replace("%s" , arg.dname );
 						set_dic_name( dic_name );
 						dic_success_message ( suc_massage );
 					},
-				function(arg)
+				function( arg )
 					{
 						err_massage = err_massage.replace("%s" , arg.dname  );
 						set_dic_name( dic_name );
@@ -351,7 +356,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 					});
 		};
 
-		dic.dic_delete = function ( el, dic_name , dic_buttons )
+		dic.dic_delete = function( el, dic_name , dic_buttons )
 		{
 			var all_buttons = dic_buttons[0] + ',' + dic_buttons[1];
 			var err_massage = captions["err_dic_delete"];
@@ -359,7 +364,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 
 			// try to delete dictionary
 			window.scayt.deleteUserDictionary(
-				function(arg)
+				function( arg )
 				{
 					suc_massage = suc_massage.replace("%s" , arg.dname );
 					hide_dic_buttons ( all_buttons );
@@ -367,14 +372,14 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 					set_dic_name( "" ); // empty input field
 					dic_success_message( suc_massage );
 				},
-				function(arg)
+				function( arg )
 				{
 					err_massage = err_massage.replace("%s" , arg.dname );
 					dic_error_message(err_massage);
 				});
 		};
 
-		dic.dic_restore = dialog.dic_restore || function ( el, dic_name , dic_buttons )
+		dic.dic_restore = dialog.dic_restore || function( el, dic_name , dic_buttons )
 			{
 				// try to restore existing dictionary
 				var all_buttons = dic_buttons[0] + ',' + dic_buttons[1];
@@ -382,14 +387,14 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 				var suc_massage = captions["succ_dic_restore"];
 
 				window.scayt.restoreUserDictionary(dic_name,
-					function(arg)
+					function( arg )
 					{
 						suc_massage = suc_massage.replace("%s" , arg.dname );
 						hide_dic_buttons ( all_buttons );
 						display_dic_buttons(dic_buttons[1]);
 						dic_success_message( suc_massage );
 					},
-					function(arg)
+					function( arg )
 					{
 						err_massage = err_massage.replace("%s" , arg.dname );
 						dic_error_message( err_massage );
@@ -408,7 +413,9 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 				var el = id = ev.data.getTarget().getParent();
 				var id = el.getId();
 				dic[ id ].apply( null, [ el, dic_name, dic_buttons ] );
-			}catch(err){
+			}
+			catch(err)
+			{
 				dic_error_message(" Dictionary error. ");
 			}
 
@@ -431,7 +438,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 	{
 		var dialog = this;
 		// for enabled options tab
-		if (tags[0] == 1){
+		if ( tags[0] == 1 ){
 			var opto = getBOMAllOptions();
 
 			// Animate options.
@@ -466,8 +473,8 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 		//for enabled languages tab
 		if ( tags[1] == 1 )
 		{
-			var domLang = doc.getById("cke_option"+dialog.sLang);
-			setCheckedValue(domLang.$,dialog.sLang);
+			var domLang = doc.getById("cke_option" + dialog.sLang);
+			setCheckedValue( domLang.$,dialog.sLang );
 		}
 
 		// * user dictionary
@@ -487,7 +494,7 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 						display_dic_buttons( dic_buttons[0] );
 
 				},
-				function ()
+				function()
 				{
 					doc.getById( 'dic_name' ).setValue("");
 				});
@@ -496,35 +503,29 @@ CKEDITOR.dialog.add( 'scaytcheck', function( editor )
 
 	};
 
-	function dic_error_message ( m )
+	function dic_error_message( m )
 	{
 		doc.getById('dic_message').setHtml('<span style="color:red;">' + m + '</span>' );
 	}
-	function dic_success_message ( m )
+	function dic_success_message( m )
 	{
 		doc.getById('dic_message').setHtml('<span style="color:blue;">' + m + '</span>') ;
 	}
-	function display_dic_buttons ( sIds )
+	function display_dic_buttons( sIds )
 	{
-
 		sIds = String( sIds );
 		var aIds = sIds.split(',');
 		for ( var i=0, l = aIds.length; i < l ; i+=1)
-		{
 			doc.getById( aIds[i] ).$.style.display = "inline";
-		}
-
 	}
-	function hide_dic_buttons ( sIds )
+	function hide_dic_buttons( sIds )
 	{
 		sIds = String( sIds );
 		var aIds = sIds.split(',');
 		for ( var i = 0, l = aIds.length; i < l ; i += 1 )
-		{
 			doc.getById( aIds[i] ).$.style.display = "none";
-		}
 	}
-	function set_dic_name ( dic_name )
+	function set_dic_name( dic_name )
 	{
 		doc.getById('dic_name').$.value= dic_name;
 	}