radiant-ck_editor_filter-extension 0.2.0 → 0.2.1

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

@@ -1,17 +1,16 @@
 /*
-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
 */
 
 (function()
 {
-	var entities =
-
-		// Base HTML entities.
-		'nbsp,gt,lt,quot,' +
+	// Base HTML entities.
+	var htmlbase = 'nbsp,gt,lt,amp';
 
+	var entities =
 		// Latin-1 Entities
-		'iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +
+		'quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +
 		'not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,' +
 		'cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,' +
 
@@ -46,7 +45,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		'omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,' +
 		'upsih,piv';
 
-	function buildTable( entities )
+	/**
+	 * Create a mapping table between one character and it's entity form from a list of entity names.
+	 * @param reverse {Boolean} Whether create a reverse map from the entity string form to actual character.
+	 */
+	function buildTable( entities, reverse )
 	{
 		var table = {},
 			regex = [];
@@ -58,36 +61,43 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				nbsp	: '\u00A0',		// IE | FF
 				shy		: '\u00AD',		// IE
 				gt		: '\u003E',		// IE | FF |   --   | Opera
-				lt		: '\u003C'		// IE | FF | Safari | Opera
+				lt		: '\u003C',		// IE | FF | Safari | Opera
+				amp : '\u0026'		// ALL
 			};
 
 		entities = entities.replace( /\b(nbsp|shy|gt|lt|amp)(?:,|$)/g, function( match, entity )
 			{
-				table[ specialTable[ entity ] ] = '&' + entity + ';';
-				regex.push( specialTable[ entity ] );
+				var org = reverse ? '&' + entity + ';' : specialTable[ entity ],
+					result = reverse ? specialTable[ entity ] : '&' + entity + ';';
+
+				table[ org ] = result;
+				regex.push( org );
 				return '';
 			});
 
-		// Transforms the entities string into an array.
-		entities = entities.split( ',' );
-
-		// Put all entities inside a DOM element, transforming them to their
-		// final chars.
-		var div = document.createElement( 'div' ),
-			chars;
-		div.innerHTML = '&' + entities.join( ';&' ) + ';';
-		chars = div.innerHTML;
-		div = null;
-
-		// Add all chars to the table.
-		for ( var i = 0 ; i < chars.length ; i++ )
+		if ( !reverse && entities )
 		{
-			var charAt = chars.charAt( i );
-			table[ charAt ] = '&' + entities[ i ] + ';';
-			regex.push( charAt );
+			// Transforms the entities string into an array.
+			entities = entities.split( ',' );
+
+			// Put all entities inside a DOM element, transforming them to their
+			// final chars.
+			var div = document.createElement( 'div' ),
+				chars;
+			div.innerHTML = '&' + entities.join( ';&' ) + ';';
+			chars = div.innerHTML;
+			div = null;
+
+			// Add all chars to the table.
+			for ( var i = 0 ; i < chars.length ; i++ )
+			{
+				var charAt = chars.charAt( i );
+				table[ charAt ] = '&' + entities[ i ] + ';';
+				regex.push( charAt );
+			}
 		}
 
-		table.regex = regex.join( '' );
+		table.regex = regex.join( reverse ? '|' : '' );
 
 		return table;
 	}
@@ -98,46 +108,64 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		{
 			var config = editor.config;
 
-			if ( !config.entities )
-				return;
-
 			var dataProcessor = editor.dataProcessor,
 				htmlFilter = dataProcessor && dataProcessor.htmlFilter;
 
 			if ( htmlFilter )
 			{
-				var selectedEntities = entities;
+				// Mandatory HTML base entities.
+				var selectedEntities = '';
 
-				if ( config.entities_latin )
-					selectedEntities += ',' + latin;
+				if ( config.basicEntities !== false )
+					selectedEntities += htmlbase;
 
-				if ( config.entities_greek )
-					selectedEntities += ',' + greek;
+				if ( config.entities )
+				{
+					selectedEntities += ',' + entities;
+					if ( config.entities_latin )
+						selectedEntities += ',' + latin;
+
+					if ( config.entities_greek )
+						selectedEntities += ',' + greek;
 
-				if ( config.entities_additional )
-					selectedEntities += ',' + config.entities_additional;
+					if ( config.entities_additional )
+						selectedEntities += ',' + config.entities_additional;
+				}
 
 				var entitiesTable = buildTable( selectedEntities );
 
-				// Create the Regex used to find entities in the text.
-				var entitiesRegex = '[' + entitiesTable.regex + ']';
+				// Create the Regex used to find entities in the text, leave it matches nothing if entities are empty.
+				var entitiesRegex = entitiesTable.regex ? '[' + entitiesTable.regex + ']' : 'a^';
 				delete entitiesTable.regex;
 
-				if ( config.entities_processNumerical )
+				if ( config.entities && config.entities_processNumerical )
 					entitiesRegex = '[^ -~]|' + entitiesRegex ;
 
 				entitiesRegex = new RegExp( entitiesRegex, 'g' );
 
+				function getEntity( character )
+				{
+					return config.entities_processNumerical == 'force' || !entitiesTable[ character ] ?
+						   '&#' + character.charCodeAt(0) + ';'
+							: entitiesTable[ character ];
+				}
+
+				// Decode entities that the browsers has transformed
+				// at first place.
+				var baseEntitiesTable = buildTable( [ htmlbase, 'shy' ].join( ',' ) , true ),
+					baseEntitiesRegex = new RegExp( baseEntitiesTable.regex, 'g' );
+
 				function getChar( character )
 				{
-					return entitiesTable[ character ] || ( '&#' + character.charCodeAt(0) + ';' );
+					return baseEntitiesTable[ character ];
 				}
 
 				htmlFilter.addRules(
 					{
 						text : function( text )
 						{
-							return text.replace( entitiesRegex, getChar );
+							return text.replace( baseEntitiesRegex, getChar )
+									.replace( entitiesRegex, getEntity );
 						}
 					});
 			}
@@ -145,8 +173,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	});
 })();
 
