Changeset 4585

Timestamp:

12/03/09 17:10:12 (3 years ago)

Author:

garry.yao

Message:

#4549: Make the anti-cache query string configurable.

Location:

CKEditor/branches/versions/3.1.x

Files:

• CHANGES.html (modified) (2 diffs)
• _source/core/config.js (modified) (1 diff)
• _source/core/editor.js (modified) (2 diffs)

CKEditor/branches/versions/3.1.x/CHANGES.html

@@ -34 +34 @@
         <h1>
                 CKEditor Changelog
-        </h1>
+        </h1>l45
+
         <h3>
                 CKEditor 3.1 (SVN)</h3>
@@ -44 +45 @@
                 <li><a href="http://dev.fckeditor.net/ticket/2885">#2885</a> : Added 'div' dialog and corresponding context menu options.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4341">#4341</a> : Added the 'showborder' plugin.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4549">#4549</a> : Make the anti-cache query string configurable.</li>
         </ul>
         <p>

CKEditor/branches/versions/3.1.x/_source/core/config.js

@@ -41 +41 @@
          * CKEDITOR.replace( 'myfiled', { customConfig : '' } );
          */
-        customConfig : CKEDITOR.getUrl( 'config.js' ),
+        customConfig : 'config.js',
 
         /**

CKEditor/branches/versions/3.1.x/_source/core/editor.js

@@ -28 +28 @@
         var loadConfig = function( editor )
         {
-                var customConfig = editor.config.customConfig;
+                var customConfig = CKEDITOR.getUrl( editor.config.customConfig );
 
                 // Check if there is a custom config to load.
@@ -45 +45 @@
                         // If there is no other customConfig in the chain, fire the
                         // "configLoaded" event.
-                        if ( editor.config.customConfig == customConfig || !loadConfig( editor ) )
+                        if ( CKEDITOR.getUrl( editor.config.customConfig ) == customConfig || !loadConfig( editor ) )
                                 editor.fireOnce( 'customConfigLoaded' );
                 }