diff options
| -rw-r--r-- | readitlater.js | 2 | ||||
| -rw-r--r-- | statusbar_panel.js | 24 | ||||
| -rw-r--r-- | twittperator/browsing.tw | 14 | ||||
| -rw-r--r-- | twittperator/mstrans.tw | 2 | ||||
| -rw-r--r-- | twittperator/rt.tw | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/readitlater.js b/readitlater.js index 74f1453..c51d3a2 100644 --- a/readitlater.js +++ b/readitlater.js @@ -281,7 +281,7 @@ let PLUGIN_INFO = xml` // document => http://readitlaterlist.com/api/docs#get let manager = Components.classes["@mozilla.org/login-manager;1"].getService(Components.interfaces.nsILoginManager); - let logins = manager.findLogins({},"http://readitlaterlist.com","",null); + let logins = manager.findLogins({},"http://getpocket.com","",null); let req = new libly.Request( "https://readitlaterlist.com/v2/get" , // url diff --git a/statusbar_panel.js b/statusbar_panel.js index fe2a52b..4720ff7 100644 --- a/statusbar_panel.js +++ b/statusbar_panel.js @@ -6,7 +6,7 @@ let INFO = xml` //{{{ xmlns="http://vimperator.org/namespaces/liberator"> <author href="http://d.hatena.ne.jp/wlt/" email="wltlain@gmail.com">wlt</author> <license href="http://www.opensource.org/licenses/mit-license.php">MIT License</license> - <project name="vimperator" minVersion="2.3.1"/> + <project name="vimperator" minVersion="3.6"/> <p> ステータスバー（アドオンバー）にあるパネル（アイコン）をクリックするコマンドを提供します。 </p> @@ -32,6 +32,7 @@ let INFO = xml` //{{{ </plugin>`; //}}} +// https://developer.mozilla.org/en-US/docs/DOM/event.button let MOUSE_BUTTON_LEFT = 0; let MOUSE_BUTTON_MIDDLE = 1; let MOUSE_BUTTON_RIGHT = 2; @@ -44,7 +45,7 @@ function getImages(panel) { var anonymousNodes = document.getAnonymousNodes(panel); for (let [k, anonymousNode] in Iterator(anonymousNodes)) { let node; - let result = document.evaluate('descendant-or-self::xul:image', anonymousNode, function() XUL.uri, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null); + let result = document.evaluate('descendant-or-self::xul:image', anonymousNode, function() XUL, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null); while ((node = result.iterateNext())) images.push(node); } @@ -52,27 +53,28 @@ function getImages(panel) { } function makeIcon(panel) { - var icon = xml`<image xmlns=${XUL.uri}/>`; + var icon = xml`<image xmlns=${XUL}/>`; var image = getImages(panel)[0]; if (image) { let style = window.getComputedStyle(image, null); let src = image.src || style.listStyleImage.replace(/^url\("(.+)"\)$/, '$1'); if (src != '') { - icon.setAttribute('style','list-style-image: url("' + src + '");' + '-moz-image-region: ' + style.MozImageRegion); + let style_attr = `list-style-image: url("${src}"); -moz-image-region: ${style.MozImageRegion}`; + icon = xml`<image xmlns=${XUL} style=${style_attr}/>`; } } return icon; } function generateStatusbarpaneIDlList(filter) { - var panels = document.getElementsByTagNameNS(XUL.uri, 'statusbarpanel'); - for ([k, p] in Iterator(panels)) { - if (p.hidden != true) { + var panels = document.getElementsByTagNameNS(XUL, 'statusbarpanel'); + for (let i = 0; i < panels.length; i++) { + if (panels[i].hidden != true) { yield { - text: p.id, + text: panels[i].id, desc: 'statusbarpanel', - icon: makeIcon(p) + icon: makeIcon(panels[i]) }; } } @@ -115,7 +117,7 @@ commands.addUserCommand(['statusbarpanel'],'click statusbar panel', liberator.echoerr('No such statusbar panel: ' + id); return; } - var button = MOUSE_BUTTON_LEFT; + var button; switch (args['-button']) { case 'm': button = MOUSE_BUTTON_MIDDLE; break; case 'r': button = MOUSE_BUTTON_RIGHT; break; @@ -139,7 +141,7 @@ commands.addUserCommand(['statusbarpanel'],'click statusbar panel', context.keys = { text: 'text', description: 'desc', icon: 'icon' }; context.compare = CompletionContext.Sort.unsorted; context.process = [function (item, text) { - return xml`<span highlight="CompIcon">{item.icon ? item.icon : ``}</span><span class="td-strut"/>{text}` + return xml`<span highlight="CompIcon">${item.icon ? item.icon : ``}</span><span class="td-strut"/>${text}` }]; var list = generateStatusbarpaneIDlList(arg); diff --git a/twittperator/browsing.tw b/twittperator/browsing.tw index 6eeeda7..2452c78 100644 --- a/twittperator/browsing.tw +++ b/twittperator/browsing.tw @@ -27,7 +27,7 @@ THE POSSIBILITY OF SUCH DAMAGE. ################################################################################### # http://sourceforge.jp/projects/opensource/wiki/licenses%2Fnew_BSD_license # -# ɎQlɂȂ{܂ALȂ̂͏LpƂȂ܂B # +# に参考になる日本語訳がありますが、有効なのは上記英文となります。 # ################################################################################### }}} */ @@ -41,16 +41,15 @@ THE POSSIBILITY OF SUCH DAMAGE. */ // INFO {{{ -let INFO = -<> - <plugin name="Now Browsing! Now Reading!" version="1.0.0" +let INFO = xml` + <plugin name="Now Browsing! Now Reading!" version="1.0.1" href="http://vimpr.github.com/" summary="twittperator plugin. assist to tweet about a site you are browsing now." lang="en-US" xmlns="http://vimperator.org/namespaces/liberator"> <author homepage="https://github.com/Jagua">Jagua</author> <license>New BSD License</license> - <project name="Vimperator" minVersion="3.0"/> + <project name="Vimperator" minVersion="3.6"/> <p>twittperator plugin. assist to tweet about a site you are browsing now.</p> <item> <tags>:tw!browsing</tags> @@ -79,8 +78,7 @@ liberator.globalVariables.tw_browsing_format = [{ EOM ]]></code></description> </item> - </plugin> -</>; + </plugin>`; // }}} @@ -128,4 +126,4 @@ EOM })(); -// vim: set et fdm=syntax fenc= ft=javascript sts=2 sw=2 ts=2 : +// vim: set et fdm=syntax ft=javascript sts=2 sw=2 ts=2 : diff --git a/twittperator/mstrans.tw b/twittperator/mstrans.tw index 9f4a582..23e6410 100644 --- a/twittperator/mstrans.tw +++ b/twittperator/mstrans.tw @@ -21,4 +21,4 @@ ); })(); -// vim: set et fdm=syntax fenc= ft=javascript sts=2 sw=2 ts=2 : +// vim: set et fdm=syntax ft=javascript sts=2 sw=2 ts=2 : diff --git a/twittperator/rt.tw b/twittperator/rt.tw index fde9194..29d5e2c 100644 --- a/twittperator/rt.tw +++ b/twittperator/rt.tw @@ -41,4 +41,4 @@ })(); -// vim: set et fdm=syntax fenc= ft=javascript sts=2 sw=2 ts=2 : +// vim: set et fdm=syntax ft=javascript sts=2 sw=2 ts=2 : |