Changeset 8820 for lang/javascript

Timestamp:

04/04/08 06:58:44 (5 years ago)

Author:

drry

Message:

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

• 正規表現を修正しました。
  
• 評価順序を変更しました。
  
• ほか。
  

Files:

• lang/javascript/userscripts/niconico_thuminfo_check.user.js (modified) (4 diffs)

lang/javascript/userscripts/niconico_thuminfo_check.user.js

@@ -129 +129 @@
                   function getInfo(item, cap){
                       var text = ($T(resXML, item)[0]) ? $T(resXML, item)[0].textContent : "DELETED";
-                      if(cap){text = cap + text + " ";return text;};
+                      if(cap){text = cap + text + " ";return text;}
                       return text;
                   }
@@ -143 +143 @@
                   // add hyperlink to description
                   desc = desc.replace(
-                    /https?:\/\/[-_.!~*'a-zA-Z0-9:/?@&=+$,%#]+|mylist\/\d+|user\/\d+|[a-z]{2}\d+/g,
+                    /https?:\/\/[-_.!~*'a-zA-Z0-9:\/?@&=+$,%#]+|mylist\/\d+|user\/\d+|[a-z]{2}\d+/g,
                     function(word){
                       if(word.indexOf("http") > -1){return word.link(word);}
@@ -159 +159 @@
                   }
 
-                  // add <br>
+                  // add <br/>
                   var br_num = tag_sum / 39 - 2;
                   for(var i = 0;i < br_num;i++){nico.info += "<br/>";}
@@ -311 +311 @@
       var links = $x("descendant::a[contains(@href, 'watch')]", context);
       eachLater(links, 0.1, function(link){
-          var reg =  new RegExp("http://.*?\.nicovideo\.jp/watch/([^/?<>\"'#]+)");
-          if(reg.test(link) &&
-             !/http:\/\/.*?\/http.*?/.test(link)){
+          var reg =  new RegExp("http://.*?\\.nicovideo\\.jp/watch/([^/?<>\"'#]+)");
+          if(!/http:\/\/.+?\/http.+?/.test(link) &&
+             reg.test(link)){
                 var id= RegExp.$1;
                 if(!nicoVideo) new nicoVideo();