ckeditor 3.4.2 → 3.4.3.pre

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

@@ -15,7 +15,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				// clear loading wait text.
 				container.setHtml( '' );
 
-				for ( var i = 0 ; i < templatesDefinitions.length ; i++ )
+				for ( var i = 0, totalDefs = templatesDefinitions.length ; i < totalDefs ; i++ )
 				{
 					var definition = CKEDITOR.getTemplates( templatesDefinitions[ i ] ),
 						imagesPath = definition.imagesPath,
@@ -44,7 +44,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				var html = '<table style="width:350px;" class="cke_tpl_preview" role="presentation"><tr>';
 
 				if ( template.image && imagesPath )
-					html += '<td class="cke_tpl_preview_img"><img src="' + CKEDITOR.getUrl( imagesPath + template.image ) + '"' + ( CKEDITOR.env.ie6Compat? ' onload="this.width=this.width"' : '' ) + ' alt="" title=""></td>';
+					html += '<td class="cke_tpl_preview_img"><img src="' + CKEDITOR.getUrl( imagesPath + template.image ) + '"' + ( CKEDITOR.env.ie6Compat ? ' onload="this.width=this.width"' : '' ) + ' alt="" title=""></td>';
 
 				html += '<td style="white-space:normal;"><span class="cke_tpl_title">' + template.title + '</span><br/>';
 
@@ -80,12 +80,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						// Place the cursor at the first editable place.
 						var range = new CKEDITOR.dom.range( editor.document );
 						range.moveToElementEditStart( editor.document.getBody() );
-						range.select( true );
-						setTimeout( function ()
+						range.select( 1 );
+						setTimeout( function()
 						{
 							editor.fire( 'saveSnapshot' );
 						}, 0 );
-					} );
+					});
 
 					editor.fire( 'saveSnapshot' );
 					editor.setData( html );
@@ -146,7 +146,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 			var listContainer;
 
