Changeset 29458

Timestamp:

02/03/09 09:20:22 (4 years ago)

Author:

cho45

Message:

読みやすさのため E4X + DOMParser に

Files:

• lang/javascript/userchrome/hatena-multi.uc.js (modified) (4 diffs)

lang/javascript/userchrome/hatena-multi.uc.js

@@ -21 +21 @@
 (function () { with (D()) {
 
-function createElementFromStringNS (str, opts) {
-        if (!opts) opts = { data: {} };
-        if (!opts.data) opts.data = { };
-
-        var t, cur = opts.parent || document.createDocumentFragment(), root, stack = [cur];
-        var namespaces = opts.ns || {};
-        while (str.length) {
-                if (str.indexOf("<") == 0) {
-                        if ((t = str.match(/^\s*<(\/?(?:([^\s>:]+?):)?([^\s>\/]+))([^>]+?)?(\/)?>/))) {
-                                var tag = t[1], prefix = t[2], localname = t[3], attrs = t[4], isempty = !!t[5];
-                                if (tag.indexOf("/") == -1) {
-                                        child = document.createElementNS(namespaces[prefix || ""], tag);
-                                        if (attrs) attrs.replace(/(?:([^:\s]+?):)?([a-z\d]+)=(?:'([^']+)'|"([^"]+)")/gi,
-                                                function (m, prefix, name, v1, v2) {
-                                                        var v = text(v1 || v2);
-                                                        if (name == "class") root && (root[v] = child);
-                                                        // ignore default namespace for attribute
-                                                        child.setAttributeNS(prefix == "" ? null : namespaces[prefix], name, v);
-                                                }
-                                        );
-                                        cur.appendChild(root ? child : (root = child));
-                                        if (!isempty) {
-                                                stack.push(cur);
-                                                cur = child;
-                                        }
-                                } else cur = stack.pop();
-                        } else throw("Parse Error: " + str);
-                } else {
-                        if ((t = str.match(/^([^<]+)/))) cur.appendChild(document.createTextNode(text(t[0])));
-                }
-                str = str.substring(t[0].length);
-        }
-
-        function text (str) {
-                return str
-                        .replace(/&(#(x)?)?([^;]+);/g, function (_, isNumRef, isHex, ref) {
-                                return isNumRef ? String.fromCharCode(parseInt(ref, isHex ? 16 : 10)):
-                                                  {"lt":"<","gt":"<","amp":"&"}[ref];
-                        })
-                        .replace(/#\{([^}]+)\}/g, function (_, name) {
-                                return (typeof(opts.data[name]) == "undefined") ? _ : opts.data[name];
-                        });
-        }
-
-        return root;
+function DOM (xmlns, xml) {
+        var doc = (new DOMParser()).parseFromString(
+                '<root xmlns="' + xmlns + '">' + xml.toXMLString() + "</root>",
+                "application/xml"
+        );
+        var imported = document.importNode(doc.documentElement, true);
+        var range = document.createRange();
+        range.selectNodeContents(imported);
+        var fragment = range.extractContents();
+        range.detach();
+        return fragment.childNodes.length > 1 ? fragment : fragment.firstChild;
 }
 
@@ -91 +57 @@
 
                 var statusbar = document.getElementById("status-bar");
-                self.panel    = createElementFromStringNS(<><![CDATA[
-                        <statusbarpanel id='#{id}'>
-                                <image src='#{iconimg}'/>
-                                <label class='_label'/>
-                                <menupopup class='_menupopup'/>
+                self.panel    = DOM(kXULNS,
+                        <statusbarpanel id={self.ID}>
+                                <image src={self.iconimg}/>
+                                <label/>
+                                <menupopup/>
                         </statusbarpanel>
-                ]]></>.toString(), {
-                        parent : statusbar,
-                        data   : {
-                                id : self.ID,
-                                iconimg : self.iconimg
-                        },
-                        ns     : {
-                                "" : kXULNS
-                        }
-                });
-
-                self.menu = self.panel._menupopup;
-                self.lbl  = self.panel._label;
+                );
+                statusbar.appendChild(self.panel);
+
+                self.menu = self.panel.querySelector("menupopup");
+                self.lbl  = self.panel.querySelector("label");
 
                 self.panel.addEventListener("click", function () {
@@ -143 +101 @@
                 while (self.menu.firstChild) self.menu.removeChild(self.menu.firstChild);
                 logins.forEach(function (l) {
-                        var mi = createElementFromStringNS("<menuitem label='#{label}'/>", {
-                                parent : self.menu,
-                                data   : {
-                                        label : l.username
-                                },
-                                ns     : {
-                                        "" : kXULNS
-                                }
-                        });
+                        var mi = DOM(kXULNS, <menuitem label={l.username}/>);
+                        self.menu.appendChild(mi);
 
                         mi.addEventListener("command", function (e) {
@@ -174 +125 @@
                 ];
 
-                var sep = document.createElementNS(kXULNS, "menuseparator");
-                self.menu.appendChild(sep);
+                self.menu.appendChild(DOM(kXULNS, <menuseparator/>));
 
                 addtionalMenu.forEach(function (l) {
-                        createElementFromStringNS("<menuitem label='#{label}'/>", {
-                                parent : self.menu,
-                                data   : {
-                                        label : l.label
-                                },
-                                ns     : {
-                                        "" : kXULNS
-                                }
-                        }).addEventListener("command", l.command, false);
+                        var mi = DOM(kXULNS, <menuitem label={l.label}/>);
+                        self.menu.appendChild(mi);
+                        mi.addEventListener("command", l.command, false);
                 });