Changeset 38487 for lang/javascript

Timestamp:

09/19/10 08:13:03 (3 years ago)

Author:

anekos

Message:

補完修正

Files:

• lang/javascript/vimperator-plugins/trunk/twittperator.js (modified) (12 diffs)

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

@@ -1767 +1767 @@
             Twitter.favorite(m[0]);
         },
+        timelineCompleter: true,
         completer: Completers.id(rejectMine)
       }),
@@ -1777 +1778 @@
             Twitter.unfavorite(m[1]);
         },
+        timelineCompleter: true,
         completer: Completers.name_id_text(rejectMine)
       }),
@@ -1789 +1791 @@
           }
         },
+        timelineCompleter: true,
         completer: Completers.name()
       }),
@@ -1795 +1798 @@
         description: "Twitter search",
         action: function(arg) Twittperator.showTwitterSearchResult(arg),
+        timelineCompleter: true,
         completer: Completers.text()
       }),
@@ -1801 +1805 @@
         description: "Open link",
         action: function(arg) Twittperator.openLink(arg),
+        timelineCompleter: true,
         completer: Completers.text(function(s) /https?:\/\//(s.text))
       }),
@@ -1811 +1816 @@
             Twitter.destroy(m[0]);
         },
+        timelineCompleter: true,
         completer: Completers.id(seleceMine)
       }),
@@ -1833 +1839 @@
           history.filter(function(st) st.id === id).map(dtdd).forEach(liberator.echo);
         },
+        timelineCompleter: true,
         completer: Completers.id()
       }),
@@ -1843 +1850 @@
         completer: function (context, args) {
           if (setting.trackWords)
-            context.completions = [setting.trackWords, "from global variable"];
+            context.completions = [[setting.trackWords, "Global variable"]];
         }
       }),
@@ -1876 +1883 @@
           (this.match(desc.user.screen_name) || this.match(desc.text));
 
-      context.createRow = function(item, highlightGroup) {
-        let desc = item[1] || this.process[1].call(this, item, item.description);
-
-        if (desc && desc.user) {
+      function setTimelineCompleter() {
+        context.createRow = function(item, highlightGroup) {
+          let desc = item[1] || this.process[1].call(this, item, item.description);
+
+          if (desc && desc.user) {
+            return <div highlight={highlightGroup || "CompItem"} style="white-space: nowrap">
+                <li highlight="CompDesc">
+                  <img src={desc.user.profile_image_url} style="max-width: 24px; max-height: 24px"/>
+                  &#160;{desc.user.screen_name}: {desc.text}
+                </li>
+            </div>;
+          }
+
           return <div highlight={highlightGroup || "CompItem"} style="white-space: nowrap">
-              <li highlight="CompDesc">
-                <img src={desc.user.profile_image_url} style="max-width: 24px; max-height: 24px"/>
-                &#160;{desc.user.screen_name}: {desc.text}
-              </li>
+              <li highlight="CompDesc">{desc}&#160;</li>
           </div>;
-        }
-
-        return <div highlight={highlightGroup || "CompItem"} style="white-space: nowrap">
-            <li highlight="CompDesc">{desc}&#160;</li>
-        </div>;
-      };
+        };
+
+        context.filters = [statusObjectFilter];
+      }
 
       let len = 0;
@@ -1898 +1909 @@
         let [subCmd, m] = findSubCommand(args.literalArg) || [];
         if (subCmd) {
+          if (subCmd.timelineCompleter)
+            setTimelineCompleter();
           context.title = ["Hidden", "Entry"];
           subCmd.completer(context, args);
@@ -1903 +1916 @@
         }
       } else {
+        setTimelineCompleter();
         let m;
         if (m = args.literalArg.match(/(RT\s+)@.*$/)) {
@@ -1917 +1931 @@
       context.title = ["Name#ID", "Entry"];
       context.offset += len;
-      context.filters = [statusObjectFilter];
       // XXX 本文でも検索できるように、@ はなかったことにする
       context.filter = context.filter.replace(/^@/, "");