Index: /CKEditor/trunk/_dev/docs_build/template/publish.js =================================================================== --- /CKEditor/trunk/_dev/docs_build/template/publish.js (revision 3259) +++ /CKEditor/trunk/_dev/docs_build/template/publish.js (revision 3260) @@ -93,5 +93,5 @@ allFiles[i].name = allFiles[i].alias; } - + allFiles = allFiles.sort( ckeditor_sortFiles ); Index: /CKEditor/trunk/_samples/enterkey.html =================================================================== --- /CKEditor/trunk/_samples/enterkey.html (revision 3259) +++ /CKEditor/trunk/_samples/enterkey.html (revision 3260) Index: /CKEditor/trunk/_source/core/ckeditor_base.js =================================================================== --- /CKEditor/trunk/_source/core/ckeditor_base.js (revision 3259) +++ /CKEditor/trunk/_source/core/ckeditor_base.js (revision 3260) @@ -169,5 +169,5 @@ } } - + return CKEDITOR; })(); Index: /CKEditor/trunk/_source/core/dom/documentFragment.js =================================================================== --- /CKEditor/trunk/_source/core/dom/documentFragment.js (revision 3259) +++ /CKEditor/trunk/_source/core/dom/documentFragment.js (revision 3260) @@ -9,5 +9,5 @@ * as arguments and results in all the child nodes of the DocumentFragment being * moved to the child list of this node. - * + * * @param {Object} ownerDocument */ @@ -18,6 +18,6 @@ }; -CKEDITOR.tools.extend( CKEDITOR.dom.documentFragment.prototype, - CKEDITOR.dom.element.prototype, +CKEDITOR.tools.extend( CKEDITOR.dom.documentFragment.prototype, + CKEDITOR.dom.element.prototype, { type : CKEDITOR.NODE_DOCUMENT_FRAGMENT, @@ -29,5 +29,5 @@ }, true, - { + { 'append' : 1, 'getFirst' : 1, @@ -44,4 +44,4 @@ 'getChildCount' : 1, 'getChild' : 1, - 'getChildren' : 1 + 'getChildren' : 1 } ); Index: /CKEditor/trunk/_source/core/dom/element.js =================================================================== --- /CKEditor/trunk/_source/core/dom/element.js (revision 3259) +++ /CKEditor/trunk/_source/core/dom/element.js (revision 3260) @@ -337,5 +337,5 @@ if ( this.$.outerHTML ) return this.$.outerHTML; - + var tmpDiv = this.$.ownerDocument.createElement( 'div' ); tmpDiv.appendChild( this.$.cloneNode( true ) ); @@ -717,5 +717,5 @@ { var attribute = thisAttribs[ i ]; - + if ( ( !CKEDITOR.env.ie || ( attribute.specified && attribute.nodeName != '_cke_expando' ) ) && attribute.nodeValue != otherElement.getAttribute( attribute.nodeName ) ) return false; @@ -729,5 +729,5 @@ { attribute = otherAttribs[ i ]; - + if ( ( !CKEDITOR.env.ie || ( attribute.specified && attribute.nodeName != '_cke_expando' ) ) && attribute.nodeValue != thisAttribs.getAttribute( attribute.nodeName ) ) return false; @@ -1129,5 +1129,5 @@ current = new CKEDITOR.dom.element( current.$.offsetParent ); } - + if ( refDocument ) { @@ -1138,5 +1138,5 @@ { var iframePosition = ( new CKEDITOR.dom.element( currentWindow.$.frameElement ) ).getDocumentPosition( refDocument ); - + x += iframePosition.x; y += iframePosition.y; Index: /CKEditor/trunk/_source/core/dom/node.js =================================================================== --- /CKEditor/trunk/_source/core/dom/node.js (revision 3259) +++ /CKEditor/trunk/_source/core/dom/node.js (revision 3260) @@ -96,5 +96,5 @@ { var $clone = this.$.cloneNode( includeChildren ); - + if ( this.type == CKEDITOR.NODE_ELEMENT && !cloneId ) { @@ -103,5 +103,5 @@ $clone.removeAttribute( '_cke_expando', false ) ; } - + return new CKEDITOR.dom.node( $clone ); }, @@ -450,13 +450,13 @@ { var $ = this.$; - + if ( !includeSelf ) $ = $.parentNode; - + while ( $ ) { if ( $.nodeName && $.nodeName.toLowerCase() == name ) return new CKEDITOR.dom.node( $ ); - + $ = $.parentNode; } @@ -475,5 +475,5 @@ if ( $.nodeName && $.nodeName.toLowerCase() == name ) return true; - + $ = $.parentNode; } Index: /CKEditor/trunk/_source/core/dom/range.js =================================================================== --- /CKEditor/trunk/_source/core/dom/range.js (revision 3259) +++ /CKEditor/trunk/_source/core/dom/range.js (revision 3260) @@ -1096,5 +1096,5 @@ case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS: // DFS backward to get the block/list item boundary at or before the start. - + // Get the boundaries nodes. var startNode = this.getTouchedStartNode(), @@ -1103,5 +1103,5 @@ if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.isBlockBoundary() ) { - this.setStartAt( startNode, + this.setStartAt( startNode, CKEDITOR.dtd.$empty[ startNode.getName() ] ? CKEDITOR.POSITION_AFTER_END : @@ -1109,5 +1109,5 @@ } else - { + { // Get the function used to check the enlaarging limits. var guardFunction = ( unit == CKEDITOR.ENLARGE_BLOCK_CONTENTS ? @@ -1117,8 +1117,8 @@ // Create the DOM walker, which will traverse the DOM. var walker = new CKEDITOR.dom.domWalker( startNode ); - + // Go walk in reverse sense. var data = walker.reverse( guardFunction ); - + var boundaryEvent = data.events.shift(); @@ -1128,5 +1128,5 @@ if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.isBlockBoundary() ) { - this.setEndAt( endNode, + this.setEndAt( endNode, CKEDITOR.dtd.$empty[ endNode.getName() ] ? CKEDITOR.POSITION_BEFORE_START : @@ -1134,5 +1134,5 @@ } else - { + { // DFS forward to get the block/list item boundary at or before the end. walker.setNode( endNode ); Index: /CKEditor/trunk/_source/core/event.js =================================================================== --- /CKEditor/trunk/_source/core/event.js (revision 3259) +++ /CKEditor/trunk/_source/core/event.js (revision 3260) @@ -48,15 +48,15 @@ { (function(){ - + var property = prop; - + if ( targetObject[ property ] == undefined ) targetObject[ property ] = isTargetPrototype? function() { - //pre-setup events model + //pre-setup events model if( ! ( this._ && this._.events ) ) CKEDITOR.event.call( this ); - + ( this[ property ] = CKEDITOR.event.prototype[ property ] ) .apply( this, arguments ); Index: /CKEditor/trunk/_source/core/resourcemanager.js =================================================================== --- /CKEditor/trunk/_source/core/resourcemanager.js (revision 3259) +++ /CKEditor/trunk/_source/core/resourcemanager.js (revision 3260) @@ -125,6 +125,6 @@ { var external = this.externals[ name ] - return CKEDITOR.getUrl( - this.getPath( name ) + + return CKEDITOR.getUrl( + this.getPath( name ) + ( ( external && external.file ) || ( this.fileName + '.js' ) ) ); }, Index: /CKEditor/trunk/_source/core/tools.js =================================================================== --- /CKEditor/trunk/_source/core/tools.js (revision 3259) +++ /CKEditor/trunk/_source/core/tools.js (revision 3260) @@ -125,12 +125,12 @@ for ( var propertyName in source ) { - // Only copy existed fields if in overwrite mode. - if ( overwrite === true || target[ propertyName ] == undefined ) + // Only copy existed fields if in overwrite mode. + if ( overwrite === true || target[ propertyName ] == undefined ) { // Only copy specified fields if list is provided. if ( !propertiesList || ( propertyName in propertiesList ) ) target[ propertyName ] = source[ propertyName ]; - - } + + } } } @@ -371,7 +371,7 @@ * the entry, or -1 if not found. * @example - * var letters = [ 'a', 'b', 0, 'c', false ]; - * alert( CKEDITOR.tools.indexOf( letters, '0' ) ); "-1" because 0 !== '0' - * alert( CKEDITOR.tools.indexOf( letters, false ) ); "4" because 0 !== false + * var letters = [ 'a', 'b', 0, 'c', false ]; + * alert( CKEDITOR.tools.indexOf( letters, '0' ) ); "-1" because 0 !== '0' + * alert( CKEDITOR.tools.indexOf( letters, false ) ); "4" because 0 !== false */ indexOf : @@ -397,5 +397,5 @@ return function() { return func.apply( obj, arguments ); }; }, - + /** * Class creation based on prototype inheritance, with supports of the @@ -407,5 +407,5 @@ *
  • Chainable base class constructor
    • * - * + * * @param {Object} definiton (Optional)The class definiton object. */ @@ -425,15 +425,15 @@ // Create (and get) the private namespace. var _ = this._ || ( this._ = {} ); - + // Make some magic so "this" will refer to the main // instance when coding private functions. - for ( var privateName in privates ) + for ( var privateName in privates ) { var priv = privates[ privateName ]; - - _[ privateName ] = + + _[ privateName ] = ( typeof priv == 'function' ) ? CKEDITOR.tools.bind( priv, this ) : priv; } - + originalConstructor.apply( this, arguments ); }; Index: /CKEditor/trunk/_source/core/ui.js =================================================================== --- /CKEditor/trunk/_source/core/ui.js (revision 3259) +++ /CKEditor/trunk/_source/core/ui.js (revision 3260) @@ -65,5 +65,5 @@ var item = this._.items[ name ], handler = item && this._.handlers[ item.type ]; - + return handler && handler.create.apply( this, item.args ); }, Index: /CKEditor/trunk/_source/plugins/blockquote/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/blockquote/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/blockquote/plugin.js (revision 3260) @@ -92,5 +92,5 @@ } } - } + } var iterator = range.createIterator(), @@ -159,5 +159,5 @@ } - docFrag.replace( block ); + docFrag.replace( block ); } else @@ -178,5 +178,5 @@ var moveOutNodes = [], database = {}; - + while ( ( block = iterator.getNextParagraph() ) ) { Index: /CKEditor/trunk/_source/plugins/button/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/button/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/button/plugin.js (revision 3260) @@ -121,7 +121,7 @@ var index = CKEDITOR.ui.button._.instances.push( instance ) - 1; - + var classes = ''; - + // Get the command name. var command = this.command; Index: /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js =================================================================== --- /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/clipboard/dialogs/paste.js (revision 3260) @@ -80,9 +80,9 @@ var iframe = CKEDITOR.document.getById( iframeId ); - var body = new CKEDITOR.dom.element( + var body = new CKEDITOR.dom.element( iframe.$.contentDocument ? oBody = iframe.$.contentDocument.body : oBody = iframe.$.contentWindow.document.body ) ; - + var html = body.getHtml(); Index: /CKEditor/trunk/_source/plugins/clipboard/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/clipboard/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/clipboard/plugin.js (revision 3260) @@ -22,5 +22,5 @@ enabled = true; }; - + // The following seems to be the only reliable way to detect that // clipboard commands are enabled in IE. It will fire the @@ -32,5 +32,5 @@ body.removeListener( command, onExec ); - + return enabled; }; @@ -85,5 +85,5 @@ editor.focus(); - if ( !editor.fire( 'beforePaste' ) + if ( !editor.fire( 'beforePaste' ) && !execIECommand( editor, 'paste' ) ) { @@ -175,5 +175,5 @@ return { cut : CKEDITOR.TRISTATE_DISABLED , - copy : CKEDITOR.TRISTATE_DISABLED, + copy : CKEDITOR.TRISTATE_DISABLED, paste : CKEDITOR.TRISTATE_DISABLED }; }); Index: /CKEditor/trunk/_source/plugins/contextmenu/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/contextmenu/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/contextmenu/plugin.js (revision 3260) @@ -142,5 +142,5 @@ this._.onMenu( CKEDITOR.document.getDocumentElement(), 0, 0 ); }, - + /** * Saves the current selection position in the editor. Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 3260) @@ -73,5 +73,5 @@ return null; } - + /** * This is the base class for runtime dialog objects. An instance of this @@ -338,5 +338,5 @@ changeFocus( !shiftPressed ); } - + processed = true; } @@ -1029,5 +1029,5 @@ { // Avoid path registration from multiple instances override definition. - if ( !this._.dialogDefinitions[name] + if ( !this._.dialogDefinitions[name] || typeof dialogDefinition == 'function' ) this._.dialogDefinitions[name] = dialogDefinition; Index: /CKEditor/trunk/_source/plugins/dialogui/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3260) @@ -879,5 +879,5 @@ }, - keyboardFocusable : true + keyboardFocusable : true }, true ); Index: /CKEditor/trunk/_source/plugins/domiterator/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/domiterator/plugin.js (revision 3260) @@ -32,5 +32,5 @@ return container.getChildCount() > range.endOffset ? container.getChild( range.endOffset ) : container; } - + function getNextSourceNode( currentNode, startFromSibling, nodeType, stopSearchNode ) { @@ -147,5 +147,5 @@ // point. (#1717) if ( nodeName != 'br' ) - this._.nextNode = getNextSourceNode( currentNode, true, null, lastNode ) || currentNode; + this._.nextNode = getNextSourceNode( currentNode, true, null, lastNode ) || currentNode; } @@ -252,5 +252,5 @@ if ( !block - && !this.enforceRealBlocks + && !this.enforceRealBlocks && checkLimits[ startBlockLimit.getName() ] && range.checkStartOfBlock() Index: /CKEditor/trunk/_source/plugins/enterkey/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/enterkey/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/enterkey/plugin.js (revision 3260) @@ -35,5 +35,5 @@ if ( editor.mode != 'wysiwyg' ) return; - + if ( !mode ) mode = editor.config.enterMode; Index: /CKEditor/trunk/_source/plugins/entities/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/entities/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/entities/plugin.js (revision 3260) @@ -7,5 +7,5 @@ { var entities = - + // Base HTML entities. 'nbsp,gt,lt,quot,' + @@ -79,5 +79,5 @@ chars = div.innerHTML; div = null; - + // Add all chars to the table. for ( var i = 0 ; i < chars.length ; i++ ) @@ -87,7 +87,7 @@ regex.push( charAt ); } - + table.regex = regex.join( '' ); - + return table; } @@ -114,10 +114,10 @@ if ( config.entities_greek ) selectedEntities += ',' + greek; - + if ( config.entities_additional ) selectedEntities += ',' + config.entities_additional; var entitiesTable = buildTable( selectedEntities ); - + // Create the Regex used to find entities in the text. var entitiesRegex = '[' + entitiesTable.regex + ']'; @@ -126,9 +126,9 @@ if ( config.entities_processNumerical ) entitiesRegex = '[^ -~]|' + entitiesRegex ; - + entitiesRegex = new RegExp( entitiesRegex, 'g' ); - + function getChar( character ) - { + { return entitiesTable[ character ] || ( '&#' + character.charCodeAt(0) + ';' ); } Index: /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/fakeobjects/plugin.js (revision 3260) @@ -22,5 +22,5 @@ var style = element.attributes.style; - + if ( style ) { @@ -35,10 +35,10 @@ if ( width ) realElement.attributes.width = width; - + if ( height ) realElement.attributes.height = height; } } - + return realElement; } @@ -46,5 +46,5 @@ }; - CKEDITOR.plugins.add( 'fakeobjects', + CKEDITOR.plugins.add( 'fakeobjects', { requires : [ 'htmlwriter' ], @@ -63,5 +63,5 @@ CKEDITOR.editor.prototype.createFakeElement = function( realElement, className, realElementType, isResizable ) { - var attributes = + var attributes = { 'class' : className, @@ -80,10 +80,10 @@ { var writer = new CKEDITOR.htmlParser.basicWriter(); - + realElement.writeHtml( writer ); - + var html = writer.getHtml(); - - var attributes = + + var attributes = { 'class' : className, Index: /CKEditor/trunk/_source/plugins/find/dialogs/find.js =================================================================== --- /CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/find/dialogs/find.js (revision 3260) @@ -7,10 +7,10 @@ { // Element tag names which prevent characters counting. - var characterBoundaryElementsEnum = - { - address :1, blockquote :1, dl :1, h1 :1, h2 :1, h3 :1, + var characterBoundaryElementsEnum = + { + address :1, blockquote :1, dl :1, h1 :1, h2 :1, h3 :1, h4 :1, h5 :1, h6 :1, p :1, pre :1, li :1, dt :1, de :1, div :1, td:1, th:1 }; - + var guardDomWalkerNonEmptyTextNode = function( evt ) { @@ -20,6 +20,6 @@ CKEDITOR.dom.domWalker.blockBoundary( { br : 1 } ).call( this, evt ); }; - - + + /** * Get the cursor object which represent both current character and it's dom @@ -36,12 +36,12 @@ return obj; }; - + var pages = [ 'find', 'replace' ], - fieldsMapping = [ + fieldsMapping = [ [ 'txtFindFind', 'txtFindReplace' ], [ 'txtFindCaseChk', 'txtReplaceCaseChk' ], [ 'txtFindWordChk', 'txtReplaceWordChk' ], [ 'txtFindCyclic', 'txtReplaceCyclic' ] ]; - + /** * Synchronize corresponding filed values between 'replace' and 'find' pages. @@ -71,5 +71,5 @@ // Style object for highlights. var highlightStyle = new CKEDITOR.style( editor.config.find_highlight ); - + /** * Iterator which walk through document char by char. @@ -94,7 +94,7 @@ if( this.textNode == null ) return cursorStep.call( this ); - + this._.matchBoundary = false; - + // If there are more characters in the text node, get it and // raise an event. @@ -109,14 +109,14 @@ // the next text node. var data = null; - while ( !data || ( data.node && data.node.type != + while ( !data || ( data.node && data.node.type != CKEDITOR.NODE_TEXT ) ) { - data = this._.walker.forward( + data = this._.walker.forward( guardDomWalkerNonEmptyTextNode ); - + // Block boundary? BR? Document boundary? if ( !data.node || ( data.node.type !== CKEDITOR.NODE_TEXT - && data.node.getName() in + && data.node.getName() in characterBoundaryElementsEnum ) ) this._.matchBoundary = true; @@ -126,5 +126,5 @@ return cursorStep.call( this ); }, - + back : function() { @@ -155,5 +155,5 @@ } }; - + /** * A range of cursors which represent a trunk of characters which try to @@ -238,5 +238,5 @@ this._.rangeLength = this._.cursors.length; }, - + setMatched : function() { @@ -244,5 +244,5 @@ this.highlight(); }, - + clearMatched : function() { @@ -250,10 +250,10 @@ this.removeHighlight(); }, - + isMatched : function() { return this._.isMatched; }, - + /** * Hightlight the current matched chunk of text. @@ -283,5 +283,5 @@ this.updateFromDomRange( range ); }, - + /** * Remove highlighted find result. @@ -311,5 +311,5 @@ return retval; }, - + moveNext : function() { @@ -415,5 +415,5 @@ }; - var wordSeparatorRegex = + var wordSeparatorRegex = /[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/; @@ -466,8 +466,8 @@ headWalker = new characterWalker( head ), tailWalker = new characterWalker( tail ); - - if ( ! ( isWordSeparator( - headWalker.back().character ) - && isWordSeparator( + + if ( ! ( isWordSeparator( + headWalker.back().character ) + && isWordSeparator( tailWalker.next().character ) ) ) continue; @@ -478,7 +478,7 @@ } } - + this.range.clearMatched(); - + // clear current session and restart from beginning if ( matchCyclic ) @@ -487,13 +487,13 @@ this.range = null; } - + return false; }, - + /** * Record how much replacement occurred toward one replacing. */ replaceCounter : 0, - + replace : function( dialog, pattern, newString, matchCase, matchWord, matchCyclic, matchReplaceAll ) @@ -511,13 +511,13 @@ replaceResult = true; } - + var findResult = this.find( pattern, matchCase, matchWord, matchCyclic ); if ( findResult && matchReplaceAll ) this.replace.apply( this, Array.prototype.slice.call( arguments ) ); - return matchReplaceAll ? + return matchReplaceAll ? this.replaceCounter : replaceResult || findResult; } }; - + /** * Get the default cursor which is the start of this document. @@ -527,5 +527,5 @@ return { textNode : editor.document.getBody(), offset: 0 }; } - + /** * Get cursor that indicate search begin with, receive from user @@ -551,5 +551,5 @@ return getDefaultStartCursor(); } - + return { title : editor.lang.findAndReplace.title, @@ -739,5 +739,5 @@ //keep track of the current pattern field in use. var patternField, wholeWordChkField; - + //Ignore initial page select on dialog show var isUserSelect = false; @@ -750,5 +750,5 @@ isUserSelect = true; } ); - + this.selectPage = CKEDITOR.tools.override( this.selectPage, function( originalFunc ) { @@ -756,5 +756,5 @@ { originalFunc.call( dialog, pageId ); - + var currPage = dialog._.tabs[ pageId ]; var patternFieldInput, patternFieldId, wholeWordChkFieldId; @@ -766,5 +766,5 @@ wholeWordChkField = dialog.getContentElement( pageId, wholeWordChkFieldId ); - + // prepare for check pattern text filed 'keyup' event if ( !currPage.initialized ) @@ -774,5 +774,5 @@ currPage.initialized = true; } - + if( isUserSelect ) // synchronize fields on tab switch. @@ -786,5 +786,5 @@ // Establish initial searching start position. finder.startCursor = getStartCursor.call( this ); - + if ( startupPage == 'replace' ) this.getContentElement( 'replace', 'txtFindReplace' ).focus(); Index: /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js =================================================================== --- /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/flash/dialogs/flash.js (revision 3260) @@ -143,5 +143,5 @@ else { - if ( attrDef.name in paramMap ) + if ( attrDef.name in paramMap ) paramMap[ attrDef.name ].setAttribute( 'value', value ); else @@ -562,5 +562,5 @@ type : 'vbox', padding : 0, - children : + children : [ { Index: /CKEditor/trunk/_source/plugins/flash/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 3260) @@ -15,5 +15,5 @@ return length; } - + function isFlashEmbed( element ) { @@ -114,6 +114,6 @@ if ( !isFlashEmbed( element.children[ i ] ) ) return; - - return createFakeElement( editor, element ); + + return createFakeElement( editor, element ); } } Index: /CKEditor/trunk/_source/plugins/floatpanel/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/floatpanel/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/floatpanel/plugin.js (revision 3260) @@ -52,5 +52,5 @@ this.element = element; - + this._ = { @@ -169,9 +169,9 @@ } }, - + showAsChild : function( panel, blockName, offsetParent, corner, offsetX, offsetY ) { this.hideChild(); - + panel.onHide = CKEDITOR.tools.bind( function() { @@ -186,15 +186,15 @@ }, this ); - + this._.activeChild = panel; this._.focused = false; - + panel.showBlock( blockName, offsetParent, corner, offsetX, offsetY ); }, - + hideChild : function() { var activeChild = this._.activeChild; - + if ( activeChild ) { Index: /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js =================================================================== --- /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/forms/dialogs/checkbox.js (revision 3260) @@ -28,5 +28,5 @@ element = this._element, isInsertMode = !element; - + if ( isInsertMode ) { Index: /CKEditor/trunk/_source/plugins/forms/dialogs/select.js =================================================================== --- /CKEditor/trunk/_source/plugins/forms/dialogs/select.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/forms/dialogs/select.js (revision 3260) @@ -298,5 +298,5 @@ removeAllOptions( this ); else if ( name == 'option' ) - addOption( this, element.getText(), element.getText(), + addOption( this, element.getText(), element.getText(), this.getDialog().getParentEditor().document ); }, @@ -312,6 +312,6 @@ for ( var i = 0 ; i < optionsNames.count() ; i++ ) { - var oOption = addOption( element, optionsNames.getItem( i ).getValue(), - optionsValues.getItem( i ).getValue(), dialog.getParentEditor().document ); + var oOption = addOption( element, optionsNames.getItem( i ).getValue(), + optionsValues.getItem( i ).getValue(), dialog.getParentEditor().document ); if ( optionsValues.getItem( i ).getValue() == selectValue ) { @@ -353,5 +353,5 @@ optValue = dialog.getContentElement( 'info', 'txtOptValue' ), iIndex = getSelectedIndex( this ); - + setSelectedIndex( names, iIndex ); optName.setValue( names.getValue() ); @@ -365,5 +365,5 @@ { var oValue = element.getValue(); - addOption( this, oValue, oValue, + addOption( this, oValue, oValue, this.getDialog().getParentEditor().document ); if ( element.getAttribute( 'selected' ) == 'selected' ) @@ -490,5 +490,5 @@ optName = dialog.getContentElement( 'info', 'txtOptName' ), optValue = dialog.getContentElement( 'info', 'txtOptValue' ); - + removeSelectedOptions( names ); removeSelectedOptions( values ); Index: /CKEditor/trunk/_source/plugins/forms/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/forms/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/forms/plugin.js (revision 3260) @@ -130,5 +130,5 @@ { var name = element.getName(); - + if ( name == 'select' ) return { select : CKEDITOR.TRISTATE_OFF }; @@ -136,5 +136,5 @@ if ( name == 'textarea' ) return { textarea : CKEDITOR.TRISTATE_OFF }; - + if ( name == 'input' ) { Index: /CKEditor/trunk/_source/plugins/iframedialog/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/iframedialog/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/iframedialog/plugin.js (revision 3260) @@ -25,5 +25,5 @@ element.onContentLoad = onContentLoad; - var definition = + var definition = { title : title, @@ -85,9 +85,9 @@ { width : cssWidth, - height : cssHeight + height : cssHeight } ); } ); - var attributes = + var attributes = { src : '%2', Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js =================================================================== --- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 3260) @@ -137,5 +137,5 @@ value = checkDimension( size, value ); value = checkDimension( element.$.style[ dimension ], value ); - + this.setValue( value ); }; @@ -207,5 +207,5 @@ // Preview this.preview = CKEDITOR.document.getById( 'previewImage' ); - + // IE BUG: Selection must be in the editor for getSelectedElement() // to work. @@ -251,5 +251,5 @@ if ( !this.imageElement ) this.imageElement = element; - + // Fill out all fields. this.setupContent( IMAGE, this.imageElement ); @@ -359,5 +359,5 @@ this.originalElement.removeListener( 'abort', onImgLoadErrorEvent ); this.originalElement.remove(); - this.originalElement = false; // Dialog is closed. + this.originalElement = false; // Dialog is closed. } }, @@ -1127,5 +1127,5 @@ aMatchW = ( width ? width : '').match( regexGetSize ); - this.attributesInStyle = + this.attributesInStyle = { height : !!aMatchH, Index: /CKEditor/trunk/_source/plugins/indent/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 3260) @@ -274,5 +274,5 @@ { label : editor.lang.outdent, - command : 'outdent' + command : 'outdent' }); @@ -281,5 +281,5 @@ editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, outdent ) ); }, - + requires : [ 'domiterator', 'list' ] } ); Index: /CKEditor/trunk/_source/plugins/justify/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 3260) @@ -126,20 +126,20 @@ { label : editor.lang.justify.left, - command : 'justifyleft' + command : 'justifyleft' } ); editor.ui.addButton( 'JustifyCenter', { label : editor.lang.justify.center, - command : 'justifycenter' + command : 'justifycenter' } ); editor.ui.addButton( 'JustifyRight', { label : editor.lang.justify.right, - command : 'justifyright' + command : 'justifyright' } ); editor.ui.addButton( 'JustifyBlock', { label : editor.lang.justify.block, - command : 'justifyblock' + command : 'justifyblock' } ); Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js =================================================================== --- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3260) @@ -91,5 +91,5 @@ urlMatch = href.match( urlRegex ); } - + // Load the link type and URL. if ( emailMatch ) Index: /CKEditor/trunk/_source/plugins/link/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/link/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/link/plugin.js (revision 3260) @@ -114,6 +114,6 @@ } - return isAnchor ? - { anchor : CKEDITOR.TRISTATE_OFF } : + return isAnchor ? + { anchor : CKEDITOR.TRISTATE_OFF } : { link : CKEDITOR.TRISTATE_OFF, unlink : CKEDITOR.TRISTATE_OFF }; }); Index: /CKEditor/trunk/_source/plugins/list/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3260) @@ -116,5 +116,5 @@ for ( var i = 0 ; i < item.contents.length ; i++ ) currentListItem.append( item.contents[i].clone( true, true ) ); - + if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT ) { @@ -206,5 +206,5 @@ CKEDITOR.dom.element.setMarker( database, itemNode, 'list_item_processed', true ); } - + var fakeParent = groupObj.root.getDocument().createElement( this.type ); for ( var i = 0 ; i < selectedListItems.length ; i++ ) @@ -356,5 +356,5 @@ if ( !ranges || ranges.length < 1 ) return; - + // Midas lists rule #1 says we can create a list even in an empty document. // But DOM iterator wouldn't run if the document is really empty. @@ -374,5 +374,5 @@ } } - + var bookmarks = selection.createBookmarks( true ); @@ -485,5 +485,5 @@ currentNode.moveChildren( listNode ); } - + stopFlag = false; currentNode = listNode; @@ -523,5 +523,5 @@ { label : editor.lang.numberedlist, - command : 'numberedlist' + command : 'numberedlist' } ); editor.ui.addButton( 'BulletedList', Index: /CKEditor/trunk/_source/plugins/listblock/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/listblock/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/listblock/plugin.js (revision 3260) @@ -86,5 +86,5 @@ this._.items[ value ] = id; - pendingHtml.push( + pendingHtml.push( '
  • ' + ' ' ); - + // Creates the fake image used for this element. breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' ); - + var ranges = editor.getSelection().getRanges(); - + for ( var range, i = 0 ; i < ranges.length ; i++ ) { Index: /CKEditor/trunk/_source/plugins/panel/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/panel/plugin.js (revision 3260) @@ -122,5 +122,5 @@ '' + '' + - '' + + '' + '' + '' + @@ -222,10 +222,10 @@ } }) ); - + this.keys = {}; - + this._.focusIndex = -1; }, - + _ : {}, @@ -252,5 +252,5 @@ links = this.element.getElementsByTag( 'a' ), link; - + while ( ( link = links.getItem( ++index ) ) ) { Index: /CKEditor/trunk/_source/plugins/panelbutton/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/panelbutton/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/panelbutton/plugin.js (revision 3260) @@ -45,5 +45,5 @@ }; }, - + statics : { @@ -56,5 +56,5 @@ } }, - + proto : { @@ -96,6 +96,6 @@ this ); var keyDownFn = CKEDITOR.tools.addFunction( function( ev, element ){ - - ev = new CKEDITOR.dom.event( ev ); + + ev = new CKEDITOR.dom.event( ev ); var keystroke = ev.getKeystroke(); @@ -105,5 +105,5 @@ case 32 : // SPACE case 40 : // ARROW-DOWN - // Show panel + // Show panel CKEDITOR.tools.callFunction( clickFn, element ); break; @@ -166,5 +166,5 @@ return instance; }, - + createPanel : function( editor ) { @@ -173,9 +173,9 @@ if ( _.panel ) return; - + var panelDefinition = this._.panelDefinition || {}, panelParentElement = panelDefinition.parent || CKEDITOR.document.getBody(), panel = this._.panel = new CKEDITOR.ui.floatPanel( editor, panelParentElement, panelDefinition ), - me = this; + me = this; panel.onShow = function() @@ -211,5 +211,5 @@ }; - + if ( this.onBlock ) this.onBlock( panel, _.id ); Index: /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/pastefromword/dialogs/pastefromword.js (revision 3260) @@ -201,5 +201,5 @@ /* * SAFARI BUG: The advice label would overflow if the table layout - * isn't fixed. + * isn't fixed. */ if ( CKEDITOR.env.webkit ) @@ -217,5 +217,5 @@ type : 'vbox', padding : 0, - children : + children : [ { Index: /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/pastetext/dialogs/pastetext.js (revision 3260) @@ -15,5 +15,5 @@ minWidth : 400, minHeight : 330, - + onShow : function() { Index: /CKEditor/trunk/_source/plugins/pastetext/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/pastetext/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/pastetext/plugin.js (revision 3260) @@ -117,5 +117,5 @@ // Return the HTML or false if not enabled. return enabled && html; - }; + }; })(); Index: /CKEditor/trunk/_source/plugins/preview/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/preview/plugin.js (revision 3260) @@ -68,5 +68,5 @@ } - var oWindow = window.open( sOpenUrl, null, 'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=' + + var oWindow = window.open( sOpenUrl, null, 'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width=' + iWidth + ',height=' + iHeight + ',left=' + iLeft ); Index: /CKEditor/trunk/_source/plugins/richcombo/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/richcombo/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/richcombo/plugin.js (revision 3260) @@ -88,5 +88,5 @@ { var _ = this._; - + if ( _.state == CKEDITOR.TRISTATE_DISABLED ) return; @@ -105,5 +105,5 @@ _.committed = 1; } - + var value = this.getValue(); if ( value ) @@ -111,5 +111,5 @@ else _.list.unmarkAll(); - + _.panel.showBlock( this.id, new CKEDITOR.dom.element( $element ).getFirst(), 4 ); }, @@ -195,5 +195,5 @@ if ( this.onRender ) this.onRender(); - + return instance; }, @@ -216,5 +216,5 @@ me.setState( CKEDITOR.TRISTATE_ON ); - + list.focus( !me.multiSelect && me.getValue() ); @@ -281,5 +281,5 @@ return this._.value || ''; }, - + unmarkAll : function() { @@ -291,15 +291,15 @@ this._.list.mark( value ); }, - + hideItem : function( value ) { this._.list.hideItem( value ); }, - + hideGroup : function( groupTitle ) { this._.list.hideGroup( groupTitle ); }, - + showAll : function() { @@ -317,5 +317,5 @@ this._.list.startGroup( title ); }, - + commit : function() { Index: /CKEditor/trunk/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 3260) @@ -109,5 +109,5 @@ command : 'selectAll' }); - + editor.selectionChange = checkSelectionChangeTimeout; } @@ -641,5 +641,5 @@ for ( var i = 0 ; i < ranges.length ; i++ ) bookmarks.push( ranges[i].createBookmark2( normalized ) ); - + return bookmarks; }, Index: /CKEditor/trunk/_source/plugins/showblocks/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/showblocks/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/showblocks/plugin.js (revision 3260) @@ -87,5 +87,5 @@ var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g; - var commandDefinition = + var commandDefinition = { exec : function ( editor ) @@ -121,5 +121,5 @@ command : 'showblocks' } ); - + editor.on( 'contentDom', function() { Index: /CKEditor/trunk/_source/plugins/sourcearea/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/sourcearea/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/sourcearea/plugin.js (revision 3260) @@ -122,7 +122,7 @@ editor.on( 'mode', function() { - editor.getCommand( 'source' ).setState( - editor.mode == 'source' ? - CKEDITOR.TRISTATE_ON : + editor.getCommand( 'source' ).setState( + editor.mode == 'source' ? + CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF ); }); Index: /CKEditor/trunk/_source/plugins/styles/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/styles/plugin.js (revision 3260) @@ -138,5 +138,5 @@ : null ).call( this, range ); }, - + applyToObject : function( element ) { @@ -734,8 +734,8 @@ // Create the element. el = new CKEDITOR.dom.element( elementName, targetDocument ); - + return setupElement( el, style ); } - + function setupElement( el, style ) { Index: /CKEditor/trunk/_source/plugins/stylescombo/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/stylescombo/plugin.js (revision 3260) @@ -97,5 +97,5 @@ var style = styles[ value ], selection = editor.getSelection(); - + if ( saveRanges ) { @@ -109,8 +109,8 @@ if ( element ) style.applyToObject( element ); - + return; } - + var elementPath = new CKEDITOR.dom.elementPath( selection.getStartElement() ); Index: /CKEditor/trunk/_source/plugins/table/dialogs/table.js =================================================================== --- /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 3260) @@ -163,5 +163,5 @@ // Modify the table headers. Depends on havint rows and cols generated // correctly so it can't be done in commit functions. - + // Should we make a ? var headers = info.selHeaders; Index: /CKEditor/trunk/_source/plugins/table/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/table/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/table/plugin.js (revision 3260) @@ -57,5 +57,5 @@ } }, - + tablecell_insertBefore : { @@ -166,9 +166,9 @@ if ( isTable || isCell ) { - var ret = isCell ? - { + var ret = isCell ? + { tablecell : CKEDITOR.TRISTATE_OFF, tablerow : CKEDITOR.TRISTATE_OFF, - tablecolumn : CKEDITOR.TRISTATE_OFF + tablecolumn : CKEDITOR.TRISTATE_OFF } : {}; @@ -179,5 +179,5 @@ return ret; } - + return null; }); Index: /CKEditor/trunk/_source/plugins/templates/dialogs/templates.js =================================================================== --- /CKEditor/trunk/_source/plugins/templates/dialogs/templates.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/templates/dialogs/templates.js (revision 3260) @@ -7,5 +7,5 @@ { var doc = CKEDITOR.document; - + var listId = 'cke' + CKEDITOR.tools.getNextNumber(); @@ -23,5 +23,5 @@ imagesPath = definition.imagesPath, templates = definition.templates; - + for ( var j = 0 ; j < templates.length ; j++ ) { @@ -31,5 +31,5 @@ } } - + function createTemplateItem( editor, template, imagesPath ) { @@ -66,5 +66,5 @@ insertTemplate( editor, template.html ); }); - + return div; } @@ -88,5 +88,5 @@ if( CKEDITOR.env.ie ) dialog.restoreSelection(); - + editor.insertHtml( html ); } @@ -108,8 +108,8 @@ return { title :editor.lang.templates.title, - + minWidth :450, minHeight :400, - + contents : [ @@ -149,7 +149,7 @@ } ], - + buttons : [ CKEDITOR.dialog.cancelButton ], - + onShow : function() { Index: /CKEditor/trunk/_source/plugins/templates/templates/default.js =================================================================== --- /CKEditor/trunk/_source/plugins/templates/templates/default.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/templates/templates/default.js (revision 3260) @@ -20,5 +20,5 @@ html: '

    ' + - '' + + '' + 'Type the title here'+ '

    ' + Index: /CKEditor/trunk/_source/plugins/undo/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/undo/plugin.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/undo/plugin.js (revision 3260) @@ -112,5 +112,5 @@ this.contents = editor.getSnapshot(); this.bookmarks = selection && selection.createBookmarks2( true ); - + // In IE, we need to remove the expando attributes. if ( CKEDITOR.env.ie ) @@ -192,9 +192,9 @@ { var currentSnapshot = this.editor.getSnapshot(); - + // In IE, we need to remove the expando attributes. if ( CKEDITOR.env.ie ) currentSnapshot = currentSnapshot.replace( /\s+_cke_expando=".*?"/g, '' ); - + if ( beforeTypeImage.contents != currentSnapshot ) { @@ -215,5 +215,5 @@ }, 0, this ); - + return; } @@ -276,5 +276,5 @@ { this.editor.loadSnapshot( image.contents ); - + if ( image.bookmarks ) this.editor.getSelection().selectBookmarks( image.bookmarks ); Index: /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js =================================================================== --- /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js (revision 3259) +++ /CKEditor/trunk/_source/plugins/wsc/dialogs/wsc.js (revision 3260) @@ -19,7 +19,7 @@ ' rows="10"' + ' cols="40">' + - '
    -text +
    +text
    Index: /CKEditor/trunk/_source/tests/core/plugins.html =================================================================== --- /CKEditor/trunk/_source/tests/core/plugins.html (revision 3259) +++ /CKEditor/trunk/_source/tests/core/plugins.html (revision 3260) @@ -15,5 +15,5 @@ // Local reference to the "assert" object. var assert = CKEDITOR.test.assert; - + return { @@ -23,13 +23,13 @@ test_addExternal : function() { - CKEDITOR.plugins.addExternal( 'myplugin', + CKEDITOR.plugins.addExternal( 'myplugin', '_source/' + // %REMOVE_LINE% 'tests/core/plugins/myplugins/sample/', 'my_plugin.js' ); - + CKEDITOR.plugins.load( 'myplugin', function(){ this.resume( function(){ - + assert.isTrue( CKEDITOR.plugins.get( 'myplugin' ).definition ); - } ); + } ); }, this ); this.wait(); Index: /CKEditor/trunk/_source/tests/plugins/styles/styles.html =================================================================== --- /CKEditor/trunk/_source/tests/plugins/styles/styles.html (revision 3259) +++ /CKEditor/trunk/_source/tests/plugins/styles/styles.html (revision 3260) @@ -348,5 +348,5 @@ assert.areSame( 'this is some sample text<\/strong>. you are using     fckeditor<\/a>.', getInnerHtml( '_P1' ) ); }, - + test_checkElementRemovable1 : function() { Index: /CKEditor/trunk/_source/themes/default/theme.js =================================================================== --- /CKEditor/trunk/_source/themes/default/theme.js (revision 3259) +++ /CKEditor/trunk/_source/themes/default/theme.js (revision 3260) @@ -16,5 +16,5 @@ CKEDITOR.env.webkit ? 'webkit' : 'unknown' ); - + if ( CKEDITOR.env.ie ) {