X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fentities%2Fplugin.js;h=f8329cd9096f0adde64c5004c918428965aa785e;hb=1056598c95187351dc58f4991d331e2258d038b5;hp=ce0f34e421afe350d9ffaa49a428e9576479d7e3;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;p=ckeditor.git
diff --git a/_source/plugins/entities/plugin.js b/_source/plugins/entities/plugin.js
index ce0f34e..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
* W3C HTML 4.01 Specification, section 24.2.1.
+ * @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
* W3C HTML 4.01 Specification, section 24.3.1.
+ * @name CKEDITOR.config.entities_greek
* @type Boolean
* @default true
* @example
@@ -207,19 +210,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: 汉语." is outputted
* as "This is Chinese: 汉语."
- * @type Boolean
+ * @name CKEDITOR.config.entities_processNumerical
* @type Boolean|String
* @default false
* @example
* config.entities_processNumerical = true;
* config.entities_processNumerical = 'force'; //Convert from " " into " ";
*/
-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 "&" preffix and the ";" termination.
+ * @name CKEDITOR.config.entities_additional
* @default '#39' // The single quote (') character.
* @type String
* @example