RubyGems - radiant-ck_editor_filter-extension - Versions diffs - 0.2.0 → 0.2.1 - Mend

radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

Files changed (531) hide show

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/popup/plugin.js CHANGED Viewed

@@ -1,9 +1,9 @@
 /*
-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
 */
-CKEDITOR.plugins.add( 'popup');
+CKEDITOR.plugins.add( 'popup' );
 CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 {
@@ -13,8 +13,9 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 	 * @param {String} url The url of the external file browser.
 	 * @param {String} width Popup window width.
 	 * @param {String} height Popup window height.
+	 * @param {String} options Popup window features.
 	 */
-	popup : function( url, width, height )
+	popup : function( url, width, height, options )
 	{
 		width = width || '80%';
 		height = height || '70%';
@@ -32,8 +33,9 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 			height = 420;
 		var top = parseInt( ( window.screen.height - height ) / 2, 10 ),
-			left = parseInt( ( window.screen.width  - width ) / 2, 10 ),
-			options = 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes' +
+			left = parseInt( ( window.screen.width  - width ) / 2, 10 );
+		options = ( options || 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes' ) +
 			',width='  + width +
 			',height=' + height +
 			',top='  + top +
@@ -52,11 +54,11 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
 			popupWindow.focus();
 			popupWindow.location.href = url;
 		}
-		catch (e)
+		catch ( e )
 		{
 			popupWindow = window.open( url, null, options, true );
 		}
-		return true ;
+		return true;
 	}
 });

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/preview/plugin.js CHANGED Viewed

@@ -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
 */
@@ -13,6 +13,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	{
 		modes : { wysiwyg:1, source:1 },
 		canUndo : false,
+		readOnly : 1,
 		exec : function( editor )
 		{
 			var sHTML,
@@ -24,7 +25,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			{
 				sHTML = editor.getData()
 						.replace( /<head>/, '$&' + baseTag )
-						.replace( /[^>]*(?=<\/title>)/, editor.lang.preview );
+						.replace( /[^>]*(?=<\/title>)/, '$& &mdash; ' + editor.lang.preview );
 			}
 			else
 			{

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/print/plugin.js CHANGED Viewed

@@ -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
 */
@@ -37,5 +37,6 @@ CKEDITOR.plugins.print =
 			editor.document.$.execCommand( "Print" );
 	},
 	canUndo : false,
+	readOnly : 1,
 	modes : { wysiwyg : !( CKEDITOR.env.opera ) }		// It is imposible to print the inner document in Opera.
 };

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/removeformat/plugin.js CHANGED Viewed

@@ -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
 */
@@ -15,6 +15,8 @@ CKEDITOR.plugins.add( 'removeformat',
 				label : editor.lang.removeFormat,
 				command : 'removeFormat'
 			});
+		editor._.removeFormat = { filters: [] };
 	}
 });
@@ -32,21 +34,22 @@ CKEDITOR.plugins.removeformat =
 				var removeAttributes = editor._.removeAttributes ||
 					( editor._.removeAttributes = editor.config.removeFormatAttributes.split( ',' ) );
-				var ranges = editor.getSelection().getRanges();
+				var filter = CKEDITOR.plugins.removeformat.filter;
+				var ranges = editor.getSelection().getRanges( 1 ),
+					iterator = ranges.createIterator(),
+					range;
-				for ( var i = 0, range ; range = ranges[ i ] ; i++ )
+				while ( ( range = iterator.getNextRange() ) )
 				{
-					if ( range.collapsed )
-						continue;
-					range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+					if ( ! range.collapsed )
+						range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
 					// Bookmark the range so we can re-select it after processing.
-					var bookmark = range.createBookmark();
-					// The style will be applied within the bookmark boundaries.
-					var startNode	= bookmark.startNode;
-					var endNode		= bookmark.endNode;
+					var bookmark = range.createBookmark(),
+						// The style will be applied within the bookmark boundaries.
+						startNode	= bookmark.startNode,
+						endNode		= bookmark.endNode,
+						currentNode;
 					// We need to check the selection boundaries (bookmark spans) to break
 					// the code in a way that we can properly remove partially selected nodes.
@@ -61,8 +64,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++ )
 						{
@@ -70,38 +73,46 @@ CKEDITOR.plugins.removeformat =
 								break;
 							// If this element can be removed (even partially).
-							if ( tagsRegex.test( pathElement.getName() ) )
+							if ( tagsRegex.test( pathElement.getName() ) && filter( editor, pathElement ) )
 								node.breakParent( pathElement );
 						}
 					};
 					breakParent( startNode );
-					breakParent( endNode );
-					// Navigate through all nodes between the bookmarks.
-					var currentNode = startNode.getNextSourceNode( true, CKEDITOR.NODE_ELEMENT );
-					while ( currentNode )
+					if ( endNode )
 					{
-						// If we have reached the end of the selection, stop looping.
-						if ( currentNode.equals( endNode ) )
-							break;
+						breakParent( endNode );
-						// Cache the next node to be processed. Do it now, because
-						// currentNode may be removed.
-						var nextNode = currentNode.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT );
+						// Navigate through all nodes between the bookmarks.
+						currentNode = startNode.getNextSourceNode( true, CKEDITOR.NODE_ELEMENT );
-						// This node must not be a fake element.
-						if ( !( currentNode.getName() == 'img' && currentNode.getAttribute( '_cke_realelement' ) ) )
+						while ( currentNode )
 						{
-							// Remove elements nodes that match with this style rules.
-							if ( tagsRegex.test( currentNode.getName() ) )
-								currentNode.remove( true );
-							else
-								currentNode.removeAttributes( removeAttributes );
-						}
+							// If we have reached the end of the selection, stop looping.
+							if ( currentNode.equals( endNode ) )
+								break;
-						currentNode = nextNode;
+							// Cache the next node to be processed. Do it now, because
+							// currentNode may be removed.
+							var nextNode = currentNode.getNextSourceNode( false, CKEDITOR.NODE_ELEMENT );
+							// This node must not be a fake element.
+							if ( !( currentNode.getName() == 'img'
+								&& currentNode.data( 'cke-realelement' ) )
+								&& filter( editor, currentNode ) )
+							{
+								// Remove elements nodes that match with this style rules.
+								if ( tagsRegex.test( currentNode.getName() ) )
+									currentNode.remove( 1 );
+								else
+								{
+									currentNode.removeAttributes( removeAttributes );
+									editor.fire( 'removeFormatCleanup', currentNode );
+								}
+							}
+							currentNode = nextNode;
+						}
 					}
 					range.moveToBookmark( bookmark );
@@ -110,9 +121,44 @@ CKEDITOR.plugins.removeformat =
 				editor.getSelection().selectRanges( ranges );
 			}
 		}
+	},
+	/**
+	 * Perform the remove format filters on the passed element.
+	 * @param {CKEDITOR.editor} editor
+	 * @param {CKEDITOR.dom.element} element
+	 */
+	filter : function ( editor, element )
+	{
+		var filters = editor._.removeFormat.filters;
+		for ( var i = 0; i < filters.length; i++ )
+		{
+			if ( filters[ i ]( element ) === false )
+				return false;
+		}
+		return true;
 	}
 };
+/**
+ * Add to a collection of functions to decide whether a specific
+ * element should be considered as formatting element and thus
+ * could be removed during <b>removeFormat</b> command,
+ * Note: Only available with the existence of 'removeformat' plugin.
+ * @since 3.3
+ * @param {Function} func The function to be called, which will be passed a {CKEDITOR.dom.element} element to test.
+ * @example
+ *  // Don't remove empty span
+ *  editor.addRemoveFormatFilter.push( function( element )
+ *		{
+ *			return !( element.is( 'span' ) && CKEDITOR.tools.isEmpty( element.getAttributes() ) );
+ *		});
+ */
+CKEDITOR.editor.prototype.addRemoveFormatFilter = function( func )
+{
+	this._.removeFormat.filters.push( func );
+};
 /**
  * A comma separated list of elements to be removed when executing the "remove
  " format" command. Note that only inline elements are allowed.
@@ -130,3 +176,10 @@ CKEDITOR.config.removeFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,
  * @example
  */
 CKEDITOR.config.removeFormatAttributes = 'class,style,lang,width,height,align,hspace,valign';
