X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fentities%2Fplugin.js;h=8dac27fd2172842b71d31f5a68dad4f00c9d2da5;hb=4e70ea24db840898be8cc21c950363a52a2a6aba;hp=ce0f34e421afe350d9ffaa49a428e9576479d7e3;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;p=ckeditor.git

diff --git a/_source/plugins/entities/plugin.js b/_source/plugins/entities/plugin.js
index ce0f34e..8dac27f 100644
--- a/_source/plugins/entities/plugin.js
+++ b/_source/plugins/entities/plugin.js
@@ -1,16 +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()
 {
 	// Base HTML entities.
-	var htmlbase = 'nbsp,gt,lt,quot';
+	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,' +
 
@@ -61,7 +61,8 @@ 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 )
@@ -74,7 +75,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 				return '';
 			});
 
-		if ( !reverse )
+		if ( !reverse && entities )
 		{
 			// Transforms the entities string into an array.
 			entities = entities.split( ',' );
@@ -113,7 +114,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			if ( htmlFilter )
 			{
 				// Mandatory HTML base entities.
-				var selectedEntities = htmlbase;
+				var selectedEntities = '';
+
+				if ( config.basicEntities !== false )
+					selectedEntities += htmlbase;
 
 				if ( config.entities )
 				{
@@ -130,8 +134,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 				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 && config.entities_processNumerical )
@@ -170,7 +174,24 @@ 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
@@ -182,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
@@ -194,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
@@ -207,19 +230,19 @@ CKEDITOR.config.entities_greek = true;
  * 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