+/**
+ * Whether to escape HTML preserved entities in text, including:
+ * <ul>
+ * <li>nbsp</li>
+ * <li>gt</li>
+ * <li>lt</li>
+ * <li>amp</li>
+ * </ul>
+ * <strong>Note:</strong> It should not be subjected to change unless you're outputting non-HTML data format like BBCode.
+ * @type Boolean
+ * @default true
+ * @example
+ * config.basicEntities = false;
+ */
+CKEDITOR.config.basicEntities = true;
+
 /**
  * Whether to use HTML entities in the output.
+ * @name CKEDITOR.config.entities
  * @type Boolean
  * @default true
  * @example
@@ -158,6 +203,7 @@ CKEDITOR.config.entities = true;
  * Whether to convert some Latin characters (Latin alphabet No&#46; 1, ISO 8859-1)
  * to HTML entities. The list of entities can be found at the
  * <a href="http://www.w3.org/TR/html4/sgml/entities.html#h-24.2.1">W3C HTML 4.01 Specification, section 24.2.1</a>.
+ * @name CKEDITOR.config.entities_latin
  * @type Boolean
  * @default true
  * @example
@@ -170,6 +216,7 @@ CKEDITOR.config.entities_latin = true;
  * HTML entities. This may be more relevant for users typing text written in Greek.
  * The list of entities can be found at the
  * <a href="http://www.w3.org/TR/html4/sgml/entities.html#h-24.3.1">W3C HTML 4.01 Specification, section 24.3.1</a>.
+ * @name CKEDITOR.config.entities_greek
  * @type Boolean
  * @default true
  * @example
@@ -179,20 +226,23 @@ CKEDITOR.config.entities_greek = true;
 
 /**
  * Whether to convert all remaining characters, not comprised in the ASCII
- * character table, to their relative numeric representation of HTML entity.
+ * character table, to their relative decimal numeric representation of HTML entity.
+ * When specified as the value 'force', it will simply convert all entities into the above form.
  * For example, the phrase "This is Chinese: &#27721;&#35821;." is outputted
  * as "This is Chinese: &amp;#27721;&amp;#35821;."
- * @type Boolean
+ * @name CKEDITOR.config.entities_processNumerical
+ * @type Boolean|String
  * @default false
  * @example
  * config.entities_processNumerical = true;
+ * config.entities_processNumerical = 'force';		//Convert from "&nbsp;" into "&#160;";
  */
-CKEDITOR.config.entities_processNumerical = false;
 
 /**
  * An additional list of entities to be used. It's a string containing each
  * entry separated by a comma. Entities names or number must be used, exclusing
  * the "&amp;" preffix and the ";" termination.
+ * @name CKEDITOR.config.entities_additional
  * @default '#39'  // The single quote (') character.
  * @type String
  * @example

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/fakeobjects/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
 */
 
@@ -12,13 +12,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			$ : function( element )
 			{
 				var attributes = element.attributes,
-					realHtml = attributes && attributes._cke_realelement,
+					realHtml = attributes && attributes[ 'data-cke-realelement' ],
 					realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ) ),
 					realElement = realFragment && realFragment.children[ 0 ];
 
 				// If we have width/height in the element, we must move it into
 				// the real element.
