trunk対応

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

1 files changed, 30 insertions, 28 deletions

diff --git a/autoIgnoreKey.js b/autoIgnoreKey.js
index 07dd218..400740b 100644
--- a/autoIgnoreKey.js
+++ b/autoIgnoreKey.js
@@ -1,48 +1,50 @@
 /**
  * Auto switch vimperator key navigation
- * For vimperator 0.5.3
+ *
  * @author teramako teramako@gmail.com
- * @version 0.3
+ * @author halt feits <halt.feit at gmail.com>
+ * @version 0.6.0
  */
 
 (function(){
+
 /*
  * String or RegExp
  * e.g)
  *  * /^https?:\/\/mail\.google\.com\//
  *  * 'http://reader.livedoor.com/reader/'
  */
-const ignorePageList = [
-	/^https?:\/\/mail\.google\.com\//,
-	/^http:\/\/reader\.livedoor\.com\/(?:reader|public)\//
+var ignorePageList = [
+    /^https?:\/\/mail\.google\.com\//,
+    'http://reader.livedoor.com/reader/'
 ];
+
 document.getElementById('appcontent').addEventListener('DOMContentLoaded',function(event){
-	if (event.target.documentURI != gBrowser.currentURI.spec) return;
-	if ( isMatch(event.target.documentURI) ){
-		vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS);
-	} else {
-		vimperator.setMode(vimperator.modes.NORMAL);
-	}
-	//vimperator.log('load page: ' + gBrowser.selectedBrowser.contentDocument.URL);
+    if ( isMatch(event.target.documentURI) ){
+        liberator.modes.passAllKeys = true;
+    } else {
+        liberator.modes.passAllKeys = false;
+    }
+    //liberator.log('load page: ' + gBrowser.selectedBrowser.contentDocument.URL);
 },false);
+
 getBrowser().mTabBox.addEventListener('TabSelect',function(event){
-	var uri = this.parentNode.currentURI.spec;
-	if ( isMatch(uri) ){
-		vimperator.addMode(null, vimperator.modes.ESCAPE_ALL_KEYS);
-	} else {
-		vimperator.setMode(vimperator.modes.NORMAL);
-	}
-	//vimperator.log('select page: ' + gBrowser.selectedBrowser.contentDocument.URL);
-},false);
+    var uri = this.parentNode.currentURI.spec;
+    if ( isMatch(uri) ){
+        liberator.modes.passAllKeys = true;
+    } else {
+        liberator.modes.passAllKeys = false;
+    }
+    //liberator.log('select page: ' + gBrowser.selectedBrowser.contentDocument.URL);
+},false);                                     
 function isMatch(uri){
-	return ignorePageList.some(function(e,i,a){
-		if (typeof e == 'string'){
-			return uri.indexOf(e) != -1;
-		} else if (e instanceof RegExp){
-			return e.test(uri);
-		}
-	});
+    return ignorePageList.some(function(e,i,a){
+        if (typeof e == 'string'){
+            return uri.indexOf(e) != -1;
+        } else if (e instanceof RegExp){
+            return e.test(uri);
+        }
+    });
 }
 })();
 
-// vim: set fdm=marker sw=4 ts=4 et: