radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/docprops/plugin.js

@@ -0,0 +1,22 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add( 'docprops',
+{
+	init : function( editor )
+	{
+		var cmd = new CKEDITOR.dialogCommand( 'docProps' );
+		// Only applicable on full page mode.
+		cmd.modes = { wysiwyg : editor.config.fullPage };
+		editor.addCommand( 'docProps', cmd );
+		CKEDITOR.dialog.add( 'docProps', this.path + 'dialogs/docprops.js' );
+
+		editor.ui.addButton( 'DocProps',
+		{
+			label : editor.lang.docprops.label,
+			command : 'docProps'
+		});
+	}
+});

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/domiterator/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -20,17 +20,29 @@ CKEDITOR.plugins.add( 'domiterator' );
 			return;
 
 		this.range = range;
-		this.forceBrBreak = false;
+		this.forceBrBreak = 0;
 
 		// Whether include <br>s into the enlarged range.(#3730).
-		this.enlargeBr = true;
-		this.enforceRealBlocks = false;
+		this.enlargeBr = 1;
+		this.enforceRealBlocks = 0;
 
 		this._ || ( this._ = {} );
 	}
 
 	var beginWhitespaceRegex = /^[\r\n\t ]+$/,
-		isBookmark = CKEDITOR.dom.walker.bookmark();
+		// Ignore bookmark nodes.(#3783)
+		bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true ),
+		whitespacesGuard = CKEDITOR.dom.walker.whitespaces( true ),
+		skipGuard = function( node ) { return bookmarkGuard( node ) && whitespacesGuard( node ); };
+
+	// Get a reference for the next element, bookmark nodes are skipped.
+	function getNextSourceNode( node, startFromSibling, lastNode )
+	{
+		var next = node.getNextSourceNode( startFromSibling, null, lastNode );
+		while ( !bookmarkGuard( next ) )
+			next = next.getNextSourceNode( startFromSibling, null, lastNode );
+		return next;
+	}
 
 	iterator.prototype = {
 		getNextParagraph : function( blockTag )
@@ -44,6 +56,9 @@ CKEDITOR.plugins.add( 'domiterator' );
 			// Indicats that the current element in the loop is the last one.
 			var isLast;
 
+			// Indicate at least one of the range boundaries is inside a preformat block.
+			var touchPre;
+
 			// Instructs to cleanup remaining BRs.
 			var removePreviousBr, removeLastBr;
 
@@ -51,7 +66,14 @@ CKEDITOR.plugins.add( 'domiterator' );
 			if ( !this._.lastNode )
 			{
 				range = this.range.clone();
-				range.enlarge( this.forceBrBreak || !this.enlargeBr ?
+
+				// Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).
+				range.shrink( CKEDITOR.NODE_ELEMENT, true );
+
+				touchPre = range.endContainer.hasAscendant( 'pre', true )
+					|| range.startContainer.hasAscendant( 'pre', true );
+
+				range.enlarge( this.forceBrBreak && !touchPre || !this.enlargeBr ?
 							   CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
 				var walker = new CKEDITOR.dom.walker( range ),
@@ -70,7 +92,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 				// next block.(#3887)
 				if ( this._.lastNode &&
 						this._.lastNode.type == CKEDITOR.NODE_TEXT &&
-						!CKEDITOR.tools.trim( this._.lastNode.getText( ) ) &&
+						!CKEDITOR.tools.trim( this._.lastNode.getText() ) &&
 						this._.lastNode.getParent().isBlockBoundary() )
 				{
 					var testRange = new CKEDITOR.dom.range( range.document );
@@ -102,12 +124,13 @@ CKEDITOR.plugins.add( 'domiterator' );
 			{
 				// closeRange indicates that a paragraph boundary has been found,
 				// so the range can be closed.
-				var closeRange = false;
+				var closeRange = 0,
+					parentPre = currentNode.hasAscendant( 'pre' );
 
 				// includeNode indicates that the current node is good to be part
 				// of the range. By default, any non-element node is ok for it.
 				var includeNode = ( currentNode.type != CKEDITOR.NODE_ELEMENT ),
-					continueFromSibling = false;
+					continueFromSibling = 0;
 
 				// If it is an element node, let's check if it can be part of the
 				// range.
@@ -115,12 +138,13 @@ CKEDITOR.plugins.add( 'domiterator' );
 				{
 					var nodeName = currentNode.getName();
 
-					if ( currentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )
+					if ( currentNode.isBlockBoundary( this.forceBrBreak &&
+							!parentPre && { br : 1 } ) )
 					{
 						// <br> boundaries must be part of the range. It will
 						// happen only if ForceBrBreak.
 						if ( nodeName == 'br' )
-							includeNode = true;
+							includeNode = 1;
 						else if ( !range && !currentNode.getChildCount() && nodeName != 'hr' )
 						{
 							// If we have found an empty block, and haven't started
@@ -142,7 +166,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 								this._.nextNode = currentNode;
 						}
 
-						closeRange = true;
+						closeRange = 1;
 					}
 					else
 					{
@@ -159,7 +183,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 							currentNode = currentNode.getFirst();
 							continue;
 						}
-						includeNode = true;
+						includeNode = 1;
 					}
 				}
 				else if ( currentNode.type == CKEDITOR.NODE_TEXT )
@@ -167,7 +191,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// Ignore normal whitespaces (i.e. not including &nbsp; or
 					// other unicode whitespaces) before/after a block node.
 					if ( beginWhitespaceRegex.test( currentNode.getText() ) )
-						includeNode = false;
+						includeNode = 0;
 				}
 
 				// The current node is good to be part of the range and we are
@@ -185,21 +209,25 @@ CKEDITOR.plugins.add( 'domiterator' );
 				// to close the range, otherwise we include the parent within it.
 				if ( range && !closeRange )
 				{
-					while ( !currentNode.getNext() && !isLast )
+					while ( !currentNode.getNext( skipGuard ) && !isLast )
 					{
 						var parentNode = currentNode.getParent();
 
-						if ( parentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )
+						if ( parentNode.isBlockBoundary( this.forceBrBreak
+								&& !parentPre && { br : 1 } ) )
 						{
-							closeRange = true;
+							closeRange = 1;
+							includeNode = 0;
 							isLast = isLast || ( parentNode.equals( lastNode) );
+							// Make sure range includes bookmarks at the end of the block. (#7359)
+							range.setEndAt( parentNode, CKEDITOR.POSITION_BEFORE_END );
 							break;
 						}
 
 						currentNode = parentNode;
-						includeNode = true;
+						includeNode = 1;
 						isLast = ( currentNode.equals( lastNode ) );
-						continueFromSibling = true;
+						continueFromSibling = 1;
 					}
 				}
 
@@ -207,31 +235,13 @@ CKEDITOR.plugins.add( 'domiterator' );
 				if ( includeNode )
 					range.setEndAt( currentNode, CKEDITOR.POSITION_AFTER_END );
 
-				currentNode = currentNode.getNextSourceNode( continueFromSibling, null, lastNode );
+				currentNode = getNextSourceNode ( currentNode, continueFromSibling, lastNode );
 				isLast = !currentNode;
 
 				// We have found a block boundary. Let's close the range and move out of the
 				// loop.
-				if ( ( closeRange || isLast ) && range )
-				{
-					var boundaryNodes = range.getBoundaryNodes(),
-						startPath = new CKEDITOR.dom.elementPath( range.startContainer );
-
-					// Drop the range if it only contains bookmark nodes, and is
-					// not because of the original collapsed range. (#4087,#4450)
-					if ( boundaryNodes.startNode.getParent().equals( startPath.blockLimit )
-						 && isBookmark( boundaryNodes.startNode ) && isBookmark( boundaryNodes.endNode ) )
-					{
-						range = null;
-						this._.nextNode = null;
-					}
-					else
+				if ( isLast || ( closeRange && range ) )
 						break;
-				}
-
-				if ( isLast )
-					break;
-
 			}
 
 			// Now, based on the processed range, look for (or create) the block to be returned.
@@ -245,7 +255,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					return null;
 				}
 
-				startPath = new CKEDITOR.dom.elementPath( range.startContainer );
+				var startPath = new CKEDITOR.dom.elementPath( range.startContainer );
 				var startBlockLimit = startPath.blockLimit,
 					checkLimits = { div : 1, th : 1, td : 1 };
 				block = startPath.block;
@@ -261,15 +271,15 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// Create the fixed block.
 					block = this.range.document.createElement( blockTag || 'p' );
 
-					// Move the contents of the temporary range to the fixed block.
-					range.extractContents().appendTo( block );
-					block.trim();
+						// Move the contents of the temporary range to the fixed block.
+						range.extractContents().appendTo( block );
+						block.trim();
 
-					// Insert the fixed block into the DOM.
-					range.insertNode( block );
+						// Insert the fixed block into the DOM.
+						range.insertNode( block );
 
-					removePreviousBr = removeLastBr = true;
-				}
+						removePreviousBr = removeLastBr = true;
+					}
 				else if ( block.getName() != 'li' )
 				{
 					// If the range doesn't includes the entire contents of the
@@ -302,8 +312,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// the current range, which could be an <li> child (nested
 					// lists) or the next sibling <li>.
 
-					this._.nextNode = ( block.equals( lastNode ) ? null :
-						range.getBoundaryNodes().endNode.getNextSourceNode( true, null, lastNode ) );
+					this._.nextNode = ( block.equals( lastNode ) ? null : getNextSourceNode( range.getBoundaryNodes().endNode, 1, lastNode ) );
 				}
 			}
 
