Changeset 1031

Timestamp:

08/23/08 15:13:52 (3 months ago)

Author:

ray

Message:

#1227 @import rule & stylistLoadStylesheet

Files:

• branches/new-dialogs/plugins/Stylist/stylist.js (modified) (1 diff)
• trunk/examples/XinhaConfig.js (modified) (1 diff)
• trunk/plugins/Stylist/stylist.js (modified) (2 diffs)

branches/new-dialogs/plugins/Stylist/stylist.js

@@ -453 +453 @@
 Xinha.ripStylesFromCSSFile = function(URL)
 {
-  Xinha.setLoadingMessage('Loading Styles');
   var css = Xinha._geturlcontent(URL);
+  var RE_atimport = '@import\\s*(url\\()?["\'](.*)["\'].*';
+  var imports = css.match(new RegExp(RE_atimport,'ig'));
+  var m, file, re = new RegExp(RE_atimport,'i');
+
+  if (imports)
+  {
+    var path = URL.replace(/\?.*$/,'').split("/");
+    path.pop();
+    path = path.join('/');
+    for (var i=0;i<imports.length;i++)
+    {
+      m = imports[i].match(re);
+      file = m[2];
+      if (!file.match(/^([^:]+\:)?\//))
+      {
+        file = Xinha._resolveRelativeUrl(path,file);
+      }
+      css += Xinha._geturlcontent(file);
+    }
+  }
+
   return Xinha.ripStylesFromCSSString(css);
 };

trunk/examples/XinhaConfig.js

@@ -68 +68 @@
    // NOTE : YOU MUST GIVE AN ABSOLUTE URL
   
-   xinha_config.pageStyleSheets = [ _editor_url + "examples/full_example.css" ];
+   xinha_config.pageStyleSheets = [ _editor_url + "examples/files/full_example.css" ];
+   //if you're using Stylist, import a stylesheet like this
+   xinha_config.stylistLoadStylesheet(_editor_url + "examples/files/stylist.css");
 
   /** STEP 4 ***************************************************************

trunk/plugins/Stylist/stylist.js

@@ -453 +453 @@
 {
   var css = Xinha._geturlcontent(URL);
+  var RE_atimport = '@import\\s*(url\\()?["\'](.*)["\'].*';
+  var imports = css.match(new RegExp(RE_atimport,'ig'));
+  var m, file, re = new RegExp(RE_atimport,'i');
+
+  if (imports)
+  {
+    var path = URL.replace(/\?.*$/,'').split("/");
+    path.pop();
+    path = path.join('/');
+    for (var i=0;i<imports.length;i++)
+    {
+      m = imports[i].match(re);
+      file = m[2];
+      if (!file.match(/^([^:]+\:)?\//))
+      {
+        file = Xinha._resolveRelativeUrl(path,file);
+      }
+      css += Xinha._geturlcontent(file);
+    }
+  }
+
   return Xinha.ripStylesFromCSSString(css);
 };
@@ -462 +483 @@
   RE_comment = /\/\*(.|\r|\n)*?\*\//g;
   RE_rule    = /\{(.|\r|\n)*?\}/g;
+  css = css.replace(RE_comment, '');
   css = css.replace(RE_comment, '');
   css = css.replace(RE_rule, ',');