Changeset 1018

Timestamp:

07/31/08 07:47:59 (1 month ago)

Author:

MaierMan

Message:

Optimize getIcon by referring to just the extensions

Files:

• trunk/chrome/content/common/internalFunctions.js (modified) (9 diffs)

trunk/chrome/content/common/internalFunctions.js

@@ -122 +122 @@
-        var rv = {};
-        merge(rv, obj);
-rv.prototype = this.prototype
+merge(rv.prototype, this.prototype)
-        rv.constructor = this.constructor;
-        return rv;
@@ -129 +129 @@
-        String.prototype,
-        { 
- 
+
-                        return this.replace(/^\s+|\s+$/g, '');
-                },
- 
+
-                        return this
-                                .replace(/[\n\r\v?:<>*|"]/g, '_')
-                                .replace(/%(?:25)?20/g, ' ');
-                },
- 
+
-                        if (this.length == 0) {
-                                return SYSTEMSLASH;
@@ -147 +147 @@
-                        return this;
-                },
- 
+
-                        if (this.length == 0) {
-                                return this;
@@ -156 +156 @@
-                        return this;
-                },
- 
+
-                        if (this.length == 0) {
-                                return this;
@@ -165 +165 @@
-                        return this;
-                },
- 
+
-                        return this.removeFinalChar(SYSTEMSLASH);
-                },
@@ -174 +174 @@
-                        return this.replaceSlashes(SYSTEMSLASH);
-                },
- 
+
-                        return this.removeLeadingChar(SYSTEMSLASH);
-                },
- 
+
-                        let t = this.replace(/\?.*$/, '')
-                                .normalizeSlashes()
@@ -184 +184 @@
-                        return t.split(SYSTEMSLASH).pop().removeBadChars().trim();
-                },
- 
+
-                        let name = this.getUsableFileName();
-                        let c = name.lastIndexOf('.');
@@ -438 +438 @@
-                        url = _atos(link);
-                }
+                let ext = url.getExtension();
+                url = 'file' + (ext ? '.' + ext : '');
+                Debug.logString(url);
-                return _getIcon(url, size);
-        }
@@ -676 +679 @@
-}
-
+// XXX switch to nsITimer?
-function Timer(func, interval, persist, now) {
-  this._id = newUUIDString();