Changeset 38813

Timestamp:

01/29/11 10:56:32 (2 years ago)

Author:

NeoCat

Message:

Add block/unblock/report_spam menu in userInfo

Location:

websites/twicli

Files:

• lang.js (modified) (2 diffs)
• oauth/oauth.js (modified) (1 diff)
• styles/default.css (modified) (2 diffs)
• twicli.html (modified) (2 diffs)
• twicli.js (modified) (4 diffs)

websites/twicli/lang.js

@@ -7 +7 @@
         'Retweet': ['リツイート','官方锐推'],
         'Quote with RT:': ['RT:を付けて引用','加入RT:引用回复'],
+        'Block this user': ['ユーザをブロック', null],
+        'Unblock this user': ['ユーザをブロック解除', null],
+        'Report as spam': ['スパム報告', null],
         'GeoTagging': ['ジオタグ','地理标签'],
         'Location':     ['場所','方位'],
@@ -49 +52 @@
         'Are you sure to delete this tweet?': ['このツイートを削除してもよろしいですか?','确定要删除该发言？'],
         'Are you sure to remove $1?': ['本当に $1 をリムーブしますか?','确定要取消关注$1吗？'],
+        'Are you sure to block $1?': ['本当に $1 をブロックしますか?',null],
+        'Are you sure to report $1 as spam?': ['本当に $1 をスパムとして報告しますか?',null],
         'An external plugin is specified. This plugin can fully access to your account.\nAre you sure to load this?': ['外部プラグインが指定されています。このプラグインはあなたのアカウントに自由にアクセス可能になります。本当にロードしてもよろしいですか?','你欲加载外部地址上的插件。这个插件将自由访问你的帐号信息。确认加载？']
 };

websites/twicli/oauth/oauth.js

@@ -322 +322 @@
     timeCorrectionMsec: 0
 ,
+    lastTimestamp: 0
+,
     timestamp: function timestamp() {
         var t = (new Date()).getTime() + OAuth.timeCorrectionMsec;
-        return Math.floor(t / 1000);
+        t = Math.floor(t / 1000);
+        if (this.lastTimestamp >= t) t = this.lastTimestamp + 1;
+        this.lastTimestamp = t;
+        return t;
     }
 ,

websites/twicli/styles/default.css