-				if ( realElement && element.attributes._cke_resizable )
+				if ( realElement && element.attributes[ 'data-cke-resizable' ] )
 				{
 					var style = element.attributes.style;
 
@@ -62,22 +62,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 CKEDITOR.editor.prototype.createFakeElement = function( realElement, className, realElementType, isResizable )
 {
-	var lang = this.lang.fakeobjects;
+	var lang = this.lang.fakeobjects,
+		label = lang[ realElementType ] || lang.unknown;
 
 	var attributes =
 	{
 		'class' : className,
 		src : CKEDITOR.getUrl( 'images/spacer.gif' ),
-		_cke_realelement : encodeURIComponent( realElement.getOuterHtml() ),
-		_cke_real_node_type : realElement.type,
-		alt : lang[ realElementType ] || lang.unknown
+		'data-cke-realelement' : encodeURIComponent( realElement.getOuterHtml() ),
+		'data-cke-real-node-type' : realElement.type,
+		alt : label,
+		title : label,
+		align : realElement.getAttribute( 'align' ) || ''
 	};
 
 	if ( realElementType )
-		attributes._cke_real_element_type = realElementType;
+		attributes[ 'data-cke-real-element-type' ] = realElementType;
 
 	if ( isResizable )
-		attributes._cke_resizable = isResizable;
+		attributes[ 'data-cke-resizable' ] = isResizable;
 
 	return this.document.createElement( 'img', { attributes : attributes } );
 };
@@ -85,6 +88,7 @@ CKEDITOR.editor.prototype.createFakeElement = function( realElement, className,
 CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable )
 {
 	var lang = this.lang.fakeobjects,
+		label = lang[ realElementType ] || lang.unknown,
 		html;
 
 	var writer = new CKEDITOR.htmlParser.basicWriter();
@@ -95,26 +99,28 @@ CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, class
 	{
 		'class' : className,
 		src : CKEDITOR.getUrl( 'images/spacer.gif' ),
-		_cke_realelement : encodeURIComponent( html ),
-		_cke_real_node_type : realElement.type,
-		alt : lang[ realElementType ] || lang.unknown
+		'data-cke-realelement' : encodeURIComponent( html ),
+		'data-cke-real-node-type' : realElement.type,
+		alt : label,
+		title : label,
+		align : realElement.attributes.align || ''
 	};
 
 	if ( realElementType )
-		attributes._cke_real_element_type = realElementType;
+		attributes[ 'data-cke-real-element-type' ] = realElementType;
 
 	if ( isResizable )
-		attributes._cke_resizable = isResizable;
+		attributes[ 'data-cke-resizable' ] = isResizable;
 
 	return new CKEDITOR.htmlParser.element( 'img', attributes );
 };
 
 CKEDITOR.editor.prototype.restoreRealElement = function( fakeElement )
 {
-	if ( fakeElement.getAttribute( '_cke_real_node_type' ) != CKEDITOR.NODE_ELEMENT )
+	if ( fakeElement.data( 'cke-real-node-type' ) != CKEDITOR.NODE_ELEMENT )
 		return null;
 
 	return CKEDITOR.dom.element.createFromHtml(
-		decodeURIComponent( fakeElement.getAttribute( '_cke_realelement' ) ),
+		decodeURIComponent( fakeElement.data( 'cke-realelement' ) ),
 		this.document );
 };

data/public/javascripts/extensions/ck_editor_filter/ckeditor/_source/plugins/filebrowser/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
 */
 
@@ -112,7 +112,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  */
 ( function()
 {
-	/**
+	/*
 	 * Adds (additional) arguments to given url.
 	 *
 	 * @param {String}
@@ -135,7 +135,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		return url + ( ( url.indexOf( "?" ) != -1 ) ? "&" : "?" ) + queryString.join( "&" );
 	}
 
-	/**
+	/*
 	 * Make a string's first character uppercase.
 	 *
 	 * @param {String}
@@ -148,7 +148,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		return f + str.substr( 1 );
 	}
 
-	/**
+	/*
 	 * The onlick function assigned to the 'Browse Server' button. Opens the
 	 * file browser and updates target field when file is selected.
 	 *
@@ -174,10 +174,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			params.langCode = editor.langCode;
 
 		var url = addQueryString( this.filebrowser.url, params );
-		editor.popup( url, width, height );
+		editor.popup( url, width, height, editor.config.fileBrowserWindowFeatures );
 	}
 
-	/**
+	/*
 	 * The onlick function assigned to the 'Upload' button. Makes the final
 	 * decision whether form is really submitted and updates target field when
 	 * file is uploaded.
@@ -202,7 +202,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		return true;
 	}
 
-	/**
+	/*
 	 * Setups the file element.
 	 *
 	 * @param {CKEDITOR.ui.dialog.file}
@@ -223,16 +223,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		fileInput.filebrowser = filebrowser;
 	}
 
-	/**
+	/*
 	 * Traverse through the content definition and attach filebrowser to
 	 * elements with 'filebrowser' attribute.
 	 *
 	 * @param String
 	 *            dialogName Dialog name.
-	 * @param {CKEDITOR.dialog.dialogDefinitionObject}
+	 * @param {CKEDITOR.dialog.definitionObject}
 	 *            definition Dialog definition.
 	 * @param {Array}
-	 *            elements Array of {@link CKEDITOR.dialog.contentDefinition}
+	 *            elements Array of {@link CKEDITOR.dialog.definition.content}
 	 *            objects.
 	 */
 	function attachFileBrowser( editor, dialogName, definition, elements )
@@ -261,8 +261,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 			if ( element.filebrowser.action == 'Browse' )
 			{
-				var url = element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ]
-							|| editor.config.filebrowserBrowseUrl;
+				var url = element.filebrowser.url;
+				if ( url === undefined )
+				{
+					url = editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ];
+					if ( url === undefined )
+						url = editor.config.filebrowserBrowseUrl;
+				}
 
 				if ( url )
 				{
@@ -273,8 +278,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			}
 			else if ( element.filebrowser.action == 'QuickUpload' && element[ 'for' ] )
 			{
-				url =  element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'UploadUrl' ]
-							|| editor.config.filebrowserUploadUrl;
+				url = element.filebrowser.url;
+				if ( url === undefined )
+				{
+					url = editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'UploadUrl' ];
+					if ( url === undefined )
+						url = editor.config.filebrowserUploadUrl;
+				}
 
 				if ( url )
 				{
@@ -298,7 +308,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		}
 	}
 