@@ -321,9 +330,6 @@ CKEDITOR.plugins.add( 'domiterator' );
 
 			if ( removeLastBr )
 			{
-				// Ignore bookmark nodes.(#3783)
-				var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
-
 				var lastChild = block.getLast();
 				if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )
 				{
@@ -341,7 +347,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 			if ( !this._.nextNode )
 			{
 				this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
-					block.getNextSourceNode( true, null, lastNode );
+					getNextSourceNode( block, 1, lastNode );
 			}
 
 			return block;

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/editingblock/plugin.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -10,11 +10,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 (function()
 {
-	var getMode = function( editor, mode )
-	{
-		return editor._.modes && editor._.modes[ mode || editor.mode ];
-	};
-
 	// This is a semaphore used to avoid recursive calls between
 	// the following data handling functions.
 	var isHandlingData;
@@ -49,7 +44,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						function setData()
 						{
 							isHandlingData = true;
-							getMode( editor ).loadData( editor.getData() );
+							editor.getMode().loadData( editor.getData() );
 							isHandlingData = false;
 						}
 
@@ -59,8 +54,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						{
 							editor.on( 'mode', function()
 								{
-									setData();
-									editor.removeListener( 'mode', arguments.callee );
+									if ( editor.mode )
+									{
+										setData();
+										editor.removeListener( 'mode', arguments.callee );
+									}
 								});
 						}
 					}
@@ -71,7 +69,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					if ( !isHandlingData && editor.mode )
 					{
 						isHandlingData = true;
-						editor.setData( getMode( editor ).getData() );
+						editor.setData( editor.getMode().getData(), null, 1 );
 						isHandlingData = false;
 					}
 				});