+/**
+ * Fired after an element was cleaned by the removeFormat plugin.
+ * @name CKEDITOR.editor#removeFormatCleanup
+ * @event
+ * @param {Object} data.element The element that was cleaned up.
+ */

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/resize/plugin.js CHANGED Viewed

@@ -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
 */
@@ -9,20 +9,42 @@ CKEDITOR.plugins.add( 'resize',
 	{
 		var config = editor.config;
-		if ( config.resize_enabled )
+		// Resize in the same direction of chrome,
+		// which is identical to dir of editor element. (#6614)
+		var resizeDir = editor.element.getDirection( 1 );
+		!config.resize_dir && ( config.resize_dir = 'both' );
+		( config.resize_maxWidth == undefined ) && ( config.resize_maxWidth = 3000 );
+		( config.resize_maxHeight == undefined ) && ( config.resize_maxHeight = 3000 );
+		( config.resize_minWidth == undefined ) && ( config.resize_minWidth = 750 );
+		( config.resize_minHeight == undefined ) && ( config.resize_minHeight = 250 );
+		if ( config.resize_enabled !== false )
 		{
-			var container = null;
-			var origin, startSize;
+			var container = null,
+				origin,
+				startSize,
+				resizeHorizontal = ( config.resize_dir == 'both' || config.resize_dir == 'horizontal' ) &&
+					( config.resize_minWidth != config.resize_maxWidth ),
+				resizeVertical = ( config.resize_dir == 'both' || config.resize_dir == 'vertical' ) &&
+					( config.resize_minHeight != config.resize_maxHeight );
 			function dragHandler( evt )
 			{
-				var dx = evt.data.$.screenX - origin.x;
-				var dy = evt.data.$.screenY - origin.y;
-				var internalWidth = startSize.width + dx * ( editor.lang.dir == 'rtl' ? -1 : 1 );
-				var internalHeight = startSize.height + dy;
+				var dx = evt.data.$.screenX - origin.x,
+					dy = evt.data.$.screenY - origin.y,
+					width = startSize.width,
+					height = startSize.height,
+					internalWidth = width + dx * ( resizeDir == 'rtl' ? -1 : 1 ),
+					internalHeight = height + dy;
+				if ( resizeHorizontal )
+					width =  Math.max( config.resize_minWidth, Math.min( internalWidth, config.resize_maxWidth ) );
-				editor.resize( Math.max( config.resize_minWidth, Math.min( internalWidth, config.resize_maxWidth ) ),
-						Math.max( config.resize_minHeight, Math.min( internalHeight, config.resize_maxHeight ) ) );
+				if ( resizeVertical )
+					height =  Math.max( config.resize_minHeight, Math.min( internalHeight, config.resize_maxHeight ) );
+				editor.resize( width, height );
 			}
 			function dragEndHandler ( evt )
@@ -45,6 +67,9 @@ CKEDITOR.plugins.add( 'resize',
 					startSize = { width : container.$.offsetWidth || 0, height : container.$.offsetHeight || 0 };
 					origin = { x : $event.screenX, y : $event.screenY };
+					config.resize_minWidth > startSize.width && ( config.resize_minWidth = startSize.width );
+					config.resize_minHeight > startSize.height && ( config.resize_minHeight = startSize.height );
 					CKEDITOR.document.on( 'mousemove', dragHandler );
 					CKEDITOR.document.on( 'mouseup', dragEndHandler );
@@ -53,16 +78,31 @@ CKEDITOR.plugins.add( 'resize',
 						editor.document.on( 'mousemove', dragHandler );
 						editor.document.on( 'mouseup', dragEndHandler );
 					}
-				} );
+				});
+			editor.on( 'destroy', function() { CKEDITOR.tools.removeFunction( mouseDownFn ); } );
 			editor.on( 'themeSpace', function( event )
 				{
 					if ( event.data.space == 'bottom' )
 					{
-						event.data.html += '<div class="cke_resizer"' +
+						var direction = '';
+						if ( resizeHorizontal && !resizeVertical )
+							direction = ' cke_resizer_horizontal';
+						if ( !resizeHorizontal && resizeVertical )
+							direction = ' cke_resizer_vertical';
+						var resizerHtml =
+							'<div' +
+							' class="cke_resizer' + direction + ' cke_resizer_' + resizeDir + '"' +
 							' title="' + CKEDITOR.tools.htmlEncode( editor.lang.resize ) + '"' +
 							' onmousedown="CKEDITOR.tools.callFunction(' + mouseDownFn + ', event)"' +
 							'></div>';
+						// Always sticks the corner of botttom space.
+						resizeDir == 'ltr' && direction == 'ltr' ?
+							event.data.html += resizerHtml :
+							event.data.html = resizerHtml + event.data.html;
 					}
 				}, editor, null, 100 );
 		}
