Changeset 26646

Timestamp:

12/14/08 03:49:06 (4 years ago)

Author:

drry

Message:

• @suVene バグごめんなさい。
  
• 正規表現を削減・修正しました。
  
• ほか。
  

Files:

• lang/javascript/vimperator-plugins/trunk/nextlink.js (modified) (6 diffs)

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

@@ -96 +96 @@
             this.siteinfo = [
                 {
-                    url: '^http:\\/\\/192\\.168\\.',
-                    nextLink: 'id("next")',
-                    pageElement: '//*'
-                },
-                {
-                    url: '^http:\\/\\/localhost',
+                    url: '^https?://(?:192\\.168(?:\\.\\d+){2}|localhost)(?::\\d+)?/',
                     nextLink: 'id("next")',
                     pageElement: '//*'
@@ -131 +126 @@
 
             for (let i = 0, len = this.siteinfo.length; i < len; i++) {
-                if (url.match(this.siteinfo[i].url) && !/^\^https\?:\/\/\.$/.test(this.siteinfo[i].url)) {
+                if (url.match(this.siteinfo[i].url) && this.siteinfo[i].url != '^https?://.') {
                     this.setCache(url,
                             ['doc', 'xpath', 'siteinfo'],
@@ -187 +182 @@
         removeMap: function(cmd) {
             try {
-                if (mappings.hasMap(this.browserModes, cmd)) {;
+                if (mappings.hasMap(this.browserModes, cmd)) {
                     mappings.remove(this.browserModes, cmd);
                 }
@@ -243 +238 @@
                     if (cache.curPage == 1) {
                         return;
+                    } else if (--cache.curPage == 1) {
+                        window.content.scrollTo(0, 0);
                     } else {
-                        cache.curPage--;
-                        if (cache.curPage == 1) {
-                            window.content.scrollTo(0, 0);
-                        } else {
-                            this.focusPagenavi(context, url, cache.curPage);
-                        }
+                        this.focusPagenavi(context, url, cache.curPage);
                     }
                 }),
@@ -270 +262 @@
                     }
                     if (cache.loadedURLs[reqUrl]) {
-                        cache.curPage++;
-                        this.focusPagenavi(context, url, cache.curPage);
+                        this.focusPagenavi(context, url, ++cache.curPage);
                         return;
                     }
@@ -399 +390 @@
             $U.getNodesFromXPath(cache.xpath, doc, function(item) elem = item, this);
 
-            var nextUrl = $U.pathToURL(elem, doc);
-            var prev = $U.getNodesFromXPath('//a[@rel="prev"] | //link[@rel="prev"]', doc);
+            var nextURL = $U.pathToURL(elem, doc);
+            var xpath = ['a', 'link'].map(function(e) '//' + e + '[translate(normalize-space(@rel), "EPRV", "eprv")="prev"]')
+                                     .join(' | ');
+            var prev = $U.getNodesFromXPath(xpath, doc);
             if (prev.length) {
                 context.setCache(url, 'prev', prev[0]);
             }
-            context.setCache(nextUrl, 'prev', url);
+            context.setCache(nextURL, 'prev', url);
             context.setCache(url, 'next', elem);
         },