@@ -79,13 +77,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			editor.on( 'getSnapshot', function( event )
 				{
 					if ( editor.mode )
-						event.data = getMode( editor ).getSnapshotData();
+						event.data = editor.getMode().getSnapshotData();
 				});
 
 			editor.on( 'loadSnapshot', function( event )
 				{
 					if ( editor.mode )
-						getMode( editor ).loadSnapshotData( event.data );
+						editor.getMode().loadSnapshotData( event.data );
 				});
 
 			// For the first "mode" call, we'll also fire the "instanceReady"
@@ -95,6 +93,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					// Do that once only.
 					event.removeListener();
 
+					// Redirect the focus into editor for webkit. (#5713)
+					CKEDITOR.env.webkit && editor.container.on( 'focus', function()
+						{
+							editor.focus();
+						});
+
 					if ( editor.config.startupFocus )
 						editor.focus();
 
@@ -104,8 +108,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					setTimeout( function(){
 						editor.fireOnce( 'instanceReady' );
 						CKEDITOR.fire( 'instanceReady', null, editor );
-					} );
+					}, 0 );
 				});
+
+			editor.on( 'destroy', function ()
+			{
+				// ->		currentMode.unload( holderElement );
+				if ( this.mode )
+					this._.modes[ this.mode ].unload( this.getThemeSpace( 'contents' ) );
+			});
 		}
 	});
 
