follow HEAD(2.2pre)

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@34243 d0d07461-0603-4401-acd4-de1884942a52

6 files changed, 30 insertions, 21 deletions

diff --git a/auto_word_select_mode.js b/auto_word_select_mode.js
index 244cb9d..4b7ee73 100644
--- a/auto_word_select_mode.js
+++ b/auto_word_select_mode.js
@@ -36,12 +36,12 @@ var PLUGIN_INFO =
   <name>{NAME}</name>
   <description>Add auto word select mode.</description>
   <description lang="ja">単語を自動選択するモードを追加します</description>
-  <minVersion>2.0pre</minVersion>
-  <maxVersion>2.1pre</maxVersion>
+  <minVersion>2.2pre</minVersion>
+  <maxVersion>2.2pre</maxVersion>
   <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/auto_word_select_mode.js</updateURL>
   <author mail="snaka.gml@gmail.com" homepage="http://vimperator.g.hatena.ne.jp/snaka72/">snaka</author>
   <license>MIT style license</license>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <detail><![CDATA[
     == Subject ==
     Add auto word select mode.
@@ -310,7 +310,7 @@ mappings.add(
 
   let extraInfo = {};
   if (hasCount)
-      extraInfo.flags = Mappings.flags.COUNT;
+      extraInfo.count = true;
 
   mappings.add([modes.AUTO_WORD_SELECT], keys, "",
     function (count) {
diff --git a/browser_object.js b/browser_object.js
index 0385831..218290b 100644
--- a/browser_object.js
+++ b/browser_object.js
@@ -3,12 +3,12 @@ let PLUGIN_INFO =
 <VimperatorPlugin>

   <name>{NAME}</name>

   <description>Map behave like text-object</description>

-  <version>0.6</version>

+  <version>0.6.1</version>

   <author mail="trapezoid.g@gmail.com" homepage="http://unsigned.g.hatena.ne.jp/Trapezoid">Trapezoid</author>

   <license>New BSD License</license>

   <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/browser_object.js</updateURL>

-  <minVersion>2.0pre</minVersion>

-  <maxVersion>2.0pre</maxVersion>

+  <minVersion>2.2pre</minVersion>

+  <maxVersion>2.2pre</maxVersion>

   <detail><![CDATA[

     == Variables ==

       g:browser_object_prefix:

@@ -217,7 +217,7 @@ let PLUGIN_INFO =
     browserObject.motions.add('d','close');

     browserObject.motions.add('y','yank');

     browserObject.motions.add('r','reload');

-    browserObject.motions.add('m','mark',{ flags: liberator.modules.Mappings.flags.ARGUMENT });

+    browserObject.motions.add('m','mark',{arg: true});

     browserObject.motions.add('e','setPin');

     browserObject.motions.add('E','unsetPin');

 

diff --git a/feedSomeKeys_2.js b/feedSomeKeys_2.js
index cfb570a..bdd2a95 100644
--- a/feedSomeKeys_2.js
+++ b/feedSomeKeys_2.js
@@ -206,7 +206,14 @@ function replaceUserMap(origKey, feedKey, useVkey, eventName){
                                 origMap.names.map(function(n) n),
                                 origMap.description,
                                 origMap.action,
-                                { flags:origMap.flags, rhs:origMap.rhs, noremap:origMap.noremap });
+                                {
+                                    flags:origMap.flags,
+                                    rhs:origMap.rhs,
+                                    noremap:origMap.noremap,
+                                    count: origMap.cout,
+                                    arg: origMap.arg,
+                                    motion: origMap.motion
+                                });
             origMaps.push(clone);
         }
     }
@@ -216,7 +223,7 @@ function replaceUserMap(origKey, feedKey, useVkey, eventName){
             for (var i=0; i<count; i++){
                 feedKeyIntoContent(feedKey, useVkey, eventName);
             }
-        }, { flags:Mappings.flags.COUNT, rhs:feedKey, noremap:true });
+        }, { flags:(Mappings.flags ? Mappings.flags.COUNT : null), rhs:feedKey, noremap:true, count:true });
     addUserMap(map);
     if (feedMaps.some(function(fmap){
         if (fmap.names[0] != origKey) return false;
@@ -238,7 +245,9 @@ function destroy(){
     feedMaps = [];
 }
 function addUserMap(map){
-    mappings.addUserMap(map.modes, map.names, map.description, map.action, { flags:map.flags,noremap:map.noremap,rhs:map.rhs });
+    mappings.addUserMap(map.modes, map.names, map.description, map.action, {
+        flags:map.flags,noremap:map.noremap,rhs:map.rhs,count:map.count,arg:map.arg,motion:map.motion
+    });
 }
 function parseKeys(keys){
     var matches = /^\d+(?=\D)/.exec(keys);
diff --git a/hatenaStar.js b/hatenaStar.js
index 237cb30..ad8615f 100644
--- a/hatenaStar.js
+++ b/hatenaStar.js
@@ -4,9 +4,9 @@ var PLUGIN_INFO =
 	<description>Add Hatena Star.</description>
 	<description lang="ja">はてなスターをつける。</description>
 	<author mail="mattn.jp@gmail.com">mattn</author>
-	<version>0.1.0</version>
-	<minVersion>2.0pre</minVersion>
-	<maxVersion>2.0pre</maxVersion>
+	<version>0.1.1</version>
+	<minVersion>2.2pre</minVersion>
+	<maxVersion>2.2pre</maxVersion>
 	<updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/hatenaStar.js</updateURL>
 </VimperatorPlugin>;
 (function() {
@@ -85,7 +85,7 @@ liberator.modules.mappings.addUserMap([liberator.modules.modes.NORMAL], nmap, 'a
 		} catch (e) { liberator.echoerr('hatenaStar: ' + e); }
 	}, {
 		noremap: true,
-		flags: liberator.modules.Mappings.flags.COUNT
+		count: true
 	}
 );
 
diff --git a/marker_reader.js b/marker_reader.js
index d407e20..9f4cdae 100644
--- a/marker_reader.js
+++ b/marker_reader.js
@@ -10,10 +10,10 @@ var PLUGIN_INFO =
     <name>{NAME}</name>
     <description>marker PageDown/PageUp.</description>
     <author mail="konbu.komuro@gmail.com" homepage="http://d.hatena.ne.jp/hogelog/">hogelog</author>
-    <version>0.0.14</version>
+    <version>0.0.15</version>
     <license>GPL</license>
-    <minVersion>2.1pre</minVersion>
-    <maxVersion>2.1</maxVersion>
+    <minVersion>2.2pre</minVersion>
+    <maxVersion>2.2pre</maxVersion>
     <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/marker_reader.js</updateURL>
 <detail><![CDATA[
     
@@ -256,14 +256,14 @@ if (liberator.globalVariables.marker_reader_mapping) {
         {
             reader.focusNavi(focusDocument(content), count>1 ? count : 1);
         },
-        {flags: Mappings.flags.COUNT});
+        {count: true});
     mappings.addUserMap([config.browserModes],
         [up], "marker PageUp",
         function (count)
         {
             reader.focusNavi(focusDocument(content), -(count>1 ? count : 1));
         },
-        {flags: Mappings.flags.COUNT});
+        {count: true});
 }
 commands.addUserCommand(["markersinsert", "minsert"], "insert markers",
     function ()
diff --git a/moreqmarks.js b/moreqmarks.js
index 477a437..cbe82a8 100644
--- a/moreqmarks.js
+++ b/moreqmarks.js
@@ -273,7 +273,7 @@
             var where = /\bquickmark\b/.test(liberator.modules.options["activate"]) ? liberator.NEW_TAB : liberator.NEW_BACKGROUND_TAB;
             liberator.modules.quickmarks.jumpTo(arg, where, true);
         },
-        { flags: liberator.modules.Mappings.flags.ARGUMENT });
+        {arg: true});
 
     liberator.modules.mappings.addUserMap(modes,
         ["gd"], "Delete QuickMark for current URL",