X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fthemes%2Fdefault%2Ftheme.js;h=00219fff35d1c82ca2e3d09e94a2f73bd4d03982;hb=refs%2Ftags%2Fv3.4.1;hp=97dd0ef2ab934eb5c35a246df3be798bff6ece68;hpb=7cd80714081a8ffdf4a1a8d2c72f120ed5ef3d6d;p=ckeditor.git
diff --git a/_source/themes/default/theme.js b/_source/themes/default/theme.js
index 97dd0ef..00219ff 100644
--- a/_source/themes/default/theme.js
+++ b/_source/themes/default/theme.js
@@ -1,10 +1,70 @@
/*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
CKEDITOR.themes.add( 'default', (function()
{
+ function checkSharedSpace( editor, spaceName )
+ {
+ var container,
+ element;
+
+ // Try to retrieve the target element from the sharedSpaces settings.
+ element = editor.config.sharedSpaces;
+ element = element && element[ spaceName ];
+ element = element && CKEDITOR.document.getById( element );
+
+ // If the element is available, we'll then create the container for
+ // the space.
+ if ( element )
+ {
+ // Creates an HTML structure that reproduces the editor class hierarchy.
+ var html =
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '
' +
- ' ' +
- '' +
- ' ' +
- '' +
- '
' +
+ ' | ' +
+ '' +
+ 'X' +
+ '' +
+ ' ' +
'' +
'' +
@@ -161,41 +230,31 @@ CKEDITOR.themes.add( 'default', (function()
destroy : function( editor )
{
var container = editor.container;
-
- /*
- * IE BUG: Removing the editor DOM elements while the selection is inside
- * the editing area would break IE7/8's selection system. So we need to put
- * the selection back to the parent document without scrolling the window.
- * (#3812)
- */
- if ( CKEDITOR.env.ie )
- {
- container.setStyle( 'display', 'none' );
-
- var $range = document.body.createTextRange();
- $range.moveToElementText( container.$ );
- try
- {
- // Putting the selection to a display:none element - this will certainly
- // fail. But! We've just put the selection document back to the parent
- // document without scrolling the window!
- $range.select();
- }
- catch ( e ) {}
- }
+ container.clearCustomData();
+ editor.element.clearCustomData();
if ( container )
container.remove();
if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
- {
editor.element.show();
- delete editor.element;
- }
+
+ delete editor.element;
}
};
})() );
+/**
+ * Returns the DOM element that represents a theme space. The default theme defines
+ * three spaces, namely "top", "contents" and "bottom", representing the main
+ * blocks that compose the editor interface.
+ * @param {String} spaceName The space name.
+ * @returns {CKEDITOR.dom.element} The element that represents the space.
+ * @example
+ * // Hide the bottom space in the UI.
+ * var bottom = editor.getThemeSpace( 'bottom' );
+ * bottom.setStyle( 'display', 'none' );
+ */
CKEDITOR.editor.prototype.getThemeSpace = function( spaceName )
{
var spacePrefix = 'cke_' + spaceName;
@@ -204,21 +263,38 @@ CKEDITOR.editor.prototype.getThemeSpace = function( spaceName )
return space;
};
+/**
+ * Resizes the editor interface.
+ * @param {Number|String} width The new width. It can be an pixels integer or a
+ * CSS size value.
+ * @param {Number|String} height The new height. It can be an pixels integer or
+ * a CSS size value.
+ * @param {Boolean} [isContentHeight] Indicates that the provided height is to
+ * be applied to the editor contents space, not to the entire editor
+ * interface. Defaults to false.
+ * @param {Boolean} [resizeInner] Indicates that the first inner interface
+ * element must receive the size, not the outer element. The default theme
+ * defines the interface inside a pair of span elements
+ * (<span><span>...</span></span>). By default the
+ * first span element receives the sizes. If this parameter is set to
+ * true, the second span is sized instead.
+ * @example
+ * editor.resize( 900, 300 );
+ * @example
+ * editor.resize( '100%', 450, true );
+ */
CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, resizeInner )
{
- var numberRegex = /^\d+$/;
- if ( numberRegex.test( width ) )
- width += 'px';
-
- var contents = CKEDITOR.document.getById( 'cke_contents_' + this.name );
- var outer = resizeInner ? contents.getAscendant( 'table' ).getParent()
- : contents.getAscendant( 'table' ).getParent().getParent().getParent();
+ var container = this.container,
+ contents = CKEDITOR.document.getById( 'cke_contents_' + this.name ),
+ outer = resizeInner ? container.getChild( 1 ) : container;
// Resize the width first.
// WEBKIT BUG: Webkit requires that we put the editor off from display when we
// resize it. If we don't, the browser crashes!
CKEDITOR.env.webkit && outer.setStyle( 'display', 'none' );
- outer.setStyle( 'width', width );
+ // Set as border box width. (#5353)
+ outer.setSize( 'width', width, true );
if ( CKEDITOR.env.webkit )
{
outer.$.offsetWidth;
@@ -234,7 +310,47 @@ CKEDITOR.editor.prototype.resize = function( width, height, isContentHeight, res
this.fire( 'resize' );
};
+/**
+ * Gets the element that can be freely used to check the editor size. This method
+ * is mainly used by the resize plugin, which adds a UI handle that can be used
+ * to resize the editor.
+ * @returns {CKEDITOR.dom.element} The resizable element.
+ * @example
+ */
CKEDITOR.editor.prototype.getResizable = function()
{
- return this.container.getChild( [ 0, 0 ] );
+ return this.container.getChild( 1 );
};
+
+/**
+ * Makes it possible to place some of the editor UI blocks, like the toolbar
+ * and the elements path, into any element in the page.
+ * The elements used to hold the UI blocks can be shared among several editor
+ * instances. In that case, only the blocks of the active editor instance will
+ * display.
+ * @name CKEDITOR.config.sharedSpaces
+ * @type Object
+ * @default undefined
+ * @example
+ * // Place the toolbar inside the element with ID "someElementId" and the
+ * // elements path into the element with ID "anotherId".
+ * config.sharedSpaces =
+ * {
+ * top : 'someElementId',
+ * bottom : 'anotherId'
+ * };
+ * @example
+ * // Place the toolbar inside the element with ID "someElementId". The
+ * // elements path will remain attached to the editor UI.
+ * config.sharedSpaces =
+ * {
+ * top : 'someElementId'
+ * };
+ */
+
+/**
+ * Fired after the editor instance is resized through
+ * the {@link CKEDITOR.editor.prototype.resize} method.
+ * @name CKEDITOR#resize
+ * @event
+ */
|