Changeset 2097

Timestamp:

06/19/08 11:56:43 (5 years ago)

Author:

fredck

Message:

Fixed #2149 : CSS urls with querystring parameters were not being accepted for CSS values in the configuration file (like EditorAreaCSS).

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (2 diffs)

FCKeditor/trunk/_whatsnew.html

@@ -62 +62 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2276">#2276</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/2279">#2279</a>] On Opera
                         and Firefox 3, the entire page was scrolling on ENTER.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2149">#2149</a>] CSS urls
+                        with querystring parameters were not being accepted for CSS values in the configuration
+                        file (like EditorAreaCSS).</li>
         </ul>
         <p>

FCKeditor/trunk/editor/_source/internals/fcktools.js

@@ -82 +82 @@
         {
                 // Test if the passed argument is an URL.
-                if ( /[\\\/\.]\w*$/.test( cssFileOrArrayOrDef ) )
+                if ( /[\\\/\.][^{}]*$/.test( cssFileOrArrayOrDef ) )
                 {
                         // The string may have several URLs separated by comma.
@@ -127 +127 @@
                 {
                         // Test if the passed argument is an URL.
-                        if ( /[\\\/\.]\w*$/.test( cssFileOrArrayOrDef ) )
+                        if ( /[\\\/\.][^{}]*$/.test( cssFileOrArrayOrDef ) )
                         {
                                 // The string may have several URLs separated by comma.