Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.1
[ckeditor.git]
/
_source
/
core
/
config.js
diff --git
a/_source/core/config.js
b/_source/core/config.js
index
a408d93
..
8d45ebe
100644
(file)
--- a/
_source/core/config.js
+++ b/
_source/core/config.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-292,6
+292,7
@@
CKEDITOR.config =
'forms,' +
\r
'horizontalrule,' +
\r
'htmldataprocessor,' +
\r
'forms,' +
\r
'horizontalrule,' +
\r
'htmldataprocessor,' +
\r
+ 'iframe,' +
\r
'image,' +
\r
'indent,' +
\r
'justify,' +
\r
'image,' +
\r
'indent,' +
\r
'justify,' +
\r
@@
-349,7
+350,7
@@
CKEDITOR.config =
\r
/**
\r
* List of regular expressions to be executed over the input HTML,
\r
\r
/**
\r
* List of regular expressions to be executed over the input HTML,
\r
- * indicating code that must stay untouched.
\r
+ * indicating HTML source code that matched must <strong>not</strong> present in WYSIWYG mode for editing.
\r
* @type Array
\r
* @default [] (empty array)
\r
* @example
\r
* @type Array
\r
* @default [] (empty array)
\r
* @example
\r