@@ -140,6 +151,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	 */
 	CKEDITOR.editor.prototype.setMode = function( mode )
 	{
+		this.fire( 'beforeSetMode', { newMode : mode } );
+
 		var data,
 			holderElement = this.getThemeSpace( 'contents' ),
 			isDirty = this.checkDirty();
@@ -152,7 +165,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 			this.fire( 'beforeModeUnload' );
 
-			var currentMode = getMode( this );
+			var currentMode = this.getMode();
 			data = currentMode.getData();
 			currentMode.unload( holderElement );
 			this.mode = '';
@@ -161,7 +174,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		holderElement.setHtml( '' );
 
 		// Load required mode.
-		var modeEditor = getMode( this, mode );
+		var modeEditor = this.getMode( mode );
 		if ( !modeEditor )
 			throw '[CKEDITOR.editor.setMode] Unknown mode "' + mode + '".';
 
@@ -177,12 +190,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		modeEditor.load( holderElement, ( typeof data ) != 'string'  ? this.getData() : data);
 	};
 
+	/**
+	 * Gets the current or any of the objects that represent the editing
+	 * area modes. The two most common editing modes are "wysiwyg" and "source".
+	 * @param {String} [mode] The mode to be retrieved. If not specified, the
+	 *		current one is returned.
+	 */
+	CKEDITOR.editor.prototype.getMode = function( mode )
+	{
+		return this._.modes && this._.modes[ mode || this.mode ];
+	};
+
 	/**
 	 * Moves the selection focus to the editing are space in the editor.
 	 */
 	CKEDITOR.editor.prototype.focus = function()
 	{
-		var mode = getMode( this );
+		this.forceNextSelectionCheck();
+		var mode = this.getMode();
 		if ( mode )
 			mode.focus();
 	};
@@ -200,12 +225,12 @@ CKEDITOR.config.startupMode = 'wysiwyg';
 
 /**
  * Sets whether the editor should have the focus when the page loads.
+ * @name CKEDITOR.config.startupFocus
  * @type Boolean
  * @default false
  * @example
  * config.startupFocus = true;
  */
-CKEDITOR.config.startupFocus = false;
 
 /**
  * Whether to render or not the editing block area in the editor interface.
@@ -222,3 +247,23 @@ CKEDITOR.config.editingBlock = true;
  * @event
  * @param {CKEDITOR.editor} editor The editor instance that has been created.
  */
+
+/**
+ * Fired when the CKEDITOR instance is created, fully initialized and ready for interaction.
+ * @name CKEDITOR.editor#instanceReady
+ * @event
+ */
+
+/**
+ * Fired before changing the editing mode.
+ * @name CKEDITOR.editor#beforeModeUnload
+ * @event
+ */
+
+ /**
+ * Fired before the editor mode is set.
+ * @name CKEDITOR.editor#beforeSetMode
+ * @event
+ * @since 3.5.3
+ * @param {String} newMode The name of the mode which is about to be set.
+ */