Changeset 35854 for websites/modoki

Timestamp:

11/05/09 15:00:33 (4 years ago)

Author:

arccosine

Message:

Operaの場合、keypress。それ以外はkeydownで動くようにした。

Files:

• websites/modoki/index.html (modified) (12 diffs)

websites/modoki/index.html

@@ -239 +239 @@
         }
         this.keyHandler = {
-          'j'   : function(){ _self.down(); },
+          'J'   : function(){ _self.down(); },
           'DOWN'   : function(){ _self.down(); },
-          'k'   : function(){ _self.up(); },
+          'K'   : function(){ _self.up(); },
           'UP'   : function(){ _self.up(); },
-          's'   : function(){ _self.fav(); },
-          'e'   : function(){ _self.open_url(); },
-          'r'   : function(){ _self.reply(); },
-          'n'   : function(){ _self.nextTab(); },
+          'S'   : function(){ _self.fav(); },
+          'E'   : function(){ _self.open_url(); },
+          'R'   : function(){ _self.reply(); },
+          'N'   : function(){ _self.nextTab(); },
           'RIGHT'   : function(){ _self.nextTab(); },
-          'p'   : function(){ _self.prevTab(); },
+          'P'   : function(){ _self.prevTab(); },
           'LEFT'   : function(){ _self.prevTab(); },
           'ENT' : function(){ _self.reply(); },
           'R'   : function(){ _self.retween(); },
           ' '   : function(){ _self.searchLastUnread(); },
-          'gg'  : function(){ _self.searchTop(); },
-          'G'   : function(){ _self.searchLast(); },
-          'a'   : function(){ _self.clearUnread(); },
+          'GG'  : function(){ _self.searchTop(); },
+          'S-G' : function(){ _self.searchLast(); },
+          'A'   : function(){ _self.clearUnread(); },
           'C-H' : function(){ _self.openHome(); },
           'C-E' : function(){ _self.openTwid(); }
@@ -261 +261 @@
         this._altanative = (new Date).getTime();
         this._crosspost = 0;
-        this._version = '0.53';
+        this._version = '0.55';
         this._max_id = 0;
         this.p_name = '';
@@ -268 +268 @@
         this._outputz_secret = this.readCookie('outputz_secret');
         this._footer_message = this.readCookie('footer_message');
-        this._user_name = this.readCookie('user_name');
-        this._user_pass = this.readCookie('user_pass');
         this.nt;
         this.keyChoice = [];
@@ -278 +276 @@
           'Option': { 'selected' : false, 'func' : function(){ _self.showOptionArea(); } }
         };
-
-
       },
 
@@ -287 +283 @@
         this.firstStroke = {};
         for( var key in this.keyHandler ){
-          if( key.length > 1 ){
+          if( key.length > 1 && !(/DOWN|LEFT|RIGHT|UP|ENT|TAB|BS|ESC|S-|A-|C-/.test(key))){
             this.firstStroke[key[0]] = 'sw';
           }
         }
         var keybind = function(e){
-          if( e.target.tagName == 'INPUT' || e.target.tagName == 'TEXTAREA' ) return;
+          if( /INPUT|TEXTAREA/.test(e.target.tagName) ) return;
           var keyCode = (e.which || e.keyCode);
-          var pressKey= (e.ctrlKey?'C-':'') + (e.altKey?'A-':'') + ((typeof _self.specialkey[keyCode] == 'undefined' )?String.fromCharCode(keyCode) : _self.specialkey[keyCode]);
-          _self.keyChoice.push(pressKey);
+          var pressKey = (e.ctrlKey?'C-':'') + (e.altKey?'A-':'') + (e.shiftKey?'S-':'') + ((typeof _self.specialkey[keyCode] == 'undefined' )?String.fromCharCode(keyCode) : _self.specialkey[keyCode]);
+          if( window.opera ){ pressKey = pressKey.toUpperCase(); }
           if( _self.firstStroke[pressKey] == 'sw' ){  //w stroke bind
+            _self.keyChoice.push(pressKey);
             if( typeof _self.keyHandler[_self.keyChoice.join('')] != 'function' ){
-              _self.keyChoice.length = 0;
-              _self.keyChoice.push(pressKey);
               e.preventDefault();
               return;
@@ -308 +303 @@
           if( typeof _self.keyHandler[pressKey] != 'function' ) return; 
           try{
-              _self.keyChoice.length = 0;
-              e.preventDefault();    //Stop Default Event
-              _self.keyHandler[pressKey].apply();
+            _self.keyChoice.length = 0; //clear keychoice
+            e.preventDefault();    //Stop Default Event
+            _self.keyHandler[pressKey].apply();
           }catch(d){}
         };
-        window.addEventListener('keypress', keybind, false);
+        //opera can't stop default event in keydown events.
+        window.addEventListener((window.opera) ? 'keypress' : 'keydown', function(e){ keybind(e); }, false );
       },
 
@@ -357 +353 @@
           footer_message.value = this._footer_message;
         }
-
-        //user name
-        _option_area.appendChild(d.createElement('br'));
-        _option_area.appendChild(d.createTextNode('user name '));
-        var user_name = _option_area.appendChild(d.createElement('input'));
-        user_name.id = 'user_name';
-        user_name.type = 'text';
-        if( this._user_name != '' ){
-          user_name.value = this._user_name;
-        }
-
-        //user pass 
-        _option_area.appendChild(d.createElement('br'));
-        _option_area.appendChild(d.createTextNode('user pass '));
-        var user_pass = _option_area.appendChild(d.createElement('input'));
-        user_pass.id = 'user_pass';
-        user_pass.type = 'password';
-        if( this._user_pass != '' ){
-          user_pass.value = this._user_pass;
-        }
-
 
         _option_area.appendChild(d.createElement('br'));
@@ -473 +448 @@
         }
 
-        var saveDatas = ['outputz_secret', 'footer_message', 'user_name', 'user_pass' ];
+        var saveDatas = ['outputz_secret', 'footer_message' ];
         for( var i=0, l=saveDatas.length; i<l; i++ ){
           write_datas(saveDatas[i]);
         }
+
+        var fl_str = '';
+        for( var i=0, l=this.followers.length; i<l; i++ ){
+          fl_str += this.followers[i] + ',';
+        }
+        fl_str = fl_str.substring(0, fl_str.length-1);
+
       },
       readCookie : function(key){
@@ -780 +762 @@
       twAuth : function(){
        var url = 'https://twitter.com/account/verify_credentials.json?callback=ta';
-       if( this._user_name.length !=0 && this._user_pass.length != 0 ){
-         var str = 'https://' + this._user_name + ':' + this._user_pass + '@';
-         url = url.replace('https://',str);
-       }
        this.getJSON(url);
       },
@@ -806 +784 @@
         modoki.p_name = data.screen_name;
         modoki.p_id = data.id;
-        modoki.twFollower(data.id);
+        if( modoki.followers.length == 0 ){
+          modoki.twFollower(data.id);
+        }else{
+          stLoad();
+        }
     };
 
@@ -812 +794 @@
       modoki.followers=data.sort();
       modoki.followers.push(modoki.p_id);
+      stLoad();
+    };
+
+    var stLoad = function(){
       document.getElementById('time_line').innerHTML = '';
       modoki.loadTimeLine();
@@ -824 +810 @@
       firstTime();
       modoki.loop = setInterval( function(){ modoki.loadTimeLine(); }, 45000 );
-
     };