Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js (revision 4470) @@ -53,4 +53,19 @@ }, + appendStyleText : function( cssStyleText ) + { + if ( this.$.createStyleSheet ) + { + var styleSheet = this.$.createStyleSheet( "" ); + styleSheet.cssText = cssStyleText ; + } + else + { + var style = new CKEDITOR.dom.element( 'style', this ); + style.append( new CKEDITOR.dom.text( cssStyleText, this ) ); + this.getHead().append( style ); + } + }, + createElement : function( name, attribsAndStyles ) { Index: /CKEditor/branches/versions/3.1.x/_source/core/editor.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/editor.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/core/editor.js (revision 4470) @@ -125,5 +125,5 @@ // Load language file. - loadLang( editor ); + loadSkin( editor ); }; @@ -247,5 +247,5 @@ // Load the editor skin. editor.fire( 'pluginsLoaded' ); - loadSkin( editor ); + loadTheme( editor ); }); }); @@ -256,5 +256,5 @@ CKEDITOR.skins.load( editor, 'editor', function() { - loadTheme( editor ); + loadLang( editor ); }); }; Index: /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js (revision 4470) @@ -87,5 +87,6 @@ throw '[CKEDITOR.resourceManager.add] The resource name "' + name + '" is already registered.'; - this.registered[ name ] = definition || {}; + CKEDITOR.fire( name + CKEDITOR.tools.capitalize( this.fileName ) + 'Ready', + this.registered[ name ] = definition || {} ); }, Index: /CKEditor/branches/versions/3.1.x/_source/core/skins.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/skins.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/core/skins.js (revision 4470) @@ -21,5 +21,5 @@ var paths = {}; - var loadedPart = function( skinName, part, callback ) + var loadPart = function( skinName, part, callback ) { // Get the skin definition. @@ -34,4 +34,16 @@ }; + function fixCSSTextRelativePath( cssStyleText, baseUrl ) + { + return cssStyleText.replace( /url\s*\(([\s'"]*)(.*?)([\s"']*)\)/g, + function( match, opener, path, closer ) + { + if ( /^\/|^\w?:/.test( path ) ) + return match; + else + return 'url(' + baseUrl + opener + path + closer + ')'; + } ); + } + // Check if we need to preload images from it. if ( !preloaded[ skinName ] ) @@ -44,5 +56,5 @@ { preloaded[ skinName ] = 1; - loadedPart( skinName, part, callback ); + loadPart( skinName, part, callback ); } ); return; @@ -97,9 +109,22 @@ if ( !cssIsLoaded ) { - appendSkinPath( part.css ); - - for ( var c = 0 ; c < part.css.length ; c++ ) - CKEDITOR.document.appendStyleSheet( part.css[ c ] ); - + var cssPart = part.css; + + if ( CKEDITOR.tools.isArray( cssPart ) ) + { + appendSkinPath( cssPart ); + for ( var c = 0 ; c < cssPart.length ; c++ ) + CKEDITOR.document.appendStyleSheet( cssPart[ c ] ); + } + else + { + cssPart = fixCSSTextRelativePath( + cssPart, CKEDITOR.getUrl( paths[ skinName ] ) ); + // Processing Inline CSS part. + CKEDITOR.document.appendStyleText( cssPart ); + } + + part.css = cssPart; + cssIsLoaded = 1; } @@ -157,14 +182,5 @@ if ( loaded[ skinName ] ) - { - loadedPart( skinName, skinPart, callback ); - - // Get the skin definition. - var skinDefinition = loaded[ skinName ]; - - // Trigger init function if any. - if ( skinDefinition.init ) - skinDefinition.init( editor ); - } + loadPart( skinName, skinPart, callback ); else { @@ -172,12 +188,12 @@ CKEDITOR.scriptLoader.load( skinPath + 'skin.js', function() { - loadedPart( skinName, skinPart, callback ); - // Get the skin definition. - var skinDefinition = loaded[ skinName ]; + var skinDefinition = editor.skin = loaded[ skinName ]; // Trigger init function if any. if ( skinDefinition.init ) skinDefinition.init( editor ); + + loadPart( skinName, skinPart, callback ); }); } Index: /CKEditor/branches/versions/3.1.x/_source/core/tools.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/tools.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/core/tools.js (revision 4470) @@ -99,4 +99,13 @@ /** + * Turn the first letter of string to upper-case. + * @param {String} str + */ + capitalize: function( str ) + { + return str.charAt( 0 ).toUpperCase() + str.substring( 1 ).toLowerCase(); + }, + + /** * Copy the properties from one object to another. By default, properties * already present in the target object are not overwritten. @@ -230,4 +239,25 @@ /** + * Build the HTML snippet of a set of '); + else + retval.push(''); + } + return retval.join( '' ); + }, + + /** * Replace special HTML characters in a string with their relative HTML * entity values. Index: /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js (revision 4470) @@ -32,5 +32,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ] + css : editor.skin.editor.css }, Index: /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js (revision 4470) @@ -7,9 +7,4 @@ * @fileOverview The floating dialog plugin. */ - -CKEDITOR.plugins.add( 'dialog', - { - requires : [ 'dialogui' ] - }); /** @@ -73,7 +68,4 @@ return null; } - - // Stores dialog related data from skin definitions. e.g. margin sizes. - var skinData = {}; /** @@ -1438,5 +1430,5 @@ editor = dialog.getParentEditor(), magnetDistance = editor.config.dialog_magnetDistance, - margins = skinData[ editor.skinName ].margins || [ 0, 0, 0, 0 ]; + margins = editor.skin.margins || [ 0, 0, 0, 0 ]; if ( typeof magnetDistance == 'undefined' ) @@ -1516,5 +1508,5 @@ minHeight = definition.minHeight || 0, resizable = definition.resizable, - margins = skinData[ dialog.getParentEditor().skinName ].margins || [ 0, 0, 0, 0 ]; + margins = dialog.getParentEditor().skin.margins || [ 0, 0, 0, 0 ]; function topSizer( coords, dy ) @@ -2673,15 +2665,4 @@ }; })(); - - // Grab the margin data from skin definition and store it away. - CKEDITOR.skins.add = ( function() - { - var original = CKEDITOR.skins.add; - return function( skinName, skinDefinition ) - { - skinData[ skinName ] = { margins : skinDefinition.margins }; - return original.apply( this, arguments ); - }; - } )(); })(); @@ -2735,4 +2716,9 @@ return null; } + }); + +CKEDITOR.plugins.add( 'dialog', + { + requires : [ 'dialogui' ] }); Index: /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js (revision 4470) @@ -37,5 +37,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), + css : editor.skin.editor.css.concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js (revision 4470) @@ -34,5 +34,5 @@ panel : { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ].concat( config.contentsCss ), + css : editor.skin.editor.css.concat( config.contentsCss ), voiceLabel : lang.panelVoiceLabel }, Index: /CKEditor/branches/versions/3.1.x/_source/plugins/menu/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/menu/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/menu/plugin.js (revision 4470) @@ -133,5 +133,5 @@ panel = this._.panel = new CKEDITOR.ui.floatPanel( this.editor, CKEDITOR.document.getBody(), { - css : [ CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ], + css : editor.skin.editor.css, level : this._.level - 1, className : editor.skinClass + ' cke_contextmenu' Index: /CKEditor/branches/versions/3.1.x/_source/plugins/panel/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/panel/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/panel/plugin.js (revision 4470) @@ -161,5 +161,5 @@ // after
, so it (body) becames immediatelly // available. (#3031) - '' + + CKEDITOR.tools.buildStyleHtml( this.css ) + '<\/html>' ); doc.$.close(); Index: /CKEditor/branches/versions/3.1.x/_source/plugins/preview/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/preview/plugin.js (revision 4469) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/preview/plugin.js (revision 4470) @@ -38,7 +38,5 @@ baseTag + '