Changeset 36957

Timestamp:

03/08/10 03:13:37 (3 years ago)

Author:

anekos

Message:

-xpath -frame の修正

Files:

• lang/javascript/vimperator-plugins/trunk/feedSomeKeys_3.js (modified) (8 diffs)

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

@@ -40 +40 @@
   <description>feed some defined key events into the Web content</description>
   <description lang="ja">キーイベントをWebコンテンツ側に送る</description>
-  <version>1.7.0</version>
+  <version>1.7.1</version>
   <author mail="anekos@snca.net" homepage="http://d.hatena.ne.jp/nokturnalmortum/">anekos</author>
   <license>new BSD License (Please read the source code comments of this plugin)</license>
@@ -331 +331 @@
 
   function or (list, func)
-    let ([head, tail] = list)
-      ((func || v)(head) || (tail && or(tail, func)));
+    (list.length && let ([head,] = list) (func(head) || or(list.slice(1), func)));
 
   function getFrames () {
@@ -339 +338 @@
 
     function get (content)
-      (bodyCheck(content) && result.push(content), Array.slice(content.frames).forEach(get))
+      (bodyCheck(content) && result.push(content), Array.slice(content.frames).forEach(get));
 
     let result = [];
@@ -398 +397 @@
     try {
       RegExp(expr);
+      return true;
+    } catch (e) {}
+    return false;
+  }
+
+  function xpathValidator (expr) {
+    try {
+      document.evaluate(expr, document, null, null, null);
       return true;
     } catch (e) {}
@@ -495 +502 @@
   }
 
+  function frameCompleter (context, args) {
+    return [
+      [i, frame.document.location]
+      for each ([i, frame] in Iterator(getFrames()))
+    ];
+  }
+
 
 
@@ -517 +531 @@
               let win = document.commandDispatcher.focusedWindow;
               let frames = getFrames();
+
               let elem = body(win);
 
@@ -524 +539 @@
               }
 
-              if (args['-xpath'])
-                elem = or(frames, function (f) fromXPath(f, args['-xpath'])) || elem;
+              if (args['-xpath']) {
+                elem = or(frames, function (f) fromXPath(f.document, args['-xpath'])) || elem;
+              }
 
               feed(rhs, args['-events'] || ['keypress'], elem);
@@ -566 +582 @@
           [['-urls', '-u'], commands.OPTION_STRING, regexpValidator, urlCompleter({currentURL: true})],
           [['-desc', '-description'], commands.OPTION_STRING],
-          [['-frame', '-f'], commands.OPTION_INT],
+          [['-frame', '-f'], commands.OPTION_INT, null, frameCompleter],
+          [['-xpath', '-x'], commands.OPTION_STRING, xpathValidator],
           [
             ['-events', '-e'],