@@ -47 +47 @@
 .button { text-decoration: none; -webkit-text-size-adjust:140%; }
 .popup { padding: 0 4px; color: #888; }
+.upopup { float: right; padding: 4px 4px; color: #888; }
 .lock { position: relative; top: 2px; left: 0; }
 .close { color: red; }
@@ -53 +54 @@
 #rep > a > img { padding: 2px 1px 1px 3px; }
 #reps { margin-top: 1px; }
-#popup { display: none; background-color: #eee; position: absolute; left: 0; top: 200px; border: 2px solid #666; z-index: 6; width: 180px; font-size: x-small; }
-#popup a { display: block; background-color: #fff; color: black; text-decoration: none; padding: 3px; border-bottom: 1px solid #888; }
-#popup a:hover { background-color: #33f; color: #fff; text-decoration: none; }
-#popup a.row2 { background-color: #eee; }
+.popup_menu { display: none; background-color: #eee; position: absolute; left: 0; top: 200px; border: 2px solid #666; z-index: 6; width: 180px; font-size: x-small; }
+.popup_menu a { display: block; background-color: #fff; color: black; text-decoration: none; padding: 3px; border-bottom: 1px solid #888; }
+.popup_menu a:hover { background-color: #33f; color: #fff; text-decoration: none; }
+.popup_menu a.row2 { background-color: #eee; }
 #popup_hide { display: none; position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0.2; filter: alpha(opacity=20); background-color: black; z-index: 5; }
 #user_info { margin: 1px; border: 1px solid #888; }

websites/twicli/twicli.html

@@ -57 +57 @@
         <a href="javascript:pickup2()" class="close"><img alt="⇔" src="images/both.png"></a><div id="reps"></div></div>
 <!--ポップアップメニュー-->
-<div id="popup" onClick="popup_hide()">
+<div class="popup_menu" id="popup" onClick="popup_hide()">
 <a id="popup_status_delete" href="#" onClick="return deleteStatus()">Delete tweet</a>
 <a id="popup_status_retweet" href="#" onClick="return retweetStatus()">Retweet</a>
@@ -63 +63 @@
 <a id="popup_link_user" href="" target="twitter">Twitter / user</a>
 <a id="popup_link_status" href="" target="twitter">Twitter / tweet</a>
+</div>
+<div class="popup_menu" id="userinfo_popup" onClick="popup_hide()">
+<a id="upopup_user_block" href="#" onClick="return blockUser(true)">Block this user</a>
+<a id="upopup_user_unblock" href="#" onClick="return blockUser(false)">Unblock this user</a>
+<a id="upopup_user_spam" href="#" onClick="return reportSpam()">Report as spam</a>
 </div>
 <!--ポップアップメニュー非表示用-->

websites/twicli/twicli.js

@@ -587 +587 @@
 function popup_init() {
         var popup_id_list = ['popup_link_user', 'popup_link_status', 'popup_status_delete',
-                                                'popup_status_retweet', 'popup_status_quote'];
+                                                'popup_status_retweet', 'popup_status_quote',
+                                                'upopup_user_block', 'upopup_user_unblock', 'upopup_user_spam'];
         for (var x = 0; x < popup_id_list.length; x++)
                 $(popup_id_list[x]).innerHTML = _($(popup_id_list[x]).innerHTML);
@@ -612 +613 @@
 function popup_hide() {
         $('popup').style.display = 'none';
+        $('userinfo_popup').style.display = 'none';
         $('popup_hide').style.display = 'none';
         popup_user = popup_id = popup_ele = null;
+}
+// ユーザ情報のポップアップメニューを表示
+function userinfo_popup_menu(user, id, ele) {
+        popup_user = user;
+        popup_id = id;
+        callPlugins("userinfo_popup", $('userinfo_popup'), user, id, ele);
+        $('userinfo_popup').style.display = "block";
+        var pos = cumulativeOffset(ele);
+        $('userinfo_popup').style.left = pos[0] <  $('userinfo_popup').offsetWidth - ele.offsetWidth ? 0 : pos[0] - $('userinfo_popup').offsetWidth + ele.offsetWidth;
+        $('userinfo_popup').style.top = pos[1] + 20;
+        $('popup_hide').style.height = Math.max(document.body.scrollHeight, $("tw").offsetHeight+$("control").offsetHeight);
+        $('popup_hide').style.display = "block";
 }
 // 発言のReTweet
@@ -765 +779 @@
                         '<br><a href="javascript:switchStatus()">' + user.statuses_count + '<small>'+_('tweets')+'</small></a> / ' +
                                                 '<a href="javascript:switchFav()">' + user.favourites_count + '<small>'+_('favs')+'</small></a></b>' +
-                        '</td></tr></table><a target="twitter" href="' + twitterURL + user.screen_name + '">[Twitter]</a> '
+                        '</td></tr></table>'+
+                        '<a class="button upopup" href="#" onClick="userinfo_popup_menu(\'' + user.screen_name + '\',' + user.id + ', this); return false;"><small><small>▼</small></small></a>'+
+                        '<a target="twitter" href="' + twitterURL + user.screen_name + '">[Twitter]</a> ';
 }
 // 過去の発言取得ボタン(DOM)生成
@@ -799 +815 @@
 // followとremove
 function follow(f) {
-        if (!f && !confirm(_("Are you sure to remove $1?", last_user))) return;
+        if (!f && !confirm(_("Are you sure to remove $1?", last_user))) return false;
         enqueuePost(twitterAPI + 'friendships/' + (f ? 'create' : 'destroy') + '/' + last_user + '.xml', switchUser);
         $("loading").style.display = "block";
+        return false;
+}
+// blockとunblock
+function blockUser(f) {
+        if (f && !confirm(_("Are you sure to block $1?", last_user))) return false;
+        enqueuePost(twitterAPI + 'blocks/' + (f ? 'create' : 'destroy') + '/' + last_user + '.xml', switchUser);
+        $("loading").style.display = "block";
+        return false;
+}
+function reportSpam(f) {
+        if (f && !confirm(_("Are you sure to report $1 as spam?", last_user))) return false;
+        enqueuePost(twitterAPI + 'report_spam.xml?screen_name=' + last_user, switchUser);
+        $("loading").style.display = "block";
+        return false;
 }
 // ユーザ情報を表示