Changeset 27108

Timestamp:

12/20/08 03:24:47 (4 years ago)

Author:

suVene

Message:

* get absolute path of <a>, <img>.
* mod $U.pathToURL

Location:

lang/javascript/vimperator-plugins

Files:

• branches/1.2/multi_requester.js (modified) (4 diffs)
• trunk/_libly.js (modified) (10 diffs)
• trunk/multi_requester.js (modified) (4 diffs)

lang/javascript/vimperator-plugins/branches/1.2/multi_requester.js

@@ -6 +6 @@
     <description lang="ja">リクエストの結果をバッファに出力する。</description>
     <author mail="suvene@zeromemory.info" homepage="http://zeromemory.sblo.jp/">suVene</author>
-    <version>0.4.4</version>
+    <version>0.4.6</version>
     <minVersion>1.2</minVersion>
     <maxVersion>1.2</maxVersion>
     <detail><![CDATA[
 == Needs Library ==
-- _libly.js(ver.0.1.4)
+- _libly.js(ver.0.1.11)
   @see http://coderepos.org/share/browser/lang/javascript/vimperator-plugins/trunk/_libly.js
 
@@ -346 +346 @@
         var el = res.getHTMLDocument(extractLink);
         if (!el) throw 'extract link failed.: extractLink -> ' + extractLink;
-        var url = $U.pathToURL(el[0]);
+        var url = $U.pathToURL(el[0], res.req.url);
         var req = new libly.Request(url, null, $U.extend(res.req.options, {extractLink: true}));
         req.addEventListener('onException', $U.bind(this, this.onException));
@@ -369 +369 @@
         }
 
-        var url, escapedUrl, xpath, doc, html, extractLink;
+        var url, escapedUrl, xpath, doc, html, extractLink, ignoreTags;
 
         try {
@@ -384 +384 @@
                 return;
             }
-            var ignoreTags = ['script'].concat(libly.$U.A(res.req.options.siteinfo.ignoreTags));
+            ignoreTags = ['script'].concat(libly.$U.A(res.req.options.siteinfo.ignoreTags));
             doc = document.createElementNS(null, 'div');
-            res.getHTMLDocument(xpath, null, ignoreTags, function(node, i) { doc.appendChild(node) } );
+            res.getHTMLDocument(xpath, null, ignoreTags, function(node, i) {
+                if (node.tagName.toLowerCase() != 'html')
+                    doc.appendChild(node);
+            });
             if (!doc) throw 'XPath result is undefined or null.: XPath -> ' + xpath;
+
+            $U.getNodesFromXPath('descendant-or-self::a | descendant-or-self::img', doc, function(node) {
+                var tagName = node.tagName.toLowerCase();
+                if (tagName == 'a') {
+                    node.href = $U.pathToURL(node, url, res.doc);
+                } else if (tagName == 'img') {
+                    node.src = $U.pathToURL(node, url, res.doc);
+                }
+            });
 
             html = '<a href="' + escapedUrl + '" class="hl-Title" target="_self">' + escapedUrl + '</a>' +

lang/javascript/vimperator-plugins/trunk/_libly.js

@@ -6 +6 @@
     <description lang="ja">適当なライブラリっぽいものたち。</description>
     <author mail="suvene@zeromemory.info" homepage="http://zeromemory.sblo.jp/">suVene</author>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
     <minVersion>1.2</minVersion>
     <maxVersion>2.0pre</maxVersion>
@@ -55 +55 @@
 
 == HTML, XML, DOM, E4X ==
-pathToURL(path):
+pathToURL(a, baseURL, doc):
     相対パスを絶対パスに変換します。
 getHTMLFragment(html):
@@ -63 +63 @@
     str から tags で指定されたタグを取り除いて返却します。
     tags は文字列、または配列で指定して下さい。
-createHTMLDocument(str):
+createHTMLDocument(str, xmlns):
     引数 str より、HTMLFragment を作成します。
 getFirstNodeFromXPath(xpath, context):
     xpath を評価しオブジェクトをを返却します。
-getNodesFromXPath(xpath, context, callback, obj):
+getNodesFromXPath(xpath, context, callback, thisObj):
     xpath を評価し snapshot の配列を返却します。
 xmlSerialize(xml):
@@ -80 +80 @@
 </VimperatorPlugin>;
 //}}}
-if (!liberator.plugins.libly) {
+//if (!liberator.plugins.libly) {
 
 liberator.plugins.libly = {};
@@ -215 +215 @@
     // }}}
     // HTML, XML, DOM, E4X {{{
-    pathToURL: function(a, doc) {
+    pathToURL: function(a, baseURL, doc) {
         if (!a) return '';
-        var path = (a.href || a.action || a.value || a);
+        var XHTML_NS = "http://www.w3.org/1999/xhtml"
+        var XML_NS   = "http://www.w3.org/XML/1998/namespace"
+        //var path = (a.href || a.getAttribute('src') || a.action || a.value || a);
+        var path = (a.getAttribute('href') || a.getAttribute('src') || a.action || a.value || a);
         if (/^https?:\/\//.test(path)) return path;
-        var link = (doc || window.content.documtent).createElement('a');
-        link.href = path;
+        var link = (doc || window.content.documtent).createElementNS(XHTML_NS, 'a');
+        link.setAttributeNS(XML_NS, 'xml:base', baseURL)
+        link.href = path
         return link.href;
     },
@@ -231 +235 @@
         return str.replace(new RegExp('<' + ignoreTags + '(?:[ \\t\\n\\r][^>]*|/)?>([\\S\\s]*?)<\/' + ignoreTags + '[ \\t\\r\\n]*>', 'ig'), '');
     },
-    createHTMLDocument: function(str, doc) {
+    createHTMLDocument: function(str, xmlns, doc) {
         doc = doc || window.content.document;
         var htmlFragment = doc.implementation.createDocument(null, 'html', null);
@@ -245 +249 @@
         return result.singleNodeValue ? result.singleNodeValue : null;
     },
-    getNodesFromXPath: function(xpath, context, callback, obj) {
+    getNodesFromXPath: function(xpath, context, callback, thisObj) {
         var ret = [];
         if (!xpath) return ret;
@@ -251 +255 @@
         var nodesSnapshot = (context.ownerDocument || context).evaluate(xpath, context, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
         for (let i = 0, l = nodesSnapshot.snapshotLength; i < l; i++) {
-            if (typeof callback == 'function') callback.call(obj, nodesSnapshot.snapshotItem(i), i);
+            if (typeof callback == 'function') callback.call(thisObj, nodesSnapshot.snapshotItem(i), i);
             ret.push(nodesSnapshot.snapshotItem(i));
         }
@@ -443 +447 @@
         } catch (e) { return ''; }
     },
-    getHTMLDocument: function(xpath, xmlns, ignoreTags, callback) {
+    getHTMLDocument: function(xpath, xmlns, ignoreTags, callback, thisObj) {
         if (!this.doc) {
+            //if (doc.documentElement.nodeName != 'HTML') {
+            //    return new DOMParser().parseFromString(str, 'application/xhtml+xml');
+            //}
             this.htmlFragmentstr = libly.$U.getHTMLFragment(this.responseText);
             this.htmlStripScriptFragmentstr = libly.$U.stripTags(this.htmlFragmentstr, ignoreTags);
@@ -450 +457 @@
         }
         if (!xpath) xpath = '//*';
-        return libly.$U.getNodesFromXPath(xpath, this.doc, callback);
+        return libly.$U.getNodesFromXPath(xpath, this.doc, callback, thisObj);
     }
 };
 //}}}
 
-}
+//}
 // vim: set fdm=marker sw=4 ts=4 sts=0 et:
 

lang/javascript/vimperator-plugins/trunk/multi_requester.js

@@ -6 +6 @@
     <description lang="ja">リクエストの結果をバッファに出力する。</description>
     <author mail="suvene@zeromemory.info" homepage="http://zeromemory.sblo.jp/">suVene</author>
-    <version>0.4.5</version>
+    <version>0.4.6</version>
     <minVersion>2.0pre</minVersion>
     <maxVersion>2.0pre</maxVersion>
     <detail><![CDATA[
 == Needs Library ==
-- _libly.js(ver.0.1.4)
+- _libly.js(ver.0.1.11)
   @see http://coderepos.org/share/browser/lang/javascript/vimperator-plugins/trunk/_libly.js
 
@@ -350 +350 @@
         var el = res.getHTMLDocument(extractLink);
         if (!el) throw 'extract link failed.: extractLink -> ' + extractLink;
-        var url = $U.pathToURL(el[0]);
+        var url = $U.pathToURL(el[0], res.req.url);
         var req = new libly.Request(url, null, $U.extend(res.req.options, {extractLink: true}));
         req.addEventListener('onException', $U.bind(this, this.onException));
@@ -373 +373 @@
         }
 
-        var url, escapedUrl, xpath, doc, html, extractLink;
+        var url, escapedUrl, xpath, doc, html, extractLink, ignoreTags;
 
         try {
@@ -388 +388 @@
                 return;
             }
-            var ignoreTags = ['script'].concat(libly.$U.A(res.req.options.siteinfo.ignoreTags));
+            ignoreTags = ['script'].concat(libly.$U.A(res.req.options.siteinfo.ignoreTags));
             doc = document.createElementNS(null, 'div');
-            res.getHTMLDocument(xpath, null, ignoreTags, function(node, i) { doc.appendChild(node) } );
+            res.getHTMLDocument(xpath, null, ignoreTags, function(node, i) {
+                if (node.tagName.toLowerCase() != 'html')
+                    doc.appendChild(node);
+            });
             if (!doc) throw 'XPath result is undefined or null.: XPath -> ' + xpath;
+
+            $U.getNodesFromXPath('descendant-or-self::a | descendant-or-self::img', doc, function(node) {
+                var tagName = node.tagName.toLowerCase();
+                if (tagName == 'a') {
+                    node.href = $U.pathToURL(node, url, res.doc);
+                } else if (tagName == 'img') {
+                    node.src = $U.pathToURL(node, url, res.doc);
+                }
+            });
 
             html = '<a href="' + escapedUrl + '" class="hl-Title" target="_self">' + escapedUrl + '</a>' +