patches/form.TwitterRecipients.js @@ -1,3 +1,10 @@ +update(Date, { + TIME_SECOND : 1000, + TIME_MINUTE : 1000 * 60, + TIME_HOUR : 1000 * 60 * 60, + TIME_DAY : 1000 * 60 * 60 * 24, +}) + if(typeof(update)=='undefined'){ function update(t, s){ for(var p in s) xpi/chrome/content/library/00_prototype.js @@ -1071,6 +1071,53 @@ function addAround(target, methodNames, advice){ }); } +function cache(fn, ms){ + var executed; + var res; + + var deferred = false; + var waiting = false; + var pendings; + return function(){ + // キャッシュが利用できるか? + var now = Date.now(); + if(executed && (executed + ms) > now){ + // Deferredの結果が未確定か? + if(waiting){ + var d = new Deferred(); + pendings.push(d); + + return d; + } + + return deferred? succeed(res) : res; + } + + executed = now; + res = fn.apply(null, arguments) + + if(res instanceof Deferred){ + deferred = true; + waiting = true; + pendings = []; + + return res.addCallback(function(result){ + res = result; + waiting = false; + + // 結果の確定待ちがあればそれらを先に呼び出す(順序が逆転する) + pendings.forEach(function(d){ + d.callback(res); + }); + + return res; + }); + } else { + return res; + } + } +} + /** * 配列を結合し文字列を作成する。 * 空要素は除外される。 @@ -1506,7 +1553,7 @@ function appendMenuItem(menu, label, image, hasChildren){ item.setAttribute('label', label); if(image){ - item.setAttribute('class', 'menuitem-iconic'); + item.setAttribute('class', hasChildren? 'menu-iconic' : 'menuitem-iconic'); item.setAttribute('image', image); } xpi/chrome/content/library/01_utility.js @@ -625,16 +625,18 @@ models.register({ models.register({ name : 'Twitter', ICON : 'http://twitter.com/favicon.ico', + URL : 'http://twitter.com', check : function(ps){ return (/(regular|photo|quote|link|conversation|video)/).test(ps.type) && !ps.file; }, post : function(ps){ + var self = this; return Twitter.getToken().addCallback(function(token){ // FIXME: 403が発生することがあったため redirectionLimit:0 を外す token.status = joinText([ps.item, ps.itemUrl, ps.body, ps.description], ' ', true); - return request('http://twitter.com/status/update', update({ + return request(self.URL + '/status/update', update({ sendContent : token, })); }); @@ -644,9 +646,8 @@ models.register({ return this.addFavorite(ps.favorite.id); }, - getToken : function(){ - return request('http://twitter.com/account/settings').addCallback(function(res){ + return request(this.URL + '/account/settings').addCallback(function(res){ var html = res.responseText; if(~html.indexOf('class="signin"')) throw new Error(getMessage('error.notLoggedin')); @@ -659,25 +660,36 @@ models.register({ }, remove : function(id){ + var self = this; return Twitter.getToken().addCallback(function(ps){ ps._method = 'delete'; - return request('http://twitter.com/status/destroy/' + id, { + return request(self.URL + '/status/destroy/' + id, { redirectionLimit : 0, - referrer : 'http://twitter.com/home', + referrer : self.URL + '/', sendContent : ps, }); }); }, addFavorite : function(id){ + var self = this; return Twitter.getToken().addCallback(function(ps){ - return request('http://twitter.com/favourings/create/' + id, { + return request(self.URL + '/favourings/create/' + id, { redirectionLimit : 0, - referrer : 'http://twitter.com/home', + referrer : self.URL + '/', sendContent : ps, }); }); }, + + getRecipients : function(){ + var self = this; + return request(this.URL + '/direct_messages/recipients_list?twttr=true').addCallback(function(res){ + return map(function([id, name]){ + return {id:id, name:name}; + }, evalInSandbox('(' + res.responseText + ')', self.URL)); + }); + }, }); xpi/chrome/content/library/20_model.js @@ -968,22 +968,31 @@ DescriptionBox.prototype = { // input要素の取得が終わったら初期設定の非表示状態に戻す this.elmBox.hidden = this.hidden; - this.loadExtensionMenu(); - }, - - loadExtensionMenu : function(){ this.elmContext = document.getAnonymousElementByAttribute( this.elmInput.parentNode, 'anonid', 'input-box-contextmenu'); + this.elmContext.addEventListener('popupshowing', bind('onPopupShowing', this), true); + }, + + onPopupShowing : function(event){ + if(event.eventPhase != Event.AT_TARGET) + return; - var df = document.createDocumentFragment(); var self = this; + + if(this.customMenus) + forEach(this.customMenus, removeElement); + this.customMenus = []; + + var df = document.createDocumentFragment(); (function(menus, parent){ var me = arguments.callee; menus.forEach(function(menu){ var elmItem = appendMenuItem(parent, menu.name, menu.icon, !!menu.children); + self.customMenus.push(elmItem); + if(menu.execute){ elmItem.addEventListener('command', function(){ - var d = menu.execute(self.elmDescription); + var d = menu.execute(self.elmDescription, self); // 非同期処理の場合、カーソルを砂時計にする if(d instanceof Deferred){ @@ -1000,8 +1009,7 @@ DescriptionBox.prototype = { me(menu.children, elmItem.appendChild(document.createElement('menupopup'))); }); })(QuickPostForm.descriptionContextMenus, df); - - appendMenuItem(df, '----'); + self.customMenus.push(appendMenuItem(df, '----')); this.elmContext.insertBefore(df, this.elmContext.firstChild); }, @@ -1014,6 +1022,18 @@ DescriptionBox.prototype = { return this.elmDescription.value; }, + replaceSelection : function(text){ + var elm = this.elmDescription; + var value = elm.value; + var start = elm.selectionStart; + + elm.value = + value.substr(0, elm.selectionStart) + + text + + value.substr(elm.selectionEnd); + elm.selectionStart = elm.selectionEnd = start + text.length; + }, + refreshLength : function(){ this.elmLength.value = this.elmDescription.value.length; }, @@ -1083,20 +1103,11 @@ DescriptionBox.prototype = { if(sel.isCollapsed || reason != ISelectionListener.MOUSEUP_REASON) return; - var elm = this.elmDescription; - var value = elm.value; - var start = elm.selectionStart; - sel = sel.toString().trim(); - - elm.value = - value.substr(0, elm.selectionStart) + - sel + - value.substr(elm.selectionEnd); - elm.selectionStart = elm.selectionEnd = start + sel.length; + this.replaceSelection(sel.toString().trim()); // 別ウィンドウのため一度ウィンドウのフォーカスも戻す window.focus(); - elm.focus(); + this.elmDescription.focus(); // valueを変えると先頭に戻ってしまうため最後に移動し直す this.elmInput.scrollTop = this.elmInput.scrollHeight; xpi/chrome/content/quickPostForm.js @@ -276,9 +276,17 @@ try { description : 'ポータルサイト', }); }); + d.addCallback(function(){ return Twitter.remove(847473592); }); + d.addCallback(function(){ + return Twitter.getRecipients(); + }); + d.addCallback(function(recipients){ + ok(recipients.length > 3); + ok(recipients[0].name); + }); */ /* xpi/chrome/content/test/test_model.html 1a1fefd7f403c52545805f7191d774b9a9807f76 to ryutaro.kamitsu@gmail.com http://github.com/to/tombloo/commit/bc590079acf783c4d9f970936b1bcb36c58328d6 bc590079acf783c4d9f970936b1bcb36c58328d6 2009-05-09T08:52:52-07:00 2009-05-09T08:52:52-07:00 * フォームコンテキストメニュー拡張にTwitterの宛先リスト追加(実験) * フォームコンテキストの更新をポップアップ表示時に変更(上記に付随) * 関数のキャッシュ化関数追加(期限付きのメモ化/Deferred対応) 62dd33b1b0d71848f359ac542ee6022dc8aefbcb to ryutaro.kamitsu@gmail.com