Changeset 16883 for lang/javascript/vimperator-plugins/trunk

Timestamp:

07/30/08 19:41:35 (4 months ago)

Author:

anekos

Message:

succ するときに、URIの後ろの方の数字/文字を優先するように修正

Files:

• lang/javascript/vimperator-plugins/trunk/auto_detect_link.js (modified) (7 diffs)

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

@@ -3 +3 @@
 // @description-ja (次|前)っぽいページへのリンクを探してジャンプ
 // @license        Creative Commons 2.1 (Attribution + Share Alike)
-// @version        1.0
+// @version        1.0.1
 // ==/VimperatorPlugin==
 //
@@ -195 +195 @@
     let [_, dir, file] = urim, result = [];
     // succ number
-    let (dm, succs, file = file, left = '') {
+    let (dm, succs, file = file, left = '', temp = []) {
       while (file && (dm = file.match(/\d+/))) {
         let [rcontext, lcontext, lmatch] = [RegExp.rightContext, RegExp.leftContext, RegExp.lastMatch];
@@ -201 +201 @@
         succs = succNumber(lmatch, next);
         for each (let succ in succs) {
-          result.push(dir + left + succ + rcontext);
+          temp.push(dir + left + succ + rcontext);
         }
         left += lmatch;
         file = rcontext;
       }
-    }
+      result = result.concat(temp.reverse());
+    }
+    liberator.log(result);
     // succ string
-    let (dm, succs, file = file, left = '') {
+    let (dm, succs, file = file, left = '', temp = []) {
       while (file && (dm = file.match(/(^|[^a-zA-Z])([a-zA-Z])([^a-zA-Z]|$)/))) {
         let [rcontext, lcontext] = [RegExp.rightContext, RegExp.leftContext];
@@ -214 +216 @@
         succs = succString(dm[2], next);
         for each (let succ in succs) {
-          result.push(dir + left + succ + dm[3] + rcontext);
+          temp.push(dir + left + succ + dm[3] + rcontext);
         }
         left += dm[1];
         file = dm[3] + rcontext;
       }
+      result = result.concat(temp.reverse());
     }
     return result;
@@ -266 +269 @@
     for each (let it in content.document.links) {
       if (linkFilter(it))
-        result.push({frame: content, uri: it.href, text: it.textContent, element: it});
+        result.push({
+          type: 'link',
+          frame: content,
+          uri: it.href,
+          text: it.textContent,
+          element: it
+        });
     }
     // Form
@@ -272 +281 @@
       (function (input) {
         result.push({
+          type: 'input',
           frame: content, 
           uri: input.form && input.form.action, 
@@ -329 +339 @@
       if (setting.useSuccPattern) {
         for each (succ in succs) {
-          let link = find(links, function (link) (link.uri.indexOf(succ) >= 0));
+          let link = find(links, function (link) (link.uri && (link.uri.indexOf(succ) >= 0)));
           if (link)
             return link;