X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fentities%2Fplugin.js;h=f8329cd9096f0adde64c5004c918428965aa785e;hb=refs%2Ftags%2Fv3.5.4;hp=558d8244ccd18167384d5f2df9a87870fdbd2d14;hpb=039a051ccf3901311661022a30afd60fc38130c9;p=ckeditor.git

diff --git a/_source/plugins/entities/plugin.js b/_source/plugins/entities/plugin.js
index 558d824..f8329cd 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';
 
 	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,' +
 
@@ -74,7 +74,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( ',' );
@@ -171,6 +171,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 /**
  * Whether to use HTML entities in the output.
+ * @name CKEDITOR.config.entities
  * @type Boolean
  * @default true
  * @example
@@ -182,6 +183,7 @@ CKEDITOR.config.entities = true;
  * Whether to convert some Latin characters (Latin alphabet No. 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 +196,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,7 +210,7 @@ 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
@@ -219,6 +222,7 @@ CKEDITOR.config.entities_greek = true;
  * 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