Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 3744) +++ /CKEditor/trunk/_source/core/config.js (revision 3745) @@ -171,5 +171,5 @@ */ removePlugins : '', - + /** * List of regular expressions to be executed over the input HTML, @@ -177,7 +177,7 @@ * @type Array * @example - * config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // PHP Code - * config.protectedSource.push( /<%[\s\S]*?%>/g ); // ASP Code - * config.protectedSource.push( /(]+>[\s|\S]*?<\/asp:[^\>]+>)|(]+\/>)/gi ); // ASP.Net Code + * config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // PHP Code + * config.protectedSource.push( /<%[\s\S]*?%>/g ); // ASP Code + * config.protectedSource.push( /(]+>[\s|\S]*?<\/asp:[^\>]+>)|(]+\/>)/gi ); // ASP.Net Code */ protectedSource : [], Index: /CKEditor/trunk/_source/core/htmlparser/comment.js =================================================================== --- /CKEditor/trunk/_source/core/htmlparser/comment.js (revision 3744) +++ /CKEditor/trunk/_source/core/htmlparser/comment.js (revision 3745) @@ -47,5 +47,5 @@ if ( !( comment = filter.onComment( comment ) ) ) return; - + if ( typeof comment != 'string' ) { Index: /CKEditor/trunk/_source/plugins/dialogui/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3744) +++ /CKEditor/trunk/_source/plugins/dialogui/plugin.js (revision 3745) @@ -657,5 +657,5 @@ var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition ); - var onClick = myDefinition.onClick; + var onClick = myDefinition.onClick; myDefinition.className = ( myDefinition.className ? myDefinition.className + ' ' : '' ) + 'cke_dialog_ui_button'; myDefinition.onClick = function( evt ) Index: /CKEditor/trunk/_source/plugins/filebrowser/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/filebrowser/plugin.js (revision 3744) +++ /CKEditor/trunk/_source/plugins/filebrowser/plugin.js (revision 3745) @@ -7,12 +7,12 @@ * @fileOverview The "filebrowser" plugin, it adds support for file uploads and * browsing. - * + * * When file is selected inside of the file browser or uploaded, its url is * inserted automatically to a field, which is described in the 'filebrowser' * attribute. To specify field that should be updated, pass the tab id and * element id, separated with a colon. - * + * * Example 1: (Browse) - * + * * * { @@ -23,10 +23,10 @@ * } * - * + * * If you set the 'filebrowser' attribute on any element other than * 'fileButton', the 'Browse' action will be triggered. - * + * * Example 2: (Quick Upload) - * + * * * { @@ -38,13 +38,13 @@ * } * - * + * * If you set the 'filebrowser' attribute on a fileButton element, the * 'QuickUpload' action will be executed. - * + * * Filebrowser plugin also supports more advanced configuration (through * javascript object). - * + * * The following settings are supported: - * + * * * [action] - Browse or QuickUpload @@ -54,7 +54,7 @@ * [url] - the URL to be called (optional) * - * + * * Example 3: (Quick Upload) - * + * * * { @@ -71,7 +71,7 @@ * currentFolder : '/folder/' * }, - * onSelect : function( fileUrl, errorMessage ) //optional + * onSelect : function( fileUrl, errorMessage ) //optional * { - * // Do not call the built-in selectFuntion + * // Do not call the built-in selectFuntion * // return false; * } @@ -80,5 +80,5 @@ * } * - * + * * Suppose we have a file element with id 'myFile', text field with id * 'elementId' and a fileButton. If filebowser.url is not specified explicitly, @@ -87,7 +87,7 @@ * object will be added to the query string. It is possible to create your own * uploadHandler and cancel the built-in updateTargetElement command. - * + * * Example 4: (Browse) - * + * * * { @@ -103,10 +103,10 @@ * } * - * + * * In this example, after pressing a button, file browser will be opened in a * popup. If we don't specify filebrowser.url attribute, * 'filebrowser[DialogName]BrowseUrl' or 'filebrowserBrowseUrl' will be used. * After selecting a file in a file browser, an element with id 'elementId' will - * be updated. Just like in the third example, a custom 'onSelect' function may be + * be updated. Just like in the third example, a custom 'onSelect' function may be * defined. */ @@ -115,5 +115,5 @@ /** * Adds (additional) arguments to given url. - * + * * @param {String} * url The url. @@ -138,5 +138,5 @@ /** * Make a string's first character uppercase. - * + * * @param {String} * str String. @@ -152,5 +152,5 @@ * The onlick function assigned to the 'Browse Server' button. Opens the * file browser and updates target field when file is selected. - * + * * @param {CKEDITOR.event} * evt The event object. @@ -182,5 +182,5 @@ * decision whether form is really submitted and updates target field when * file is uploaded. - * + * * @param {CKEDITOR.event} * evt The event object. @@ -205,5 +205,5 @@ /** * Setups the file element. - * + * * @param {CKEDITOR.ui.dialog.file} * fileInput The file element used during file upload. @@ -227,5 +227,5 @@ * Traverse through the content definition and attach filebrowser to * elements with 'filebrowser' attribute. - * + * * @param String * dialogName Dialog name. @@ -262,5 +262,5 @@ if ( element.filebrowser.action == 'Browse' ) { - var url = element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ] + var url = element.filebrowser.url || editor.config[ 'filebrowser' + ucFirst( dialogName ) + 'BrowseUrl' ] || editor.config.filebrowserBrowseUrl; @@ -290,5 +290,5 @@ /** * Updates the target element with the url of uploaded/selected file. - * + * * @param {String} * url The url of a file. @@ -314,6 +314,6 @@ /** - * Returns true if filebrowser is configured in one of the elements. - * + * Returns true if filebrowser is configured in one of the elements. + * * @param {CKEDITOR.dialog.dialogDefinitionObject} * definition Dialog definition. @@ -335,5 +335,5 @@ return false; } - + return ( definition.getContents( tabId ).get( elementId ).filebrowser && definition.getContents( tabId ).get( elementId ).filebrowser.url ); } @@ -351,5 +351,5 @@ return; - // The "data" argument may be used to pass the error message to the editor. + // The "data" argument may be used to pass the error message to the editor. if ( typeof data == 'string' && data ) alert( data ); @@ -373,5 +373,5 @@ if ( evt.data.definition.contents[ i ].hidden && evt.data.definition.contents[ i ].filebrowser ) { - evt.data.definition.contents[ i ].hidden = + evt.data.definition.contents[ i ].hidden = !isConfigured( evt.data.definition, evt.data.definition.contents[ i ][ 'id' ], evt.data.definition.contents[ i ].filebrowser ); } Index: /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 3744) +++ /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 3745) @@ -243,5 +243,5 @@ ] .concat( protectRegexes ); - + for ( var i = 0 ; i < regexes.length ; i++ ) { @@ -251,5 +251,5 @@ }); } - + return data; } Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js =================================================================== --- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3744) +++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 3745) @@ -39,5 +39,5 @@ typeValue = this.getValue(), uploadInitiallyHidden = dialog.definition.getContents( 'upload' ).hidden; - + if ( typeValue == 'url' ) { Index: /CKEditor/trunk/_source/tests/core/dom/element.html =================================================================== --- /CKEditor/trunk/_source/tests/core/dom/element.html (revision 3744) +++ /CKEditor/trunk/_source/tests/core/dom/element.html (revision 3745) @@ -507,8 +507,8 @@ assert.isTrue( element.hasAttributes() ); }, - + test_getDocumentPosition : function() { - // Assign the page location of the element. + // Assign the page location of the element. YAHOO.util.Dom.setXY('DocPositionTarget', [ 350, 450 ] ); var pos = CKEDITOR.document.getById( 'DocPositionTarget' ).getDocumentPosition(); @@ -524,5 +524,5 @@ } }, - + name : document.title }; @@ -602,7 +602,7 @@ Test Test - + target - +
* { @@ -23,10 +23,10 @@ * } *
* { @@ -38,13 +38,13 @@ * } *
* [action] - Browse or QuickUpload @@ -54,7 +54,7 @@ * [url] - the URL to be called (optional) *
* { @@ -71,7 +71,7 @@ * currentFolder : '/folder/' * }, - * onSelect : function( fileUrl, errorMessage ) //optional + * onSelect : function( fileUrl, errorMessage ) //optional * { - * // Do not call the built-in selectFuntion + * // Do not call the built-in selectFuntion * // return false; * } @@ -80,5 +80,5 @@ * } *
* { @@ -103,10 +103,10 @@ * } *