-	/**
+	/*
 	 * Updates the target element with the url of uploaded/selected file.
 	 *
 	 * @param {String}
@@ -323,10 +333,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		}
 	}
 
-	/**
+	/*
 	 * Returns true if filebrowser is configured in one of the elements.
 	 *
-	 * @param {CKEDITOR.dialog.dialogDefinitionObject}
+	 * @param {CKEDITOR.dialog.definitionObject}
 	 *            definition Dialog definition.
 	 * @param String
 	 *            tabId The tab id where element(s) can be found.
@@ -340,7 +350,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			var ids = elementId.split( ";" );
 			for ( var i = 0 ; i < ids.length ; i++ )
 			{
-				if ( isConfigured( definition, tabId, ids[i]) )
+				if ( isConfigured( definition, tabId, ids[i] ) )
 					return true;
 			}
 			return false;
@@ -378,22 +388,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		init : function( editor, pluginPath )
 		{
 			editor._.filebrowserFn = CKEDITOR.tools.addFunction( setUrl, editor );
+			editor.on( 'destroy', function () { CKEDITOR.tools.removeFunction( this._.filebrowserFn ); } );
+		}
+	} );
 
-			CKEDITOR.on( 'dialogDefinition', function( evt )
+	CKEDITOR.on( 'dialogDefinition', function( evt )
+	{
+		var definition = evt.data.definition,
+			element;
+		// Associate filebrowser to elements with 'filebrowser' attribute.
+		for ( var i in definition.contents )
+		{
+			if ( ( element = definition.contents[ i ] ) )
 			{
-				var definition = evt.data.definition,
-					element;
-				// Associate filebrowser to elements with 'filebrowser' attribute.
-				for ( var i in definition.contents )
+				attachFileBrowser( evt.editor, evt.data.name, definition, element.elements );
+				if ( element.hidden && element.filebrowser )
 				{
-					element = definition.contents[ i ] ;
-					attachFileBrowser( evt.editor, evt.data.name, definition, element.elements );
-					if ( element.hidden && element.filebrowser )
-					{
-						element.hidden = !isConfigured( definition, element[ 'id' ], element.filebrowser );
-					}
+					element.hidden = !isConfigured( definition, element[ 'id' ], element.filebrowser );
 				}
-			} );
+			}
 		}
 	} );
 
@@ -477,3 +490,35 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example
  * config.filebrowserImageBrowseLinkUrl = '/browser/browse.php';
  */
+
+/**
+ * The "features" to use in the file browser popup window.
+ * @name CKEDITOR.config.filebrowserWindowFeatures
+ * @since 3.4.1
+ * @type String
+ * @default 'location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes'
+ * @example
+ * config.filebrowserWindowFeatures = 'resizable=yes,scrollbars=no';
+ */
+
+/**
+ * The width of the file browser popup window. It can be a number or a percent string.
+ * @name CKEDITOR.config.filebrowserWindowWidth
+ * @type Number|String
+ * @default '80%'
+ * @example
+ * config.filebrowserWindowWidth = 750;
+ * @example
+ * config.filebrowserWindowWidth = '50%';
+ */
+
+/**
+ * The height of the file browser popup window. It can be a number or a percent string.
+ * @name CKEDITOR.config.filebrowserWindowHeight
+ * @type Number|String
+ * @default '70%'
+ * @example
+ * config.filebrowserWindowHeight = 580;
+ * @example
+ * config.filebrowserWindowHeight = '50%';
+ */