Ticket #3207: 3207.patch

_source/core/config.js

@@ -173 +173 @@
         theme : 'default',
 
         /**
-         * The skin to load.
+         * The skin to load. It may be the name of the skin folder inside the
+         * editor installation path, or the name and the path separated by a comma.
          * @type String
          * @default 'default'
          * @example
          * config.skin = 'v2';
+         * @example
+         * config.skin = 'myskin,/customstuff/myskin/';
          */
         skin : 'default',
 

_source/core/editor.js

@@ -111 +111 @@
         {
                 // Set config related properties.
 
-                var skin = editor.config.skin;
+                var skin = editor.config.skin.split( ',' ),
+                        skinName = skin[ 0 ],
+                        skinPath = CKEDITOR.getUrl( skin[ 1 ] || (
+                                '_source/' +    // %REMOVE_LINE%
+                                'skins/' + skinName + '/' ) );
 
-                editor.skinPath = CKEDITOR.getUrl(
-                        '_source/' +    // %REMOVE_LINE%
-                        'skins/' + skin + '/' );
+                editor.skinName = skinName;
+                editor.skinPath = skinPath;
+                editor.skinClass = 'cke_skin_' + skinName;
 
-                editor.skinClass = 'cke_skin_' + skin;
-
                 // Fire the "configLoaded" event.
                 editor.fireOnce( 'configLoaded' );
 
@@ -228 +230 @@
 
         var loadSkin = function( editor )
         {
-                CKEDITOR.skins.load( editor.config.skin, 'editor', function()
+                CKEDITOR.skins.load( editor, 'editor', function()
                         {
                                 loadTheme( editor );
                         });

_source/core/skins.js

@@ -18 +18 @@
         // Holds the list of loaded skins.
         var loaded = {};
         var preloaded = {};
+        var paths = {};
 
         var loadedPart = function( skinName, part, callback )
         {
@@ -28 +29 @@
                 {
                         for ( var n = 0 ; n < fileNames.length ; n++ )
                         {
-                                fileNames[ n ] = CKEDITOR.getUrl(
-                                        '_source/' +    // %REMOVE_LINE%
-                                        'skins/' + skinName + '/' + fileNames[ n ] );
+                                fileNames[ n ] = paths[ skinName ] + fileNames[ n ];
                         }
                 };
 
@@ -133 +132 @@
                 {
                         loaded[ skinName ] = skinDefinition;
 
-                        skinDefinition.skinPath = CKEDITOR.getUrl(
-                                        '_source/' +    // %REMOVE_LINE%
-                                        'skins/' + skinName + '/' );
+                        skinDefinition.skinPath = paths[ skinName ];
                 },
 
                 /**
@@ -149 +146 @@
                  *              part files are loaded.
                  * @example
                  */
-                load : function( skinName, skinPart, callback )
+                load : function( editor, skinPart, callback )
                 {
+                        var skinName = editor.skinName,
+                                skinPath = editor.skinPath;
+
                         if ( loaded[ skinName ] )
                                 loadedPart( skinName, skinPart, callback );
                         else
                         {
-                                CKEDITOR.scriptLoader.load( CKEDITOR.getUrl(
-                                        '_source/' +    // %REMOVE_LINE%
-                                        'skins/' + skinName + '/skin.js' ), function()
+                                paths[ skinName ] = skinPath;
+                                CKEDITOR.scriptLoader.load( skinPath + 'skin.js', function()
                                                 {
                                                         loadedPart( skinName, skinPart, callback );
-                                                } );
+                                                });
                         }
                 }
          };

_source/plugins/dialog/plugin.js

@@ -399 +399 @@
                 this._.dummyText = CKEDITOR.dom.element.createFromHtml( '<input type="text" style="position: absolute; left: -100000px; top: -100000px" />' );
                 this._.dummyText.appendTo( themeBuilt.element );
 
-                CKEDITOR.skins.load( editor.config.skin, 'dialog' );
+                CKEDITOR.skins.load( editor, 'dialog' );
         };
 
         CKEDITOR.dialog.prototype =
@@ -422 +422 @@
                                 CKEDITOR.dialog.fire( 'resize',
                                         {
                                                 dialog : this,
-                                                skin : this._.editor.config.skin,
+                                                skin : this._.editor.skinName,
                                                 width : width,
                                                 height : height
                                         }, this._.editor );
@@ -1334 +1334 @@
                         element = dialog.getElement().getFirst(),
                         editor = dialog.getParentEditor(),
                         magnetDistance = editor.config.dialog_magnetDistance,
-                        margins = skinData[ editor.config.skin ].margins || [ 0, 0, 0, 0 ];
+                        margins = skinData[ editor.skinName ].margins || [ 0, 0, 0, 0 ];
 
                 function mouseMoveHandler( evt )
                 {
@@ -1407 +1407 @@
                         minWidth = definition.minWidth || 0,
                         minHeight = definition.minHeight || 0,
                         resizable = definition.resizable,
-                        margins = skinData[ dialog.getParentEditor().config.skin ].margins || [ 0, 0, 0, 0 ];
+                        margins = skinData[ dialog.getParentEditor().skinName ].margins || [ 0, 0, 0, 0 ];
 
                 function topSizer( coords, dy )
                 {

_source/plugins/image/dialogs/image.js

@@ -173 +173 @@
                         original.removeListener( 'abort', onImgLoadErrorEvent );
 
                         // Set Error image.
-                        var noimage = CKEDITOR.getUrl(
-                                '_source/' +    // %REMOVE_LINE%
-                                'skins/' + editor.config.skin + '/images/dialog.noimage.gif' );
+                        var noimage = CKEDITOR.getUrl( editor.skinPath + 'images/dialog.noimage.gif' );
 
                         if ( this.preview )
                                 this.preview.setAttribute( 'src', noimage );

_source/plugins/templates/dialogs/templates.js

@@ -98 +98 @@
         CKEDITOR.dialog.add( 'templates', function( editor )
                 {
                         // Load skin at first.
-                        CKEDITOR.skins.load( 'default', 'templates' );
+                        CKEDITOR.skins.load( editor, 'templates' );
 
                         /**
                          * Load templates once.

_source/themes/default/theme.js

@@ -112 +112 @@
                         var baseIdNumber = CKEDITOR.tools.getNextNumber();
 
                         var element = CKEDITOR.dom.element.createFromHtml( [
-                                        '<div class="cke_skin_', editor.config.skin,
+                                        '<div class="cke_skin_', editor.skinName,
                                                 ' ', browserCssClass,
                                                 ' ', CKEDITOR.env.quirks ? 'cke_mode_quirks' : 'cke_mode_standards',
                                                 ' cke_', editor.lang.dir,