-			var templateListLabelId = 'cke_tpl_list_label_' + CKEDITOR.tools.getNextNumber();
+			var templateListLabelId = 'cke_tpl_list_label_' + CKEDITOR.tools.getNextNumber(),
+				lang = editor.lang.templates,
+				config = editor.config;
 			return {
 				title :editor.lang.templates.title,
 
@@ -157,7 +159,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				[
 					{
 						id :'selectTpl',
-						label : editor.lang.templates.title,
+						label : lang.title,
 						elements :
 						[
 							{
@@ -169,24 +171,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 										type : 'html',
 										html :
 											'<span>'  +
-												editor.lang.templates.selectPromptMsg +
+												lang.selectPromptMsg +
 											'</span>'
 									},
 									{
-										id : "templatesList",
+										id : 'templatesList',
 										type : 'html',
 										focus: true,
 										html :
 											'<div class="cke_tpl_list" tabIndex="-1" role="listbox" aria-labelledby="' + templateListLabelId+ '">' +
 												'<div class="cke_tpl_loading"><span></span></div>' +
 											'</div>' +
-											'<span class="cke_voice_label" id="' + templateListLabelId + '">' + editor.lang.templates.options+ '</span>'
+											'<span class="cke_voice_label" id="' + templateListLabelId + '">' + lang.options+ '</span>'
 									},
 									{
 										id : 'chkInsertOpt',
 										type : 'checkbox',
-										label : editor.lang.templates.insertOption,
-										'default' : editor.config.templates_replaceContent
+										label : lang.insertOption,
+										'default' : config.templates_replaceContent
 									}
 								]
 							}
@@ -201,9 +203,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					var templatesListField = this.getContentElement( 'selectTpl' , 'templatesList' );
 					listContainer = templatesListField.getElement();
 
-					CKEDITOR.loadTemplates( editor.config.templates_files, function()
+					CKEDITOR.loadTemplates( config.templates_files, function()
 						{
-							var templates = editor.config.templates.split( ',' );
+							var templates = ( config.templates || 'default' ).split( ',' );
 
 							if ( templates.length )
 							{
@@ -214,7 +216,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							{
 								listContainer.setHtml(
 									'<div class="cke_tpl_empty">' +
-										'<span>' + editor.lang.templates.emptyListMsg + '</span>' +
+										'<span>' + lang.emptyListMsg + '</span>' +
 									'</div>' );
 							}
 						});
@@ -222,7 +224,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					this._.element.on( 'keydown', keyNavigation );
 				},
 
-				onHide : function ()
+				onHide : function()
 				{
 					this._.element.removeListener( 'keydown', keyNavigation );
 				}

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

@@ -42,7 +42,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		var toLoad = [];
 
 		// Look for pending template files to get loaded.
-		for ( var i = 0 ; i < templateFiles.length ; i++ )
+		for ( var i = 0, count = templateFiles.length ; i < count ; i++ )
 		{
 			if ( !loadedTemplatesFiles[ templateFiles[ i ] ] )
 			{
@@ -51,7 +51,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			}
 		}
 
-		if ( toLoad.length > 0 )
+		if ( toLoad.length )
 			CKEDITOR.scriptLoader.load( toLoad, callback );
 		else
 			setTimeout( callback, 0 );
@@ -68,7 +68,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example
  * config.templates = 'my_templates';
  */
-CKEDITOR.config.templates = 'default';
 
 /**
  * The list of templates definition files to load.

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

@@ -157,7 +157,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					{
 						editor.toolbox = new toolbox();
 
-						var labelId = 'cke_' + CKEDITOR.tools.getNextNumber();
+						var labelId = CKEDITOR.tools.getNextId();
 
 						var output = [ '<div class="cke_toolbox" role="toolbar" aria-labelledby="', labelId, '"' ],
 							expanded =  editor.config.toolbarStartupExpanded !== false,
@@ -187,7 +187,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 							if ( !row )
 								continue;
 
-							var toolbarId = 'cke_' + CKEDITOR.tools.getNextNumber(),
+							var toolbarId = CKEDITOR.tools.getNextId(),
 								toolbarObj = { id : toolbarId, items : [] };
 
 							if ( groupStarted )
@@ -283,25 +283,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								function()
 								{
 									editor.execCommand( 'toolbarCollapse' );
-								} );
+								});
 
 							editor.on( 'destroy', function () {
 									CKEDITOR.tools.removeFunction( collapserFn );
-								} );
+								});
 
-							var collapserId = 'cke_' + CKEDITOR.tools.getNextNumber();
+							var collapserId = CKEDITOR.tools.getNextId();
 
 							editor.addCommand( 'toolbarCollapse',
 								{
 									exec : function( editor )
 									{
-										var collapser = CKEDITOR.document.getById( collapserId );
-										var toolbox = collapser.getPrevious();
-										var contents = editor.getThemeSpace( 'contents' );
-										var toolboxContainer = toolbox.getParent();
-										var contentHeight = parseInt( contents.$.style.height, 10 );
-										var previousHeight = toolboxContainer.$.offsetHeight;
-										var collapsed = !toolbox.isVisible();
+										var collapser = CKEDITOR.document.getById( collapserId ),
+											toolbox = collapser.getPrevious(),
+											contents = editor.getThemeSpace( 'contents' ),
+											toolboxContainer = toolbox.getParent(),
+											contentHeight = parseInt( contents.$.style.height, 10 ),
+											previousHeight = toolboxContainer.$.offsetHeight,
+											collapsed = !toolbox.isVisible();
 
 										if ( !collapsed )
 										{

data/lib/generators/ckeditor/base/templates/ckeditor/_source/plugins/uicolor/lang/he.js

@@ -0,0 +1,15 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'he',
+{
+	uicolor :
+	{
+		title : 'בחירת צבע ממשק משתמש',
+		preview : 'תצוגה מקדימה',
+		config : 'הדבק את הטקסט הבא לתוך הקובץ config.js',
+		predefined : 'קבוצות צבעים מוגדרות מראש'
+	}
+});

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

@@ -6,7 +6,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 CKEDITOR.plugins.add( 'uicolor',
 {
 	requires : [ 'dialog' ],
-	lang : [ 'en' ],
+	lang : [ 'en', 'he' ],
 
 	init : function( editor )
 	{

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

@@ -133,7 +133,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			editor.on( 'updateSnapshot', function()
 			{
 				if ( undoManager.currentImage && new Image( editor ).equals( undoManager.currentImage ) )
-					setTimeout( function () { undoManager.update(); }, 0 );
+					setTimeout( function() { undoManager.update(); }, 0 );
 			});
 		}
 	});
@@ -339,7 +339,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			 */
 			this.index = -1;
 
-			this.limit = this.editor.config.undoStackSize;
+			this.limit = this.editor.config.undoStackSize || 20;
 
 			this.currentImage = null;
 
@@ -545,7 +545,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example
  * config.undoStackSize = 50;
  */
-CKEDITOR.config.undoStackSize = 20;
 
 /**
  * Fired when the editor is about to save an undo snapshot. This event can be

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

@@ -14,7 +14,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	var nonExitableElementNames = { table:1,pre:1 };
 
 	// Matching an empty paragraph at the end of document.
-	var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\1>)?(?=\s*$|<\/body>)/gi;
+	var emptyParagraphRegexp = /(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
 
 	var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
 
@@ -92,6 +92,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				var marker = this.document.getById( 'cke_paste_marker' );
 				marker.scrollIntoView();
 				marker.remove();
+				marker = null;
 			}
 
 			CKEDITOR.tools.setTimeout( function()
@@ -132,14 +133,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				// Remove the original contents.
 				range.deleteContents();
 
-				clone = !i && element || element.clone( true );
+				clone = !i && element || element.clone( 1 );
 
 				// If we're inserting a block at dtd-violated position, split
 				// the parent blocks until we reach blockLimit.
 				var current, dtd;
 				if ( isBlock )
 				{
-					while ( ( current = range.getCommonAncestor( false, true ) )
+					while ( ( current = range.getCommonAncestor( 0, 1 ) )
 							&& ( dtd = CKEDITOR.dtd[ current.getName() ] )
 							&& !( dtd && dtd [ elementName ] ) )
 					{
@@ -530,7 +531,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 						CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor );
 
-						domWindow	= editor.window		= new CKEDITOR.dom.window( domWindow );
+						domWindow	= editor.window	= new CKEDITOR.dom.window( domWindow );
 						domDocument	= editor.document	= new CKEDITOR.dom.document( domDocument );
 
 						domDocument.on( 'dblclick', function( evt )
@@ -542,7 +543,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						});
 
 						// Gecko/Webkit need some help when selecting control type elements. (#3448)
-						if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) )
+						if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
 						{
 							domDocument.on( 'mousedown', function( ev )
 							{
@@ -625,6 +626,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								editor.focusManager.blur();
 							});
 
+						var wasFocused;
+
 						domWindow.on( 'focus', function()
 							{
 								var doc = editor.document;
@@ -633,6 +636,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									blinkCursor();
 								else if ( CKEDITOR.env.opera )
 									doc.getBody().focus();
+								// Webkit needs focus for the first time on the HTML element. (#6153)
+								else if ( CKEDITOR.env.webkit )
+								{
+									if ( !wasFocused )
+									{
+										editor.document.getDocumentElement().focus();
+										wasFocused = 1;
+									}
+								}
 
 								editor.focusManager.focus();
 							});
@@ -873,9 +885,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								if ( editor.dataProcessor )
 									data = editor.dataProcessor.toDataFormat( data, fixForBody );
 
-								// Strip the last blank paragraph within document.
+								// Reset empty if the document contains only one empty paragraph.
 								if ( config.ignoreEmptyParagraph )
-									data = data.replace( emptyParagraphRegexp, '' );
+									data = data.replace( emptyParagraphRegexp, function( match, lookback ) { return lookback; } );
 
 								if ( docType )
 									data = docType + '\n' + data;
@@ -930,6 +942,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 								// Temporary solution caused by #6025, supposed be unified by #6154.
 								else if ( CKEDITOR.env.opera && editor.document )
 								{
+									// Required for Opera when switching focus
+									// from another iframe, e.g. panels. (#6444)
+									var iframe = editor.window.$.frameElement;
+									iframe.blur(), iframe.focus();
 									editor.document.getBody().focus();
 
 									editor.selectionChange();
@@ -952,7 +968,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			var titleBackup;
 			// Setting voice label as window title, backup the original one
 			// and restore it before running into use.
-			editor.on( 'contentDom', function ()
+			editor.on( 'contentDom', function()
 				{
 					var title = editor.document.getElementsByTag( 'title' ).getItem( 0 );
 					title.setAttribute( '_cke_title', editor.document.$.title );
@@ -970,6 +986,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' );
 				editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' );
 			}
+			// Set the HTML style to 100% to have the text cursor in affect (#6341)
+			else if ( CKEDITOR.env.gecko )
+				editor.addCss( 'html { height: 100% !important; }' );
 
 			// Switch on design mode for a short while and close it after then.
 			function blinkCursor( retry )
@@ -978,10 +997,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					function()
 					{
 						editor.document.$.designMode = 'on';
-						setTimeout( function ()
+						setTimeout( function()
 						{
 							editor.document.$.designMode = 'off';
-							editor.document.getBody().focus();
+							if ( CKEDITOR.currentInstance == editor )
+								editor.document.getBody().focus();
 						}, 50 );
 					},
 					function()
@@ -1043,7 +1063,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	// Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
 	if ( CKEDITOR.env.gecko )
 	{
-		( function ()
+		(function()
 		{
 			var body = document.body;
 

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/skins/kama/dialog.css

@@ -239,6 +239,32 @@ body .cke_dialog
 	padding: 1px 0px;
 }
 
+/* Opera/IE doesn't leave enough padding in text input for cursor to blink in RTL. (#6087) */
+.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_text,
+.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_text,
+.cke_skin_kama .cke_browser_ie.cke_rtl input.cke_dialog_ui_input_password,
+.cke_skin_kama .cke_browser_opera.cke_rtl input.cke_dialog_ui_input_password
+{
+	padding-right: 2px;
+}
+
+/* Compensate the padding added above on container. */
+.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text,
+.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_text,
+.cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_password,
+.cke_skin_kama .cke_browser_opera.cke_rtl div.cke_dialog_ui_input_password
+{
+	padding-left: 2px;
+}
+
+.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_vbox_child,
+.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_child,
+.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_first,
+.cke_skin_kama .cke_browser_ie.cke_rtl .cke_dialog_ui_hbox_last
+{
+	padding-right: 2px !important;
+}
+
 .cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text {
 	padding-right: 1px;
 }