Changeset 38882

Timestamp:

03/30/11 02:34:02 (2 years ago)

Author:

NeoCat

Message:

search.js: Move hashtag linking to twicli.js

Location:

websites/twicli

Files:

• plugins/search.js (modified) (1 diff)
• twicli.js (modified) (3 diffs)

websites/twicli/plugins/search.js

@@ -113 +113 @@
                         var target = eles[i];
                         if (target.className == "status") {
-                                target.innerHTML = target.innerHTML.replace(/<a .*?>.*?<\/a>|(\W|_|^)([#＃])(\w{2,})(?=\W|$)/gi, function(_,d1,m,t){
-                                        if (_.substr(0,1) == '<') return _; // skip link
-                                        if (t.match(/^[#＃]\d+$/)) return _;
-                                        return d1+'<a href="http://search.twitter.com/search?q=' + encodeURIComponent(t) +'" onclick="return twsSearch(\'#'+t+'\')">'+m+t+'</a>';
-                                });
+                                eles = target.getElementsByTagName("a");
+                                for (var j = 0; j < eles.length; j++) {
+                                        target = eles[j];
+                                        if (target.className.indexOf("hashtag") >= 0)
+                                                (function(h){ target.onclick = function(){ return twsSearch(h) } })(target.title);
+                                }
                                 break;
                         }

websites/twicli/twicli.js

@@ -782 +782 @@
                 //本文 (https〜をリンクに置換 + @を本家リンク+JavaScriptに置換)
                 " <span id=\"text-" + eid + "\" class=\"status\">" +
-                text.replace(/https?:\/\/[^\/\s]*[\w!#$%&'()*+,.\/:;=?@~-]+(?=&\w+;)|https?:\/\/[^\/\s]*[\w!#$%&'()*+,.\/:;=?@~-]+|[@＠]([\/\w-]+)/g, function(_,u){
-                                if (!u) {
+                text.replace(/https?:\/\/[^\/\s]*[\w!#$%&'()*+,.\/:;=?@~-]+(?=&\w+;)|https?:\/\/[^\/\s]*[\w!#$%&'()*+,.\/:;=?@~-]+|[@＠]([\/\w-]+)|(\W|_|^)([#＃])(\w+)(?=\W|$)/g, function(_,u,t,h,s){
+                                if (!u && !h) {
                                         var paren = '';
                                         if (_.substr(_.length-1) == ')') { // 末尾の")"はURLに含めない
@@ -790 +790 @@
                                         }
                                         return "<a class=\"link\" target=\"_blank\" href=\""+_+"\" onclick=\"return link(this);\">"+_+"</a>"+paren;
+                                }
+                                if (h == "#" || h == "＃") {
+                                        if (s.match(/^\d+$/)) return _;
+                                        return t+"<a target=\"_blank\" class=\"hashtag\" title=\""+s+"\" href=\"http://search.twitter.com/search?q="+encodeURIComponent(s)+"\">"+h+s+"</a>";
                                 }
                                 if (u.indexOf('/') > 0) return "<a target=\"_blank\" href=\""+twitterURL+u+"\" onclick=\"return link(this);\">"+_+"</a>";
@@ -1087 +1091 @@
                         var s = document.createElement('div');
                         s.id = tw_node.id + "-" + id;
-                        var x = makeHTML(tw[i], no_name, tw_node.id);
-                        s.innerHTML = x;
+                        s.innerHTML = makeHTML(tw[i], no_name, tw_node.id);
                         s.screen_name = tw[i].user.screen_name;
                         s.tw = tw[i]; // DOMツリーにJSONを記録