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.6.6
[ckeditor.git]
/
_source
/
core
/
editor_basic.js
diff --git
a/_source/core/editor_basic.js
b/_source/core/editor_basic.js
index
ec90bf7
..
3372380
100644
(file)
--- a/
_source/core/editor_basic.js
+++ b/
_source/core/editor_basic.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2013, 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
@@
-27,15
+27,15
@@
if ( !CKEDITOR.editor )
CKEDITOR.ELEMENT_MODE_APPENDTO = 2;
\r
\r
/**
\r
CKEDITOR.ELEMENT_MODE_APPENDTO = 2;
\r
\r
/**
\r
- * Represents an editor instance. This constructor should be rarely used,
\r
- * being the {@link CKEDITOR} methods preferible.
\r
- * @constructor
\r
+ * Creates an editor class instance. This constructor should be rarely
\r
+ * used, in favor of the {@link CKEDITOR} editor creation functions.
\r
+ * @ class Represents an editor instance.
\r
* @param {Object} instanceConfig Configuration values for this specific
\r
* instance.
\r
* @param {CKEDITOR.dom.element} [element] The element linked to this
\r
* instance.
\r
* @param {Number} [mode] The mode in which the element is linked to this
\r
* @param {Object} instanceConfig Configuration values for this specific
\r
* instance.
\r
* @param {CKEDITOR.dom.element} [element] The element linked to this
\r
* instance.
\r
* @param {Number} [mode] The mode in which the element is linked to this
\r
- * instance.
\r
+ * instance. See {@link #elementMode}.
\r
* @param {String} [data] Since 3.3. Initial value for the instance.
\r
* @augments CKEDITOR.event
\r
* @example
\r
* @param {String} [data] Since 3.3. Initial value for the instance.
\r
* @augments CKEDITOR.event
\r
* @example
\r
@@
-54,11
+54,11
@@
if ( !CKEDITOR.editor )
* The mode in which the {@link #element} is linked to this editor
\r
* instance. It can be any of the following values:
\r
* <ul>
\r
* The mode in which the {@link #element} is linked to this editor
\r
* instance. It can be any of the following values:
\r
* <ul>
\r
- * <li><b>CKEDITOR.ELEMENT_MODE_NONE</b>: No element is linked to the
\r
+ * <li>{@link CKEDITOR.ELEMENT_MODE_NONE}: No element is linked to the
\r
* editor instance.</li>
\r
* editor instance.</li>
\r
- * <li><b>CKEDITOR.ELEMENT_MODE_REPLACE</b>: The element is to be
\r
+ * <li>{@link CKEDITOR.ELEMENT_MODE_REPLACE}: The element is to be
\r
* replaced by the editor instance.</li>
\r
* replaced by the editor instance.</li>
\r
- * <li><b>CKEDITOR.ELEMENT_MODE_APPENDTO</b>: The editor is to be
\r
+ * <li>{@link CKEDITOR.ELEMENT_MODE_APPENDTO}: The editor is to be
\r
* created inside the element.</li>
\r
* </ul>
\r
* @name CKEDITOR.editor.prototype.elementMode
\r
* created inside the element.</li>
\r
* </ul>
\r
* @name CKEDITOR.editor.prototype.elementMode
\r
@@
-98,6
+98,10
@@
if ( !CKEDITOR.editor )
// Look for the element by id. We accept any kind of element here.
\r
element = document.getElementById( elementOrIdOrName );
\r
\r
// Look for the element by id. We accept any kind of element here.
\r
element = document.getElementById( elementOrIdOrName );
\r
\r
+ // Elements that should go into head are unacceptable (#6791).
\r
+ if ( element && element.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1} )
\r
+ element = null;
\r
+
\r
// If not found, look for elements by name. In this case we accept only
\r
// textareas.
\r
if ( !element )
\r
// If not found, look for elements by name. In this case we accept only
\r
// textareas.
\r
if ( !element )
\r