@@ -71,45 +111,58 @@ CKEDITOR.plugins.add( 'resize',
 /**
  * The minimum editor width, in pixels, when resizing it with the resize handle.
+ * Note: It fallbacks to editor's actual width if that's smaller than the default value.
+ * @name CKEDITOR.config.resize_minWidth
  * @type Number
  * @default 750
  * @example
  * config.resize_minWidth = 500;
  */
-CKEDITOR.config.resize_minWidth = 750;
 /**
  * The minimum editor height, in pixels, when resizing it with the resize handle.
+ * Note: It fallbacks to editor's actual height if that's smaller than the default value.
+ * @name CKEDITOR.config.resize_minHeight
  * @type Number
  * @default 250
  * @example
  * config.resize_minHeight = 600;
  */
-CKEDITOR.config.resize_minHeight = 250;
 /**
  * The maximum editor width, in pixels, when resizing it with the resize handle.
+ * @name CKEDITOR.config.resize_maxWidth
  * @type Number
  * @default 3000
  * @example
  * config.resize_maxWidth = 750;
  */
-CKEDITOR.config.resize_maxWidth = 3000;
 /**
  * The maximum editor height, in pixels, when resizing it with the resize handle.
+ * @name CKEDITOR.config.resize_maxHeight
  * @type Number
  * @default 3000
  * @example
  * config.resize_maxHeight = 600;
  */
-CKEDITOR.config.resize_maxHeight = 3000;
 /**
- * Whether to enable the resizing feature. If disabed the resize handler will not be visible.
+ * Whether to enable the resizing feature. If disabled the resize handler will not be visible.
+ * @name CKEDITOR.config.resize_enabled
  * @type Boolean
  * @default true
  * @example
  * config.resize_enabled = false;
  */
-CKEDITOR.config.resize_enabled = true;
+/**
+ * The directions to which the editor resizing is enabled. Possible values
+ * are "both", "vertical" and "horizontal".
+ * @name CKEDITOR.config.resize_dir
+ * @type String
+ * @default 'both'
+ * @since 3.3
+ * @example
+ * config.resize_dir = 'vertical';
+ */

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/richcombo/plugin.js CHANGED Viewed

@@ -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
 */
@@ -18,7 +18,7 @@ CKEDITOR.plugins.add( 'richcombo',
  * @constant
  * @example
  */
-CKEDITOR.UI_RICHCOMBO = 3;
+CKEDITOR.UI_RICHCOMBO = 'richcombo';
 CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 {
@@ -106,12 +106,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 						return;
 					}
-					if ( !_.committed )
-					{
-						_.list.commit();
-						_.committed = 1;
-					}
+					this.commit();
 					var value = this.getValue();
 					if ( value )
 						_.list.mark( value );
@@ -130,14 +125,19 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 					var element = CKEDITOR.document.getById( id ).getChild( 1 );
 					element.focus();
 				},
-				execute : clickFn
+				clickFn : clickFn
 			};
