Changeset 8960 for lang/javascript

Timestamp:

04/06/08 09:41:03 (5 years ago)

Author:

drry

Message:

lang/javascript/userscripts/ldrize.user.js:

• var 忘れグローバルを修正しました。
  
• パーザを変更しました。
  

Files:

• lang/javascript/userscripts/ldrize.user.js (modified) (2 diffs)

lang/javascript/userscripts/ldrize.user.js

@@ -179 +179 @@
           window.Minibuffer.addShortcutkey(Object.extend({key: "C-["}, opt));
           if(this.disable) return;
-          for(key in KEYBIND){
+          for(var key in KEYBIND){
                   if(KEYBIND[key] == 'Iframe'){
                           window.Minibuffer.addShortcutkey({key:key,command: function(){self.blurIframe()}});
@@ -1298 +1298 @@
         var ldrize = function(siteinfo){new LDRize(siteinfo)}
         var parser = function(res){
-                var trim = function(t){return t.replace(/^\s+|,$/g,'').replace(/^'|'$/g,'');}
-                var content=new RegExp("^ ([^:]+):(.+)"), sep=new RegExp("^[^ ].+");
+                var content=new RegExp("^ ([^:]+): *'?((?:\\'|[^'])*?)'? *,? *$");
                 var lines=res.responseText.split(/(?:\r?\n|\r)+/), res=[], current_info={};
-                for(var i=0, l =lines.length; i < l; i++){
-                        var line = lines[i];
+                lines.forEach(function(line){
                         if(line.indexOf("//") == 0){ // comment
-                                continue;
-                        }else if(sep.test(line)){
+                                return;
+                        }else if(line.indexOf(" ") != 0){ // delimiter
+                                res.push(current_info);
                                 current_info = {};
-                                res.push(current_info);
                         }else if(content.test(line)){
                                 var property = RegExp.$1;
-                                var val = trim(RegExp.$2).replace(/\\\\/g,'\\');
-                                if(val.toLowerCase() == 'true' || val.toLowerCase() == 'false') val = eval(val);
-                                current_info[property] = val;
+                                var val = RegExp.$2;
+                                current_info[property] = val.toLowerCase() == 'true' ? true
+                                                       : val.toLowerCase() == 'false' ? false
+                                                       : val.replace(/\\\\/g,'\\');
                         }
-                }
+                });
                 return res;
         }