-			editor.on( 'mode', function()
-				{
-					this.setState( this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
-				},
-				this );
+			function updateState()
+			{
+				var state = this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
+				this.setState( editor.readOnly && !this.readOnly ? CKEDITOR.TRISTATE_DISABLED : state );
+				this.setValue( '' );
+			}
+			editor.on( 'mode', updateState, this );
+			// If this combo is sensitive to readOnly state, update it accordingly.
+			!this.readOnly && editor.on( 'readOnly', updateState, this);
 			var keyDownFn = CKEDITOR.tools.addFunction( function( ev, element )
 				{
@@ -161,15 +161,18 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 					ev.preventDefault();
 				});
+			// For clean up
+			instance.keyDownFn = keyDownFn;
 			output.push(
-				'<span class="cke_rcombo">',
+				'<span class="cke_rcombo" role="presentation">',
 				'<span id=', id );
 			if ( this.className )
 				output.push( ' class="', this.className, ' cke_off"');
 			output.push(
-				'>',
+				' role="presentation">',
 					'<span id="' + id+ '_label" class=cke_label>', this.label, '</span>',
 					'<a hidefocus=true title="', this.title, '" tabindex="-1"',
 						env.gecko && env.version >= 10900 && !env.hc ? '' : ' href="javascript:void(\'' + this.label + '\')"',
@@ -198,7 +201,7 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 						'<span>' +
 							'<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
 						'</span>' +
-						'<span class=cke_openbutton>' + ( CKEDITOR.env.hc ? '<span>&#9660;</span>' : '' ) + '</span>' +	// BLACK DOWN-POINTING TRIANGLE
+						'<span class=cke_openbutton><span class=cke_icon>' + ( CKEDITOR.env.hc ? '&#9660;' : CKEDITOR.env.air ?  '&nbsp;' : '' ) + '</span></span>' +	// BLACK DOWN-POINTING TRIANGLE
 					'</a>' +
 				'</span>' +
 				'</span>' );
@@ -236,16 +239,16 @@ 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' );
-					me.setState( CKEDITOR.TRISTATE_OFF );
+					me.setState( me.modes && me.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED );
 					me._.on = 0;
-					if ( me.onClose )
+					if ( !preventOnClose && me.onClose )
 						me.onClose();
 				};
@@ -291,16 +294,18 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 			this._.value = value;
 			var textElement = this.document.getById( 'cke_' + this.id + '_text' );
-			if ( !( value || text ) )
+			if ( textElement )
 			{
-				text = this.label;
-				textElement.addClass( 'cke_inline_label' );
-			}
-			else
-				textElement.removeClass( 'cke_inline_label' );
+				if ( !( value || text ) )
+				{
+					text = this.label;
+					textElement.addClass( 'cke_inline_label' );
+				}
+				else
+					textElement.removeClass( 'cke_inline_label' );
-			textElement.setHtml( typeof text != 'undefined' ? text : value );
+				textElement.setHtml( typeof text != 'undefined' ? text : value );
+			}
 		},
 		getValue : function()
@@ -346,7 +351,13 @@ CKEDITOR.ui.richCombo = CKEDITOR.tools.createClass(
 		commit : function()
 		{
-			this._.list.commit();
+			if ( !this._.committed )
+			{
+				this._.list.commit();
+				this._.committed = 1;
+				CKEDITOR.ui.fire( 'ready', this );
+			}
+			this._.committed = 1;
 		},
 		setState : function( state )