From 84986aecf969c09d66df768c3669b472a1c49212 Mon Sep 17 00:00:00 2001 From: teramako Date: Sat, 12 Jan 2013 00:08:15 +0900 Subject: replace E4X. for vimperator 3.6+ --- copy.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/copy.js b/copy.js index 7007f2d..18b61f5 100644 --- a/copy.js +++ b/copy.js @@ -1,5 +1,5 @@ var INFO = - @@ -113,19 +113,7 @@ EOM

wedata から読込まない label のリストを定義します。

-; -var PLUGIN_INFO = - -{NAME} -enable to copy strings from a template (like CopyURL+) -テンプレートから文字列のコピーを可能にします（CopyURL+みたいなもの） -2.0pre -2.0pre -https://github.com/vimpr/vimperator-plugins/raw/master/copy.js -teramako -MPL 1.1/GPL 2.0/LGPL 2.1 -0.7.5 -; +`; liberator.plugins.exCopy = (function(){ var excludeLabelsMap = {}; -- cgit v1.2.3 From 4787e768b3093787499cca362ff98ddcb62acf61 Mon Sep 17 00:00:00 2001 From: teramako Date: Sat, 12 Jan 2013 00:42:19 +0900 Subject: temporary fix. For vimperator 3.6+ --- _libly.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/_libly.js b/_libly.js index db17233..33b97bd 100644 --- a/_libly.js +++ b/_libly.js @@ -6,6 +6,7 @@ http://www.opensource.jp/licenses/mit-license.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ +/* var PLUGIN_INFO = libly(filename _libly.js) @@ -130,7 +131,7 @@ Request(url, headers, options): 以下の値はデフォルトで設定される（'Content-type'はPOST時のみ） >|| { - 'Accept': 'text/javascript, application/javascript, text/html, application/xhtml+xml, application/xml, text/xml, */*;q=0.1', + 'Accept': 'text/javascript, application/javascript, text/html, application/xhtml+xml, application/xml, text/xml, * /*;q=0.1', 'Content-type': 'application/x-www-form-urlencoded; charset=' + options.encodingの値 } ||< @@ -190,6 +191,7 @@ clearCache: ]]> ; +*/ //}}} //if (!liberator.plugins.libly) { @@ -463,21 +465,7 @@ libly.$U = {//{{{ }, xmlToDom: function xmlToDom(node, doc, nodes) { - XML.prettyPrinting = false; - switch (node.nodeKind()) - { - case "text": - return doc.createTextNode(node); - case "element": - let domnode = doc.createElementNS(node.namespace(), node.localName()); - for each (let attr in node.@*) - domnode.setAttributeNS(attr.name() == "highlight" ? NS.uri : attr.namespace(), attr.name(), String(attr)); - for each (let child in node.*) - domnode.appendChild(arguments.callee(child, doc, nodes)); - if (nodes && node.@key) - nodes[node.@key] = domnode; - return domnode; - } + return util.xmlToDom(node, doc, nodes); }, getElementPosition: function(elem) { var offsetTrail = elem; -- cgit v1.2.3 From 339aab0846b9eed955c5aaf62d3e9f49b08525e0 Mon Sep 17 00:00:00 2001 From: teramako Date: Sat, 12 Jan 2013 00:43:25 +0900 Subject: replace E4X. for vimperator 3.6+ --- feedSomeKeys_3.js | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/feedSomeKeys_3.js b/feedSomeKeys_3.js index 30bf52d..fd08ec6 100644 --- a/feedSomeKeys_3.js +++ b/feedSomeKeys_3.js @@ -33,8 +33,8 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = <> - :lazy fmaps -u='http://code.google.com/p/vimperator-labs/issues/list' o j k :lazy fmaps -u='http://code.google.com/p/vimperator-labs/issues/detail' u - -; +`; // }}} @@ -472,20 +471,23 @@ let INFO = <> function list (condition) { let maps = findMappings(condition); let template = modules.template; + let length = 0; let list = - - { - template.map(maps, function (map) - template.map(map.names, function (name) - - - - - )) + xml`
{name}{map.feedSomeKeys.rhs}{map.matchingUrls ? map.matchingUrls : '[Global]'}
+ ${ + template.map(maps, function (map){ + ++length; + return template.map(map.names, function (name) + xml` + + + + `) + }) } -
${name}${map.feedSomeKeys.rhs}${map.matchingUrls ? map.matchingUrls : '[Global]'}
; + `; - if (list.*.length() == list.text().length()) { + if (length == 0) { liberator.echomsg("No mapping found"); return; } @@ -496,15 +498,15 @@ let INFO = <> context.title = ['name', 'rhs & url']; context.completions = [ [ - {map.names[0]}, + xml`${map.names[0]}, - {map.feedSomeKeys.rhs} - { + ${map.feedSomeKeys.rhs} + ${ args['-ignoreurls'] - ? <> for {map.matchingUrls ? map.matchingUrls : 'Global'} + ? xml` for ${map.matchingUrls ? map.matchingUrls : 'Global'}` : '' } - + ` ] for each (map in findMappings({urls: args['-urls'], ignoreUrls: args['-ignoreurls']})) ]; -- cgit v1.2.3 From dc608b3994c067feee5e91b2af1f6b280f229170 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 10:30:37 +0900 Subject: Dropped E4X --- pixiv.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixiv.js b/pixiv.js index 35490bc..2d670f3 100644 --- a/pixiv.js +++ b/pixiv.js @@ -1,5 +1,5 @@ // {{{ INFO -var INFO = +var INFO =xml` You must login pixiv.

-; +`; // }}} commands.addUserCommand( -- cgit v1.2.3 From 282f99c0990593cd22bbf41d462ff2def8c964ad Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 10:37:49 +0900 Subject: Dropped E4X --- addhatebu.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addhatebu.js b/addhatebu.js index 93a6ef0..77cb14a 100644 --- a/addhatebu.js +++ b/addhatebu.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` Add Hatena Bookmark

-; +`; +// }}} commands.addUserCommand( ['addhatebu'], -- cgit v1.2.3 From d78f56d25f152d99bb037b4ba2b0a3a3980a4fc2 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 10:42:21 +0900 Subject: Dropped E4X --- gbmark.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gbmark.js b/gbmark.js index 22de6c8..f7c23d5 100644 --- a/gbmark.js +++ b/gbmark.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` Add Google Bookmark.

-; +`; +// }}} (function(){ commands.addUserCommand( -- cgit v1.2.3 From 8cb1ca048d4dfe14e9ff37ae0f585796886fdbd2 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 10:46:07 +0900 Subject: Dropped E4X --- gmap.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gmap.js b/gmap.js index c8271d6..3f321cd 100644 --- a/gmap.js +++ b/gmap.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` -; +`; +// }}} (function(){ commands.addUserCommand( -- cgit v1.2.3 From 866f9757911b887a27eda5dd651c2c145ca45f4a Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 10:52:10 +0900 Subject: Dropped E4X --- goo.gl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/goo.gl.js b/goo.gl.js index ffe4ac0..6ecde50 100644 --- a/goo.gl.js +++ b/goo.gl.js @@ -1,5 +1,5 @@ // {{{ INFO -var INFO = +var INFO =xml` Shorten URL by used of google

-; +`; // }}} commands.addUserCommand( -- cgit v1.2.3 From dfb2b18d32941bf378f37dc2bebeaaebfe901c60 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 11:02:24 +0900 Subject: Dropped E4X --- jweather.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jweather.js b/jweather.js index 6959ae9..3232860 100644 --- a/jweather.js +++ b/jweather.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` See. http://www.weathermap.co.jp/hitokuchi_rss/

-; +`; +// }}} commands.addUserCommand( ['jw[eather]'], -- cgit v1.2.3 From edf9b53649cb5f129f304d968d18d4720464c729 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 11:06:59 +0900 Subject: Dropped E4X --- simg.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/simg.js b/simg.js index afbc477..b366336 100644 --- a/simg.js +++ b/simg.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` You can save image on the currnet context area by this plugin.

-; +`; +// }}} commands.addUserCommand( ['simg'], -- cgit v1.2.3 From ce8381da4bf1cf04e903673d03f6c500de809a38 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 11:10:54 +0900 Subject: Dropped E4X --- tohex.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tohex.js b/tohex.js index 36e97ff..fb7b31c 100644 --- a/tohex.js +++ b/tohex.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` If you use i_love_echo.js, you should not use tohex plugin.

-; +`; +// }}} commands.addUserCommand( ['tohex'], -- cgit v1.2.3 From aeb46ee71b124e737719eb497ee55279d95f3e80 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 28 Dec 2012 11:16:14 +0900 Subject: Dropped E4X --- watchizu.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/watchizu.js b/watchizu.js index c40596f..e5091b2 100644 --- a/watchizu.js +++ b/watchizu.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` You can get Watchizu URL of current machine location by this plugin.

-; +`; +// }}} (function(){ commands.addUserCommand( -- cgit v1.2.3 From c3707896e017814c267f9a21725a3aa485eda7b6 Mon Sep 17 00:00:00 2001 From: teramako Date: Sat, 12 Jan 2013 22:40:27 +0900 Subject: fix E4X for Vimperator 3.6+ --- exopen.js | 152 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/exopen.js b/exopen.js index 90b6722..0e40adf 100644 --- a/exopen.js +++ b/exopen.js @@ -1,81 +1,83 @@ -var PLUGIN_INFO = - -{NAME} -Open URL from a template -テンプレートからURLをOpenします -2.0pre -2.0pre -https://github.com/vimpr/vimperator-plugins/raw/master/exopen.js -pekepekesamurai -0.10.1 - + pekepekesamurai + + + :exopen + :exopen template_name + +

+ template_name で設定されたURLを開きます。 +

+ + +

Example

+ +

%TITLE%を現在開いているWebページのタイトルに展開してURLを開きます。

-=== Example === -:exopen http://www.google.co.jp/search?q=%TITLE%: - %TITLE%を現在開いているWebページのタイトルに展開してURLを開きます。 -:exopen [title] - テンプレートで設定されたURLを開きます。 + +

テンプレートで設定されたURLを開きます。

-== Keyword == -%TITLE%: - 現在のWebページのタイトル -%URL%: - 現在のWebページのURL -%SEL%: - 選択中の文字列 -%HTMLSEL%: - 選択中のHTMLソース +

Keyword

+
+
%TITLE%
現在のWebページのタイトル
+
%URL%
現在のWebページのURL
+
%SEL%
選択中の文字列
+
%HTMLSEL%
選択中のHTMLソース
+
-== .vimperatorrc == ->|| -javascript < -; +

.vimperatorrc exmaple

+ +
+
label
テンプレート名。コマンドの引数で指定してください。
+
value
OpenするURL
+
custom
+ 関数か配列で指定してください。 + 関数の場合、return された文字列をオープンします。 + 配列の場合、value で指定された文字列を置換します。(条件→Array[0]、置換文字列→Array[1]) +
+
description
補完時に表示する説明文。
+
newtab
新規タブで開く場合は true を指定してください。
+
escape
URLエンコードする場合、true を指定してください。
+
+`; liberator.plugins.exOpen = (function() { var global = liberator.globalVariables.exopen_templates; -- cgit v1.2.3 From 09b20be2d185b3c1b4f3a4056bbbc5c3061e6e97 Mon Sep 17 00:00:00 2001 From: teramako Date: Thu, 17 Jan 2013 20:05:10 +0900 Subject: Dropped E4X for Vimperator 3.6+ --- _smooziee.js | 128 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 59 insertions(+), 69 deletions(-) diff --git a/_smooziee.js b/_smooziee.js index 36df3f5..ae4915c 100644 --- a/_smooziee.js +++ b/_smooziee.js @@ -8,84 +8,74 @@ // http://www.opensource.jp/licenses/mit-license.html // }}} // -// PLUGIN INFO: {{{ -var PLUGIN_INFO = - - smooziee - At j,k key scrolling to be smooth. - j,kキーでのスクロールをスムースに - 2.3pre - 2.3 - https://github.com/vimpr/vimperator-plugins/raw/master/_smooziee.js - snaka +// INFO: {{{ +var INFO = xml` + + snaka + MIT style license - 0.10.2 - || +

j,k key scrolling to be smoothly.

+

Global vriables

+

You can configure following variable as you like.

+
+
smooziee_scroll_amount
Scrolling amount(unit:px). Default value is 400px.
+
smooziee_interval
Scrolling interval(unit:ms). Default value is 20ms.
+
+

Example

+

Set scroll amount is 300px and interval is 10ms.

+ || - smooziee.smoothScrollBy(amount); - ||< - Example. - >|| + ]]> +

API

+ smooziee.smoothScrollBy(amount); +

Example

+ - - || + ]]> + + + snaka + + MIT style license +

普段のj,kキーのスクロールをLDRizeライクにスムースにします。

+

グローバル変数

+

以下の変数を.vimperatorrcなどで設定することで動作を調整することができます。

+
+
smooziee_scroll_amount
+
1回にスクロールする幅です（単位：ピクセル）。デフォルトは"400"です。
+
smooziee_interval
+
スクロール時のアニメーションのインターバルです（単位：ミリ秒）。 + "1"以上の値を設定します。デフォルトは"20"です。
+
+

設定例

+

スクロール量を300pxに、インターバルを10msに設定します。

+ || - smooziee.smoothScrollBy(amount); - ||< - amountにはスクロール量(ピクセル)を指定してください。正の値で下方向へ負の値で上方向へスクロールします。 - - Example. - >|| + ]]> +

API

+

他のキーにマップする場合やスクリプトから呼び出せるようAPIを用意してます。

+ smooziee.smoothScrollBy(amount); +

Example

+ -; + ]]> +

ToDo

+ +`; // }}} let self = liberator.plugins.smooziee = (function(){ -- cgit v1.2.3 From 291ebf7cc742b1d9f07b620ea45a01b7d6240c79 Mon Sep 17 00:00:00 2001 From: teramako Date: Thu, 17 Jan 2013 22:27:53 +0900 Subject: drop e4x, FixMe: 一部 xml`...` を使うとエラーが出るので通常文字列化した --- direct_bookmark.js | 192 ++++++++++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 91 deletions(-) diff --git a/direct_bookmark.js b/direct_bookmark.js index aafa575..aba403d 100644 --- a/direct_bookmark.js +++ b/direct_bookmark.js @@ -1,89 +1,92 @@ -var PLUGIN_INFO = - - {NAME} - Direct Post to Social Bookmarks - Trapezoid - 0.19.0 +var INFO = xml` + + Trapezoid GPL - 2.0pre - https://github.com/vimpr/vimperator-plugins/raw/master/direct_bookmark.js - || - Use social bookmark services to extract tags - 'h': Hatena Bookmark - 'd': del.icio.us - 'l': livedoor clip - 'g': Google Bookmarks - 'p': Places (Firefox bookmarks) - 'P': pinboard.in - Usage: let g:direct_sbm_use_services_by_tag = "hdl" -||< -=== g:direct_sbm_use_services_by_post === ->|| - Use social bookmark services to post - 'h': Hatena Bookmark - 'd': del.icio.us - 'l': livedoor clip - 'g': Google Bookmarks - 'P': pinboard.in - Usage: let g:direct_sbm_use_services_by_post = "hdl" -||< -=== g:direct_sbm_echo_type === ->|| - Post message type - 'simple' : single line, no posted services description - 'multiline' : multi line, display services description - 'none' : hide post message -||< -=== g:direct_sbm_is_normalize === ->|| - Use normalize permalink -||< -=== g:direct_sbm_is_use_migemo === ->|| - Use Migemo completion -||< -=== g:direct_sbm_private === ->|| - Private bookmark -||< - - -== Commands == -=== :btags === ->|| - Extract tags from social bookmarks for completion -||< -=== :sbm === ->|| - Post a current page to social bookmarks - Arguments - -s,-service: default:"hdl" - Specify target SBM services to post -||< -=== :bentry === ->|| - Goto Bookmark Entry Page -||< -=== :bicon === ->|| - Show Bookmark Count as Icon -||< - ]]> -; +

Social Bookmark direct add script

+

for Migemo search: require XUL/Migemo Extension

+

Parts

+ +

Viriables

+

g:direct_sbm_use_services_by_tag

+

Use social bookmark services to extract tags

+
+
h
Hatena Bookmark
+
d
del.icio.us
+
l
livedoor clip
+
g
Google Bookmarks
+
p
Places (Firefox bookmarks)
+
P
pinboard.in
+
+

Usage: let g:direct_sbm_use_services_by_tag = "hdl"

+ +

g:direct_sbm_use_services_by_post

+

Use social bookmark services to post

+
+
h
Hatena Bookmark
+
d
del.icio.us
+
l
livedoor clip
+
g
Google Bookmarks
+
P
pinboard.in
+
+

Usage: let g:direct_sbm_use_services_by_post = "hdl"

+ +

g:direct_sbm_echo_type

+

Post message type

+
+
simple
single line, no posted services description
+
multiline
multi line, display services description
+
none
hide post message
+
+ +

g:direct_sbm_is_normalize

+

Use normalize permalink

+ +

g:direct_sbm_is_use_migemo

+

Use Migemo completion

+ +

g:direct_sbm_private

+

Private bookmark

+ + + :btags + :btags + +

Extract tags from social bookmarks for completion

+ + + + :sbm + :sbm -service service + +

Post a current page to social bookmarks.

+

service: Specify target SBM services to post (default: "hdl")

+ + + + :bentry + :bentry + +

Goto Bookmark Entry Page

+ + + + :bicon + :bicon + +

Show Bookmark Count as Icon

+ + +`; (function(){ var evalFunc = window.eval; @@ -347,12 +350,19 @@ for Migemo search: require XUL/Migemo Extension entryPage:'http://b.hatena.ne.jp/entry/%URL::HATENA%', poster:function(user,password,url,title,comment,tags){ var tagString = tags.length > 0 ? '[' + tags.join('][') + ']' : ""; - var request = - - dummy - - {tagString + comment} - ; + // TODO: xml`...` を使うとillegal character 言われる、、、何故？ + /* + var request = xml` + dummy + + ${tagString + comment} + `; + */ + var request = '' + + 'dummy' + + '' + + '' + tagString + comment + '' + + ''; var wsse = new WSSEUtils(user,password); return Deferred.http({ -- cgit v1.2.3 From dc2b221ec3fe386527a23d8fa17dcd9a29edb1a8 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Fri, 18 Jan 2013 09:59:17 +0900 Subject: Dropped E4X --- onclick.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/onclick.js b/onclick.js index c5d6259..dedad13 100644 --- a/onclick.js +++ b/onclick.js @@ -1,5 +1,5 @@ -// INFO // -var INFO = +// {{{ INFO +var INFO =xml` -; +`; +// }}} (function(){ let onclick=function(args){ -- cgit v1.2.3 From 66351c964772c19f84116694c09a270b8e5a0b18 Mon Sep 17 00:00:00 2001 From: teramako Date: Mon, 11 Feb 2013 21:33:02 +0900 Subject: Drop E4X --- lookupDictionary.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lookupDictionary.js b/lookupDictionary.js index 6d6e7ff..3acfeca 100644 --- a/lookupDictionary.js +++ b/lookupDictionary.js @@ -164,15 +164,17 @@ SITE_DEFINITION.forEach(function (dictionary) { url = dictionary.url.replace(/%s/g,encodeURIComponent(arg)); } //liberator.log('URL: ' +url); - var result; - getHTML(url, function (str) { - var doc = createHTMLDocument(str); + getHTML(url, function (doc) { var result = getNodeFromXPath(dictionary.xpath, doc, dictionary.multi); if (!result) { liberator.echoerr('Nothing to show...'); + return; } var xs = new XMLSerializer(); - liberator.echo(new XMLList('
' + xs.serializeToString( result ).replace(/<[^>]+>/g,function (all) all.toLowerCase() ) + '
'), true); + liberator.echo(xml`
+ + ${new TemplateXML(xs.serializeToString( result ))} +
`); }, dictionary.srcEncode ? dictionary.srcEncode : null); }, { @@ -210,16 +212,17 @@ commands.addUserCommand( */ function getHTML(url, callback, charset) { var xhr= new XMLHttpRequest(); + xhr.open('GET',url,true); + xhr.responseType = "document"; xhr.onreadystatechange = function () { if (xhr.readyState == 4) { if (xhr.status == 200) { - callback.call(this,xhr.responseText); + callback.call(this,xhr.response); } else { throw new Error(xhr.statusText); } } }; - xhr.open('GET',url,true); if (charset) xhr.overrideMimeType('text/html; charset=' + charset); xhr.send(null); } -- cgit v1.2.3 From aa354ab95bd6a31e218264e224aa7e9838cfc983 Mon Sep 17 00:00:00 2001 From: teramako Date: Mon, 11 Feb 2013 21:33:23 +0900 Subject: 変な書き方を修正 --- lookupDictionary.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lookupDictionary.js b/lookupDictionary.js index 3acfeca..4ca4e39 100644 --- a/lookupDictionary.js +++ b/lookupDictionary.js @@ -250,8 +250,10 @@ function getNodeFromXPath(xpath,doc,isMulti) { if (isMulti) { let nodesSnapshot = doc.evaluate(xpath,doc.documentElement,null,XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,null); if (nodesSnapshot.snapshotLength == 0) return; - result = document.createElementNS(null,'div'); - for (let i=0; i @@ -227,16 +228,15 @@ function getHTML(url, callback, charset) { xhr.send(null); } /** - * @param {String} str - * @return {DOMDocument} + * sanitize script element + * @param {Element} element + * @return {Element} */ -function createHTMLDocument(str) { - str = str.replace(/^[\s\S]*?]*)?>[ \t\n\r]*|[ \t\n\r]*<\/html[ \t\r\n]*>[\S\s]*$/ig,'').replace(/[\r\n]+/g,' '); - var htmlFragment = content.document.implementation.createDocument(null,'html',null); - var range = content.document.createRange(); - range.setStartAfter(window.content.document.body); - htmlFragment.documentElement.appendChild(htmlFragment.importNode(range.createContextualFragment(str),true)); - return htmlFragment; +function sanitizeScript (element) { + for (let node of element.querySelectorAll("script")){ + node.parentNode.removeChild(node); + } + return element; } /** * @param {String} xpath XPath Expression -- cgit v1.2.3 From 07c5658c27f5426c0c4ef029ec1b6f2e37d5a95a Mon Sep 17 00:00:00 2001 From: teramako Date: Mon, 11 Feb 2013 22:00:35 +0900 Subject: fix completer --- lookupDictionary.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lookupDictionary.js b/lookupDictionary.js index 67b8cef..72a31e8 100644 --- a/lookupDictionary.js +++ b/lookupDictionary.js @@ -179,22 +179,23 @@ SITE_DEFINITION.forEach(function (dictionary) { }, dictionary.srcEncode ? dictionary.srcEncode : null); }, { - completer: function (arg) { + completer: function (context, args) { if (!spellChecker || !dictionary.dictionary || !spellChecker.setDictionary(dictionary.dictionary)) - return [0, []]; + return; - var suggestions = spellChecker.suggest(arg); + var filter = context.filter; + var suggestions = spellChecker.suggest(filter); var candidates = []; for (let i=0, max=suggestions.length ; i - ${new TemplateXML(xs.serializeToString( result ))} + ${template.maybeXML(xs.serializeToString( result ))} `); }, dictionary.srcEncode ? dictionary.srcEncode : null); }, -- cgit v1.2.3 From 829f6a22e800ef9c87a3160e300f96cf54e9f49e Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:04:52 +0900 Subject: fix: twittperator.js --- twittperator.js | 150 +++++++++++++++++++++++++++----------------------------- 1 file changed, 73 insertions(+), 77 deletions(-) diff --git a/twittperator.js b/twittperator.js index 0da88e8..ef28958 100644 --- a/twittperator.js +++ b/twittperator.js @@ -24,8 +24,7 @@ */ // INFO {{{ -let INFO = -<> +let INFO = xml` @@ -333,7 +332,7 @@ let INFO = プラグイン書きましょう。

-; +`; // }}} @@ -1708,9 +1707,9 @@ let INFO = let center = m[0]; let [head, tail] = [center[0], center.slice(1)]; let right = str.substring(m.index + m[0].length); - let content = head === "@" ? {center} - : {center} ; - return <>{Utils.anchorLink(left)}{content}{Utils.anchorLink(right)}; + let content = head === "@" ? ` ${center} ` + : ` ${center} `; + return `${Utils.anchorLink(left)}${content}${Utils.anchorLink(right)}`; } return str; }, // }}} @@ -1783,7 +1782,7 @@ let INFO = {}, function(json) { function idToIcon (id) { - return {icons[id] ? : <>😸}; + return `${icons[id] ? `` : "😸"}`; } let icons = {}; @@ -1791,14 +1790,14 @@ let INFO = if (t.user && t.user.id_str && t.user.profile_image_url) icons[t.user.id_str] = t.user.profile_image_url; } - liberator.echo(<> + liberator.echo(xml`
-
Retweeter {json.retweeters_count}
-
{template.map(json.retweeters, idToIcon)}
-
Favoriters {json.favoriters_count}
-
{template.map(json.favoriters, idToIcon)}
+
Retweeter ${json.retweeters_count}
+
${template.map(json.retweeters, idToIcon)}
+
Favoriters ${json.favoriters_count}
+
${template.map(json.favoriters, idToIcon)}
- ); + `); } ); }, // }}} @@ -1874,36 +1873,35 @@ let INFO = lookupUser: function(users) { // {{{ function showUsersInfo(json) { // {{{ let xml = modules.template.map(json, function(user) { - return <> + return xml` - + - - {user.name} + + ${user.name} - {user.location} - - id {user.id_str} - - {user.following ? '' : 'not'} following - - {user.friends_count}/{user.followers_count} ee/er - - {user.statuses_count} tweets - - {user.favourites_count} favs - - {user.listed_count} listed - - from {new Date(user.created_at).toLocaleString()} + ${user.location} - + id ${user.id_str} - + ${user.following ? '' : 'not'} following - + ${user.friends_count}/${user.followers_count} ee/er - + ${user.statuses_count} tweets - + ${user.favourites_count} favs - + ${user.listed_count} listed - + from ${new Date(user.created_at).toLocaleString()} - {user.description} + ${user.description} - ; + `; }); - liberator.echo( - <> + liberator.echo(xml` - {xml}
- - ); + ${xml}
+ `); } // }}} let ids = [], screenNames = []; @@ -1994,59 +1991,56 @@ let INFO = function menuEvent(st) ("window.parent.liberator.modules.plugins.twittperator.Twittperator.showStatusMenu(" + parseInt(st.id) + ")"); - let html = .toSource() - .replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") + + ]]>` + .replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") + + '' + s.reduce(function(table, status) { - return table.appendChild( - ("retweeted_status" in status) ? - let (rt = status.retweeted_status) - + if ("retweeted_status" in status) { + let rt = status.retweeted_status; + return table + xml` - : - + `.toString(); + } else { + return table + xml` - - ); - - },
- - {rt.user.screen_name} - {rt.user.screen_name}‬ + + ${rt.user.screen_name} + ${rt.user.screen_name}‬ - - {status.user.screen_name} + + ${status.user.screen_name} - {Utils.anchorLink(rt.text)} + ${Utils.anchorLink(rt.text)} - - ۞ - + ۞
- - {status.user.screen_name} - {status.user.screen_name}‬ + + ${status.user.screen_name} + ${status.user.screen_name}‬ - {Utils.anchorLink(status.text)} + ${Utils.anchorLink(status.text)} - - ۞ - + ۞
) - .toSource().replace(/(?:\r\n|[\r\n])[ \t]*/g, " "); + `.toString(); + } + }, "").replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") + + '
'; - liberator.echo(html, true); + window.Services.console.logStringMessage(html); + liberator.echo(new TemplateXML(html), true); }, // }}} showTwitterMentions: function(arg) { // {{{ tw.jsonGet("statuses/mentions", null, function(res) { @@ -2173,25 +2167,25 @@ let INFO = context.compare = void 0; context.createRow = function(item, highlightGroup) { if (highlightGroup === "CompTitle") { - return
-
  • {item} 
    • -
    ; + return xml`
    +
  • ${item} 
    • +
    `; } let [value, st] = item.item; if (st.user) { - return
    + return xml`
  • - -  {st.user.screen_name}: {st.text} + +  ${st.user.screen_name}: ${st.text}
    • -
    ; +
    `; } else { - return
    + return xml`
  • - {st.text} + ${st.text}
    • -
    ; +
    `; } }; @@ -2361,20 +2355,22 @@ let INFO = description: "Display status information", action: function(arg) { function dtdd(obj) { - let items = <>; + let items = ""; for (let [n, v] in Iterator(obj)) { let cont = (v && typeof v === "object") ? dtdd(v) : v; - items += <>
    {n}
    {cont}
    ; + items += `
    ${n}
    ${cont}
    `; } - return
    {items}
    ; + return `
    ${items}
    `; } let m = arg.match(/^\d+/); if (!m) return; let id = m[0]; - history.filter(function(st) st.id === id).map(dtdd).forEach(liberator.echo); + history.filter(function(st) st.id === id).map(dtdd).forEach(function(v) { + liberator.echo(new TemplateXML(v)); + }); }, timelineCompleter: true, completer: Completers.rawid(function(st) st.id) -- cgit v1.2.3 From 425888191f7a55b504824ac3a3a09a782ec13717 Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:11:32 +0900 Subject: temporary fix: multi_requester.js TODO: INFOをきちんとフォーマットしろ --- multi_requester.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/multi_requester.js b/multi_requester.js index f075779..90ca321 100644 --- a/multi_requester.js +++ b/multi_requester.js @@ -5,18 +5,16 @@ http://www.opensource.jp/licenses/mit-license.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = - - {NAME} - request, and the result is displayed to the buffer. - リクエストの結果をバッファに出力する。 - suVene - 0.4.16 - MIT - 2.0pre - 2.3 - https://github.com/vimpr/vimperator-plugins/raw/master/multi_requester.js - + suVene + MIT + +

    + -; + ]]> +

    +`; //}}} (function() { if (!liberator.plugins.libly) { -- cgit v1.2.3 From 9067d13d9699ecd4b3a5243219bae357fc4e8556 Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:13:11 +0900 Subject: fix: walk-input.js --- walk-input.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/walk-input.js b/walk-input.js index f5dd445..f310875 100644 --- a/walk-input.js +++ b/walk-input.js @@ -19,7 +19,7 @@ // // PLUGIN_INFO {{{ -let INFO = +let INFO = xml` Move focus backward

    -    ; +`; // }}} (function () { -- cgit v1.2.3 From adead626df8873c919216b1b154b3a5fd6b88edf Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:15:18 +0900 Subject: fix: PDF.js.js --- PDF.js.js | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/PDF.js.js b/PDF.js.js index 58b4671..0f04981 100644 --- a/PDF.js.js +++ b/PDF.js.js @@ -33,26 +33,24 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> - - anekos - New BSD License - -

    - - :pdfjs-mapping-sample -

    mapping sample

    pdfjs index - nnoremap -urls ^\\.pdf$ z :pdfjs zoom - ]]>     -     -     -; +let INFO = xml` + + anekos + New BSD License + +

    + + :pdfjs-mapping-sample +

    mapping sample

    pdfjs index + nnoremap -urls ^\\.pdf$ z :pdfjs zoom + ]]>     +     +    `; // }}} (function () { @@ -206,9 +204,9 @@ let INFO = function desc (o) { const PageRE = /#page=(\d+)\&/; if (o.href && PageRE.test(o.href)) { - return String(<>{nSpace(getOutlineLevel(o))} {o.textContent} (p{o.href.match(PageRE)[1]})); + return `${nSpace(getOutlineLevel(o))} ${o.textContent} (p${o.href.match(PageRE)[1]})`; } else { - return String(<>{nSpace(getOutlineLevel(o))} {o.textContent}); + return `${nSpace(getOutlineLevel(o))} ${o.textContent}`; } } -- cgit v1.2.3 From 631a3e024d7d46cd3075d6685505f98b71ebd7f5 Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:18:05 +0900 Subject: fix: unload-tab.js --- unload-tab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unload-tab.js b/unload-tab.js index 951c2b9..f4c4b6f 100644 --- a/unload-tab.js +++ b/unload-tab.js @@ -3,7 +3,7 @@ * unload[tab] num */ -var INFO = +var INFO = xml` Unload the tab contents.

    -    ; +`; if (!("SS" in this)) { XPCOMUtils.defineLazyServiceGetter(this, "SS", "@mozilla.org/browser/sessionstore;1", "nsISessionStore"); -- cgit v1.2.3 From 604b2aff3749f93c7efe9a691558b40d82003c64 Mon Sep 17 00:00:00 2001 From: teramako Date: Wed, 3 Apr 2013 21:18:22 +0900 Subject: dont create new tab --- unload-tab.js | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/unload-tab.js b/unload-tab.js index f4c4b6f..1bee8f4 100644 --- a/unload-tab.js +++ b/unload-tab.js @@ -5,7 +5,7 @@ var INFO = xml` teramako @@ -25,20 +25,22 @@ if (!("SS" in this)) { } function unloadTab (aTab) { - var state = SS.getTabState(aTab); - var tab = gBrowser.addTab(null, { skipAnimation: true }); - SS.setTabState(tab, state); - if (aTab.pinned) { - gBrowser.pinTab(tab); - } else { - let objState = JSON.parse(state); - if (objState.hidden) { - gBrowser.hideTab(tab); - TabView.moveTabTo(tab, JSON.parse(objState.extData["tabview-tab"]).groupID); - } - } - gBrowser.moveTabTo(tab, aTab._tPos + 1) - gBrowser.removeTab(aTab); + var browser = aTab.linkedBrowser, + state = SS.getTabState(aTab), + shistory = browser.sessionHistory, + icon = aTab.getAttribute("image"); + + browser.addEventListener("load", function onload(){ + this.removeEventListener("load", onload, true); + if (shistory.count > 1) + shistory.PurgeHistory(shistory.count -1); + + aTab.ownerDocument.defaultView.setTimeout(function(){ + aTab.setAttribute("image", icon); + }, 0); + SS.setTabState(aTab, state); + }, true); + browser.loadURI("about:blank"); } commands.addUserCommand(["unload[tab]"], "Unload Tabs", -- cgit v1.2.3 From a676d4fbbc12e3c5c9b7b4412370ea7473714e83 Mon Sep 17 00:00:00 2001 From: Jagua Date: Thu, 4 Apr 2013 00:08:24 +0900 Subject: Dropped E4X for Vimperator 3.6+ --- microsoft-translator.js | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/microsoft-translator.js b/microsoft-translator.js index 57ced85..927b033 100644 --- a/microsoft-translator.js +++ b/microsoft-translator.js @@ -1,6 +1,6 @@ /* NEW BSD LICENSE {{{ Copyright (c) 2009-2010, anekos. -Copyright (c) 2012, Jagua. +Copyright (c) 2012-2013, Jagua. All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -33,26 +33,8 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ -// PLUGIN_INFO {{{ -let PLUGIN_INFO = - - Microsoft Translator - Microsoft Translator - Translate with Microsoft AJAX Language API - 1.0.0 - anekos - Jagua - new BSD License (Please read the source code comments of this plugin) - 修正BSDライセンス (ソースコードのコメントを参照してください) - https://github.com/vimpr/vimperator-plugins/raw/master/microsoft-translator.js - _libly.js - 2.3 - 3.3 -; -// }}} - // INFO {{{ -let INFO = +let INFO = xml` -; +`; // }}} (function () { -- cgit v1.2.3 From 54e509b4f8a481a8bdd7cde2f707d3164a7e0a1a Mon Sep 17 00:00:00 2001 From: Jagua Date: Thu, 4 Apr 2013 00:27:07 +0900 Subject: Dropped E4X for Vimperator 3.6+ --- x-hint.js | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/x-hint.js b/x-hint.js index d9d3cc6..bd11eb3 100644 --- a/x-hint.js +++ b/x-hint.js @@ -32,33 +32,8 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ -// PLUGIN_INFO {{{ -let PLUGIN_INFO = - - X-Hint - X-Hint - Show the hints with given XPath. - 指定のXPathでヒントを表示する。 - 1.1.2 - anekos - new BSD License (Please read the source code comments of this plugin) - 修正BSDライセンス (ソースコードのコメントを参照してください) - https://github.com/vimpr/vimperator-plugins/raw/master/x-hint.js - 2.3 - 2.3 - : - Show the hints with - ]]> - : - で ヒントを表示 - ]]> -; -// }}} // INFO {{{ -let INFO = -<> +let INFO = xml` - -; + `; // }}} -- cgit v1.2.3 From 4a3e7bb2b56a692ef82f24daea776a987c631ac2 Mon Sep 17 00:00:00 2001 From: mitsugu oyama Date: Thu, 4 Apr 2013 12:54:53 +0900 Subject: Dropped E4X --- escape-from-iframe.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/escape-from-iframe.js b/escape-from-iframe.js index 5a86324..b72c0ee 100644 --- a/escape-from-iframe.js +++ b/escape-from-iframe.js @@ -34,7 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE. // INFO {{{ let INFO = -<> +xml` <Esc>

    Escape from iframe (focus to parent window).

     -     -; + `; // }}} (function () { -- cgit v1.2.3 From 866c812c0ac7f378ea9ec26ada7da2ca3447f19f Mon Sep 17 00:00:00 2001 From: anekos Date: Sat, 6 Apr 2013 16:50:50 +0900 Subject: Add ";" --- applauncher.js | 2 +- mouse_gestures.js | 2 +- statusline-toolbar.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applauncher.js b/applauncher.js index 09b9f83..31f62c9 100644 --- a/applauncher.js +++ b/applauncher.js @@ -30,7 +30,7 @@ var PLUGIN_INFO = 引数を複数指定する場合は配列形式で指定してください。 applauncher_charset を指定すると、渡される文字列が指定の文字セットに変換されます。 ]]>     -     +; liberator.plugins.AppLauncher = (function(){ const UConv = Cc['@mozilla.org/intl/scriptableunicodeconverter'].getService(Ci.nsIScriptableUnicodeConverter); diff --git a/mouse_gestures.js b/mouse_gestures.js index bde92f4..4699f98 100644 --- a/mouse_gestures.js +++ b/mouse_gestures.js @@ -68,7 +68,7 @@ var PLUGIN_INFO = - noremap flag キーを送る、かつ、そのキーコードを noremap で処理を行いたい場合、true を指定してください。 ]]> - +; liberator.plugins.MouseGestures = (function() { diff --git a/statusline-toolbar.js b/statusline-toolbar.js index b524e88..cabfde9 100644 --- a/statusline-toolbar.js +++ b/statusline-toolbar.js @@ -29,7 +29,7 @@ var INFO =

    - +; var updater = { "star-button": [ -- cgit v1.2.3 From 05896438474f55d3a569b983c46457a602cff0f6 Mon Sep 17 00:00:00 2001 From: anekos Date: Sat, 6 Apr 2013 16:52:09 +0900 Subject: Fix file character encoding --- ldrize_cooperation_fetch_flv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldrize_cooperation_fetch_flv.js b/ldrize_cooperation_fetch_flv.js index 8ba6737..df46982 100644 --- a/ldrize_cooperation_fetch_flv.js +++ b/ldrize_cooperation_fetch_flv.js @@ -218,7 +218,7 @@ function NiconicoMylistHandler(url, title){ var csrfToken = getElementsByXPath('//input[@name="csrf_token"]', html)[0].value; var mylists = getElementsByXPath('id("mylist_add_group_id")/option', html).map(function(element) [element.innerHTML, element.value]); - var params = [['ajax', '1'], ['mylist', 'add'], ['mylist_add', 'o^'], ['csrf_token', csrfToken], ['group_id', groupId]].map(function(p) p[0] + "=" + encodeURIComponent(p[1])).join("&"); + var params = [['ajax', '1'], ['mylist', 'add'], ['mylist_add', '登録'], ['csrf_token', csrfToken], ['group_id', groupId]].map(function(p) p[0] + "=" + encodeURIComponent(p[1])).join("&"); return Deferred.wait(count++ * 5).next(function(est){ return Deferred.http.post(nicoWatchEndPoint + videoId, params).next(function(mylistResult){ liberator.log(mylistResult.responseText); -- cgit v1.2.3 From d26934599d3df506f21e1ead94483d4e351b703c Mon Sep 17 00:00:00 2001 From: anekos Date: Sat, 6 Apr 2013 17:34:25 +0900 Subject: ﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮﾐｮ --- PMWriter.js | 22 +++++++++---------- _libly.js | 4 ++-- access_hatena.js | 4 ++-- account_switcher.js | 6 +++--- adddialog.js | 4 ++-- alert.js | 8 +++---- alias.js | 9 ++++---- amazon_simple_uri.js | 4 ++-- amebanow.js | 8 +++---- appendAnchor.js | 4 ++-- appinfo.js | 4 ++-- applauncher.js | 4 ++-- asdfghjkl.js | 4 ++-- atnd.js | 5 ++--- atodeyomu.js | 4 ++-- auto-bookmark.js | 17 +++++++-------- auto-focus-frame.js | 4 ++-- auto-wildoptions.js | 4 ++-- auto_detect_link.js | 4 ++-- auto_reload.js | 4 ++-- auto_source.js | 8 +++---- auto_word_select_mode.js | 4 ++-- autopagerize_controll.js | 4 ++-- autoproxychanger.js | 4 ++-- bijin_clock.js | 8 +++---- bitly.js | 4 ++-- browser_object.js | 4 ++-- buffer-multiple-hints.js | 5 ++--- caret-hint.js | 5 ++--- chaika.js | 5 ++--- clear_privacy_data.js | 4 ++-- clock.js | 4 ++-- commandBookmarklet.js | 4 ++-- command_menu.js | 4 ++-- cookieManager.js | 6 +++--- cpan-search.js | 4 ++-- delicious_search.js | 12 +++++------ echopy.js | 4 ++-- edit-vimperator-files.js | 5 ++--- ego_counter.js | 2 +- epub-reader.js | 5 ++--- erection.js | 13 ++++++----- every.js | 4 ++-- extension-manager.js | 9 ++++---- facebook.js | 5 ++--- fetchyoutube.js | 2 +- forcefocuscontent.js | 4 ++-- foxage2ch.js | 5 ++--- foxytunes.js | 4 ++-- function-template.js | 5 ++--- garbage_finder.js | 6 +++--- gmail-commando.js | 5 ++--- gmperator.js | 6 +++--- google-plus-commando.js | 15 ++++++------- google-search.js | 4 ++-- google-tasks.js | 10 ++++----- googledocs.js | 4 ++-- googlekanji.js | 4 ++-- haiku.js | 16 +++++++------- happy_hacking_vimperator.js | 4 ++-- hash.js | 4 ++-- hateDAopener.js | 8 +++---- hatebuWatchDog.js | 4 ++-- hatena-bookmark-search.js | 16 +++++++------- hatenaStar.js | 4 ++-- hatena_fotolife.js | 4 ++-- hatena_highlight.js | 4 ++-- hint-tombloo.js | 4 ++-- hints-for-embedded.js | 5 ++--- hints-yank-paste.js | 4 ++-- history-search-backward.js | 4 ++-- imageextender.js | 4 ++-- inspector.js | 4 ++-- jquery-loader.js | 9 ++++---- ldc-completer.js | 5 ++--- ldrize_cooperation_fetch_flv.js | 6 +++--- literal-bmark.js | 4 ++-- lo.js | 11 +++++----- localkeymode.js | 4 ++-- loginManager.js | 4 ++-- lolipo-ojisan.js | 13 ++++++----- longcat.js | 13 ++++++----- maine_coon.js | 4 ++-- marker_reader.js | 4 ++-- matanico.js | 4 ++-- memo.js | 6 +++--- microUpdate.js | 8 +++---- migemized_find.js | 5 ++--- migemo-find.js | 4 ++-- mixiecho.js | 4 ++-- mkcolor.js | 4 ++-- morse.js | 8 +++---- mouse_gestures.js | 4 ++-- mpd-currentsong.js | 9 ++++---- multi-exec.js | 4 ++-- my-style.js | 17 +++++++-------- namakubi.js | 8 +++---- newtab.js | 5 ++--- nextlink.js | 4 ++-- nicolist.js | 4 ++-- nnp_cooperation.js | 4 ++-- notifier.js | 4 ++-- nume.js | 5 ++--- open-frame.js | 9 ++++---- opener.js | 9 ++++---- option-selector.js | 4 ++-- options-migrate-user-pref.js | 4 ++-- pino.js | 4 ++-- pluginManager.js | 48 ++++++++++++++++++++--------------------- plugin_loader.js | 4 ++-- prevent_focus_ietab.js | 4 ++-- property-panel.js | 5 ++--- pypi.js | 4 ++-- readcatlater.js | 4 ++-- readitlater.js | 4 ++-- refcontrol.js | 4 ++-- refe.js | 5 ++--- relatedBlogSearch.js | 4 ++-- removetabs.js | 4 ++-- reporter.js | 4 ++-- resizable_textarea.js | 4 ++-- retweet.js | 4 ++-- reveal-ie-ctrl-a-images.js | 4 ++-- sbmcommentsviewer.js | 20 ++++++++--------- scalapi.js | 4 ++-- scenario-actor.js | 4 ++-- session-manager.js | 9 ++++---- slideshare.js | 9 ++++---- spatial-navigation.js | 9 ++++---- statstat.js | 8 +++---- statusbar_panel.js | 6 +++--- statusline-toolbar.js | 4 ++-- stella.js | 8 +++---- stylish.js | 4 ++-- subscldr.js | 4 ++-- tab-history.js | 4 ++-- tabmixplus.js | 4 ++-- tabsort.js | 4 ++-- tada.js | 4 ++-- takahashiPresentation.js | 4 ++-- tinymenu.js | 4 ++-- tinyurl.js | 4 ++-- toggler.js | 2 +- tombloo.js | 4 ++-- translaten.js | 4 ++-- twopen.js | 4 ++-- uaSwitchLite.js | 4 ++-- umihara.js | 4 ++-- unicode.js | 4 ++-- usi.js | 9 ++++---- uuid.js | 4 ++-- video-controller.js | 5 ++--- vimp_to_android_phone.js | 4 ++-- wassr.js | 24 ++++++++++----------- win-mouse.js | 7 +++--- xpath_hint.js | 4 ++-- yetmappings.js | 4 ++-- zip-de-download.js | 8 +++---- zoom-em-all.js | 9 ++++---- "\350\267\263.js" | 5 ++--- 160 files changed, 469 insertions(+), 507 deletions(-) diff --git a/PMWriter.js b/PMWriter.js index a4fc95c..aa3099a 100644 --- a/PMWriter.js +++ b/PMWriter.js @@ -81,13 +81,13 @@ } function concatXML (xmls) { - let result = <>; + let result = ``; xmls.forEach(function (xml) result += xml); return result; } function langList (info, name) { - let result = <>; + let result = ``; let i = info.length(); while (i-- > 0) { if (info[i].@lang.toString()) { @@ -124,7 +124,7 @@ if (!tag) tag = 'div'; - let result = <>; + let result = ``; for (let i = 0, l = info.length(); i < l; i++) { let it = info[i]; @@ -146,8 +146,8 @@ }; let files = io.File(pluginDirPath).readDirectory(); - let indexHtml = <>; - let allHtml = <>; + let indexHtml = ``; + let allHtml = ``; let pminfos = []; files.forEach(function (file) { @@ -236,7 +236,7 @@ true, function (it) (it.toString()) || '---') - let versionsBody = <>; + let versionsBody = ``; VERSIONS.forEach(function (ver) { let url = CodeReposBranch + ver + '/' + pluginFilename; @@ -245,17 +245,17 @@ file.append(ver); file.append(pluginFilename); versionsBody += - <> + `
    {'for ' + ver}
    - {file.exists() ? {url} : <>not supported} - ; + {file.exists() ? {url} : `not supported`} + `; }); versionsBody += - <> + `
    {'for Nightly'}
    {CodeRepos + pluginFilename} - ; + `; //
    Vimperator version
    diff --git a/_libly.js b/_libly.js index 33b97bd..8c6f245 100644 --- a/_libly.js +++ b/_libly.js @@ -7,7 +7,7 @@ }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ /* -var PLUGIN_INFO = +var PLUGIN_INFO = xml` libly(filename _libly.js) Vimperator plugins library? @@ -190,7 +190,7 @@ clearCache: wedata 読込み成功したら、強制的にキャッシュと置き換えるの作って！ ]]> -; +`; */ //}}} //if (!liberator.plugins.libly) { diff --git a/access_hatena.js b/access_hatena.js index b291b02..a8945e0 100644 --- a/access_hatena.js +++ b/access_hatena.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Access to Hatena Sevices quickly. @@ -46,7 +46,7 @@ map ; :accesshatena # 最後にスペースを入れておくと直ぐにホストの入力から始められます． ]]> -; +`; (function(){ var useWedata; var ignoreIds; diff --git a/account_switcher.js b/account_switcher.js index 4ad1caa..5678759 100644 --- a/account_switcher.js +++ b/account_switcher.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Switch account easily. @@ -50,7 +50,7 @@ liberator.accountSwitcherOpenNewTab = 1; ||< ]]> -; +`; (function(){ var services = []; var accounts = []; @@ -180,7 +180,7 @@ liberator.accountSwitcherOpenNewTab = 1; if (value.indexOf('=') > 0) { params.push(value); } else { - res.responseText.match(new RegExp('<([^<>]*?name=\"' + value + '\"[^<>]*?)>')); + res.responseText.match(new RegExp('<([^`]*?name=\"' + value + '\"[^`]*?)>')); RegExp.$1.match(/value=\"([\w-]+)\"/); params.push(value + '=' + encodeURIComponent(RegExp.$1)); } diff --git a/adddialog.js b/adddialog.js index 6911e47..0bc3151 100644 --- a/adddialog.js +++ b/adddialog.js @@ -33,7 +33,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }}} */ -let PLUGIN_INFO = // {{{ +let PLUGIN_INFO = xml` // {{{ {NAME} Add/Delete a :dialog argument. @@ -62,7 +62,7 @@ let PLUGIN_INFO = // {{{ :deldialog gmmanage ||< ]]> -; +`; /// }}} liberator.plugins.adddialog = (function(args) { // {{{ diff --git a/alert.js b/alert.js index a4e05d5..611a8ae 100644 --- a/alert.js +++ b/alert.js @@ -7,7 +7,7 @@ }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Alert アラート @@ -48,7 +48,7 @@ let PLUGIN_INFO = JavaScriptでSLを走らせる「SL.JS」を作りました ::: creazy photograph http://creazy.net/2008/02/sl_js.html ]]> -; +`; // }}} (function () { @@ -388,14 +388,14 @@ let PLUGIN_INFO = let sleep = parseFloat(arg || 3) * 1000; let sz = innerWidth / msg.length / 1.5; liberator.echo( -
    + xml`
    {msg}
    -
    +
    ` ); setTimeout(next, sleep); }, diff --git a/alias.js b/alias.js index 2baca1f..7a09ce2 100644 --- a/alias.js +++ b/alias.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` alias alias @@ -54,11 +54,10 @@ let PLUGIN_INFO = :alias : コマンド に という別名をつけます。 ]]> -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/amazon_simple_uri.js b/amazon_simple_uri.js index 34b4e6e..e21c79a 100644 --- a/amazon_simple_uri.js +++ b/amazon_simple_uri.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` amazon_simple_uri Copy Amazon Simple URI. @@ -19,7 +19,7 @@ var PLUGIN_INFO = と設定することにより、Amazon アソシエイトID(上の例ではhogehoge-22)をURLに追加します。 ]]> -; +`; //}}} // (function() diff --git a/amebanow.js b/amebanow.js index 3f06aa1..fd2b7be 100644 --- a/amebanow.js +++ b/amebanow.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` AmebaNau Amebaなう @@ -55,10 +55,10 @@ let PLUGIN_INFO = let g:amebanow_multipost = "twitter|wassr" ||< ]]> -; +`; // }}} // INFO {{{ -let INFO = +let INFO = xml` -; +`; // }}} diff --git a/appendAnchor.js b/appendAnchor.js index 8ca02a2..d5f7935 100644 --- a/appendAnchor.js +++ b/appendAnchor.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` appendAnchor append anchors to texts look like url. @@ -27,7 +27,7 @@ let PLUGIN_INFO = g:auto_append_anchor_once: 最初の一回だけ。 ]]> -; +`; (function(){ diff --git a/appinfo.js b/appinfo.js index c746807..5e59627 100644 --- a/appinfo.js +++ b/appinfo.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} show application information @@ -15,7 +15,7 @@ appinfo [information]: echo and copy mozilla information ]]> -; +`; //}}} (function() { diff --git a/applauncher.js b/applauncher.js index 31f62c9..146a46b 100644 --- a/applauncher.js +++ b/applauncher.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` AppLauncher アプリケーションランチャー @@ -30,7 +30,7 @@ var PLUGIN_INFO = 引数を複数指定する場合は配列形式で指定してください。 applauncher_charset を指定すると、渡される文字列が指定の文字セットに変換されます。 ]]> -; +`; liberator.plugins.AppLauncher = (function(){ const UConv = Cc['@mozilla.org/intl/scriptableunicodeconverter'].getService(Ci.nsIScriptableUnicodeConverter); diff --git a/asdfghjkl.js b/asdfghjkl.js index 361c33c..1f48516 100644 --- a/asdfghjkl.js +++ b/asdfghjkl.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` asdfghjkl; Inputting numbers by asdfghjkl; keys in hint mode. @@ -85,7 +85,7 @@ let PLUGIN_INFO = == Link == http://d.hatena.ne.jp/nokturnalmortum/20081021#1224543467 ]]> -; +`; // }}} (function () { diff --git a/atnd.js b/atnd.js index 86d802f..3e8ef5c 100644 --- a/atnd.js +++ b/atnd.js @@ -1,6 +1,5 @@ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/atodeyomu.js b/atodeyomu.js index 012ebda..7cb5480 100644 --- a/atodeyomu.js +++ b/atodeyomu.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} atodeyomu @@ -11,7 +11,7 @@ var PLUGIN_INFO = public domain -; +`; //}}} (function(){ diff --git a/auto-bookmark.js b/auto-bookmark.js index a3ed359..7da83ef 100644 --- a/auto-bookmark.js +++ b/auto-bookmark.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    -; +`; // }}} (function () { @@ -356,10 +355,10 @@ let INFO = template.map( bookmarks, function ([name, data]) { - return <> + return `
    {name}
    {data.current.title} {data.current.URL} ({def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}) ({def(data, 'pages.length', '?')})
    - ; + `; } ) } @@ -447,7 +446,7 @@ let INFO = let name = args.literalArg; let data = bookmarks.get(name); if (data) { - liberator.echo(<> + liberator.echo(`
    Name
    {name}
    @@ -464,7 +463,7 @@ let INFO = template.map(data.pages, function (it) (
  • {it.URL}
    • )) }
    - ); + `); } else { liberator.echoerr('Bookmark not found: ' + name); } @@ -548,7 +547,7 @@ let INFO = title = name; if (bookmarks.get(name)) { - error.data = String(<>"{name}" already exists); + error.data = String(`"{name}" already exists`); return false; } @@ -559,7 +558,7 @@ let INFO = updateCurrent(data, url, title); if (!initializeTab(tab, data)) { - error.data = String(<>This tab is already started); + error.data = String(`This tab is already started`); return false; } diff --git a/auto-focus-frame.js b/auto-focus-frame.js index 25f3445..18349b1 100644 --- a/auto-focus-frame.js +++ b/auto-focus-frame.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Auto focus frame Automatically focus to largest frame. @@ -54,7 +54,7 @@ let PLUGIN_INFO = インストールするだけ 一番面積の大きいフレームをフォーカスします ]]> -; +`; // }}} (function () { diff --git a/auto-wildoptions.js b/auto-wildoptions.js index 96dbab1..0e92936 100644 --- a/auto-wildoptions.js +++ b/auto-wildoptions.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Auto wildoptions Automatically toggle wildoptions=auto @@ -51,7 +51,7 @@ let PLUGIN_INFO = -; +`; // }}} (function () { diff --git a/auto_detect_link.js b/auto_detect_link.js index 4f11cc8..5be989e 100644 --- a/auto_detect_link.js +++ b/auto_detect_link.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` Auto Detect Link Find (next|previous) link, and jump. @@ -78,7 +78,7 @@ var PLUGIN_INFO = liberator.plugins.autoDetectLink.detect(false, {useBackHistory: false}); ||< ]]> -; +`; (function () { diff --git a/auto_reload.js b/auto_reload.js index 64dcf69..86198bf 100644 --- a/auto_reload.js +++ b/auto_reload.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Auto Reload 自動リロード @@ -51,7 +51,7 @@ let PLUGIN_INFO = -; +`; // }}} (function () { diff --git a/auto_source.js b/auto_source.js index 48dffb8..2054808 100644 --- a/auto_source.js +++ b/auto_source.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Auto Source Sourcing automatically when the specified file is modified. @@ -65,8 +65,8 @@ let PLUGIN_INFO = - :aso! taro.js - :autoso[urce]! taro.js ]]> -; -let INFO = +`; +let INFO = xml` -; +`; // }}} // Links: diff --git a/auto_word_select_mode.js b/auto_word_select_mode.js index e32adea..aa50b90 100644 --- a/auto_word_select_mode.js +++ b/auto_word_select_mode.js @@ -31,7 +31,7 @@ // }}} // PLUGIN INFO: {{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Add auto word select mode. @@ -143,7 +143,7 @@ var PLUGIN_INFO = - http://d.zeromemory.info/2008/11/20/vimperator-multi_requester.html ]]> -; +`; // }}} (function(){ diff --git a/autopagerize_controll.js b/autopagerize_controll.js index 51b8719..eb73ab7 100644 --- a/autopagerize_controll.js +++ b/autopagerize_controll.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} controls autopagerize @@ -24,7 +24,7 @@ prevpage: == TODO == ]]> -; +`; //}}} (function() { diff --git a/autoproxychanger.js b/autoproxychanger.js index 797b7bb..397176e 100644 --- a/autoproxychanger.js +++ b/autoproxychanger.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` autoproxychanger setting proxy @@ -50,7 +50,7 @@ var PLUGIN_INFO = EOM ||< ]]> -; +`; liberator.plugins.AutoProxyChanger = (function() { var gVar = liberator.globalVariables; diff --git a/bijin_clock.js b/bijin_clock.js index c6a068a..dd7e8a0 100644 --- a/bijin_clock.js +++ b/bijin_clock.js @@ -8,12 +8,12 @@ * == Stop == * js plugins.bijin_clock.stop() */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Bijin Clock - http://www.bijint.com 0.1 -; +`; liberator.plugins.bijin_clock = (function(){ const BASE_URL = 'http://www.bijint.com/jp/img/photo/'; @@ -34,7 +34,7 @@ function showBijinClock(){ let image_src = BASE_URL + getTimeString(date) + ".jpg"; liberator.echomsg(date.toLocaleString(), 0); openDialog('data:application/vnd.mozilla.xul+xml;charset=utf-8,' + - <> + ` - .toXMLString(), + `.toXMLString(), TITLE, 'chrome,dialog=yes,titlebar=no,popup=yes'); } diff --git a/bitly.js b/bitly.js index 970376f..5d4af2d 100644 --- a/bitly.js +++ b/bitly.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` bit.ly Get short alias by bit.ly and j.mp @@ -53,7 +53,7 @@ let PLUGIN_INFO = == Require == bit.ly API Key ]]> -; +`; // }}} diff --git a/browser_object.js b/browser_object.js index dfdc583..badeba4 100644 --- a/browser_object.js +++ b/browser_object.js @@ -1,5 +1,5 @@ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Map behave like text-object @@ -52,7 +52,7 @@ let PLUGIN_INFO = t: Tabs ]]> -; +`; // }}} // Vimperator plugin: 'Map behave like text-object' diff --git a/buffer-multiple-hints.js b/buffer-multiple-hints.js index 076a4a5..d15fabd 100644 --- a/buffer-multiple-hints.js +++ b/buffer-multiple-hints.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` _libly.js

    This plugin requires _libly.js.

     -; +`; // }}} diff --git a/caret-hint.js b/caret-hint.js index 60c6ec0..ea9ebbe 100644 --- a/caret-hint.js +++ b/caret-hint.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} /* _\|/_ diff --git a/chaika.js b/chaika.js index 1ad70cc..5f965db 100644 --- a/chaika.js +++ b/chaika.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { diff --git a/clear_privacy_data.js b/clear_privacy_data.js index d94ca45..6321907 100644 --- a/clear_privacy_data.js +++ b/clear_privacy_data.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} clear privacy data @@ -48,7 +48,7 @@ var PLUGIN_INFO = で 1m2d3h は 32日と3時間 という意味になり、現在から32日と3時間前までのデータを削除します。 ]]> -; +`; liberator.plugins.privacySanitizer = (function(){ var isFx31 = (Application.version.substring(0, 3) == "3.1") diff --git a/clock.js b/clock.js index f1dd328..9f0a265 100644 --- a/clock.js +++ b/clock.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} clock @@ -94,7 +94,7 @@ let clock_format='(%t %d)' ||< ]]> -; +`; ( function () { diff --git a/commandBookmarklet.js b/commandBookmarklet.js index 811691c..af3d837 100644 --- a/commandBookmarklet.js +++ b/commandBookmarklet.js @@ -5,7 +5,7 @@ * @version 0.6.4 */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} convert bookmarklets to commands @@ -60,7 +60,7 @@ let PLUGIN_INFO = この問題を避けるためにブックマークレットのタイトルを ASCII 文字のみに書き換えることをおすすめします。 ]]> -; +`; ( function () { diff --git a/command_menu.js b/command_menu.js index ef00cb1..417cfc8 100644 --- a/command_menu.js +++ b/command_menu.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Command Menu Execute main-menu and tool-bar by ex-command. @@ -65,7 +65,7 @@ let PLUGIN_INFO = == Requires == XUL/Migemo アドオン ]]> -; +`; // }}} // TODO == diff --git a/cookieManager.js b/cookieManager.js index f1c0cb9..21db32b 100644 --- a/cookieManager.js +++ b/cookieManager.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Manage Cookies (list, remove, add/remove permission) @@ -40,7 +40,7 @@ Cookie の管理をするプラグイン 補完機能を存分にお楽しみください :) ]]> -; +`; liberator.plugins.cookieManager = (function(){ @@ -135,7 +135,7 @@ commands.addUserCommand(["cookiem[anager]"], "Cookie Management", if (!host) return; switch (args[0]){ case "list": - let xml = <>; + let xml = ``; let tree = cManager.stored.getTree(host); for (let name in tree){ xml += template.table(name, [[c.name, c.value] for each(c in tree[name])]); diff --git a/cpan-search.js b/cpan-search.js index 9cb6fd3..bef3ff5 100644 --- a/cpan-search.js +++ b/cpan-search.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} CPAN search @@ -16,7 +16,7 @@ var PLUGIN_INFO = WebService::Hatena をマッチさせたいなら Web::Ha[tab] などで補完できると思います。 :cpan! で bang をつけると別のタブで開きます。 ]]> -; +`; (function() { var p = function(arg) { diff --git a/delicious_search.js b/delicious_search.js index fb5d2c9..996f5ea 100644 --- a/delicious_search.js +++ b/delicious_search.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} search DeliciousBookmark and that completer @@ -40,7 +40,7 @@ set go-=D ||< ]]> -; +`; liberator.plugins.delicious = (function(){ @@ -185,11 +185,11 @@ function templateDescription(item){ } function templateTitleAndIcon(item){ let simpleURL = item.text.replace(/^https?:\/\//, ''); - return <> - {item.icon ? : <>}{item.name} + return ` + {item.icon ? : ``}{item.name} {simpleURL} - ; + `; } commands.addUserCommand(["delicious[search]","ds[earch]"], "Delicious Bookmark Search", @@ -201,7 +201,7 @@ commands.addUserCommand(["delicious[search]","ds[earch]"], "Delicious Bookmark S let list = bookmarkSearch(args["-tags"], args["-query"]); let xml = template.tabular(["Title","Tags and Note"], [], list.map(function(item){ return [ - <>{item.name}, + `{item.name}`, "[" + item.tags.join(",") + "] " + item.note ]; })); diff --git a/echopy.js b/echopy.js index 3db9aba..8fcf614 100644 --- a/echopy.js +++ b/echopy.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} {NAME} @@ -62,7 +62,7 @@ let PLUGIN_INFO = == Link == http://d.hatena.ne.jp/nokturnalmortum/20081111#1226414487 ]]> -; +`; // }}} (function () { diff --git a/edit-vimperator-files.js b/edit-vimperator-files.js index 690ce54..e6cc6cb 100644 --- a/edit-vimperator-files.js +++ b/edit-vimperator-files.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` :edit file -; +`; // }}} diff --git a/ego_counter.js b/ego_counter.js index 66a3e03..a37786c 100644 --- a/ego_counter.js +++ b/ego_counter.js @@ -16,7 +16,7 @@ let update = function(color) { myHatebu.setAttribute( 'src', - <>http://b.hatena.ne.jp/bc/{color}/{MY_SITE}/.toSource() + `http://b.hatena.ne.jp/bc/{color}/{MY_SITE}/`.toSource() ); }; diff --git a/epub-reader.js b/epub-reader.js index 394c521..2976c05 100644 --- a/epub-reader.js +++ b/epub-reader.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/erection.js b/erection.js index 303ac8d..23dcd3e 100644 --- a/erection.js +++ b/erection.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    エレクチオンテキストと画像を表示します。

     -; +`; // }}} (function () { @@ -218,7 +217,7 @@ let INFO = ['c[opy]'], 'Copy text', makeErectionCommand(function (e) { - util.copyToClipboard(String(<>{e.text} - {e.by} {e.from} {e.imageURL})); + util.copyToClipboard(String(`{e.text} - {e.by} {e.from} {e.imageURL}`)); }), subOption ), @@ -226,13 +225,13 @@ let INFO = ['s[how]'], 'Show text and image', makeErectionCommand(function (e) { - liberator.echo(<> + liberator.echo(`

    {e.text}

    {e.by} {e.from}
    - ); + `); }), subOption ), @@ -240,7 +239,7 @@ let INFO = ['e[xcommand]'], 'Open command line with select erection', makeErectionCommand(function (e, args) { - let cmdArgs = String(<>{e.text} - {e.by} {e.from} {e.imageURL}); + let cmdArgs = String(`{e.text} - {e.by} {e.from} {e.imageURL}`); setTimeout(function () commandline.open('', args[0] + ' ' + cmdArgs, modes.EX), 1); }), { diff --git a/every.js b/every.js index 0fabbb7..1365a35 100644 --- a/every.js +++ b/every.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` every.js to run a specified command every time at specified interval. @@ -87,7 +87,7 @@ let PLUGIN_INFO = == Links == http://d.hatena.ne.jp/nokturnalmortum/20081102#1225552718 ]]> -; +`; // }}} ps = []; diff --git a/extension-manager.js b/extension-manager.js index 241ddc3..c4fcdc9 100644 --- a/extension-manager.js +++ b/extension-manager.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` extension manager アドオン管理 @@ -56,11 +56,10 @@ let PLUGIN_INFO = read the help with the below command. ":help extension-manager-plugin" ]]> -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/facebook.js b/facebook.js index 9c30146..4902be3 100644 --- a/facebook.js +++ b/facebook.js @@ -1,6 +1,5 @@ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function(){ diff --git a/fetchyoutube.js b/fetchyoutube.js index a19c823..dd8d9e2 100644 --- a/fetchyoutube.js +++ b/fetchyoutube.js @@ -22,7 +22,7 @@ (function () { function fixFilename (filename) { - const badChars = /[\\\/:;*?"<>|]/g; + const badChars = /[\\\/:;*?"`|]/g; return filename.replace(badChars, '_'); } diff --git a/forcefocuscontent.js b/forcefocuscontent.js index 0dbf2ca..8822cfc 100644 --- a/forcefocuscontent.js +++ b/forcefocuscontent.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} force focuscontent @@ -8,7 +8,7 @@ var PLUGIN_INFO = 2.0pre 2.0pre https://github.com/vimpr/vimperator-plugins/raw/master/forcefocuscontent.js -; +`; //}}} getBrowser().addEventListener("load", onPageLoad, true); diff --git a/foxage2ch.js b/foxage2ch.js index 5586757..327ff99 100644 --- a/foxage2ch.js +++ b/foxage2ch.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/foxytunes.js b/foxytunes.js index 780dd39..61013f5 100644 --- a/foxytunes.js +++ b/foxytunes.js @@ -32,7 +32,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` Foxy Tunes for FoxyTunes @@ -60,7 +60,7 @@ var PLUGIN_INFO = + :ftprevious + :ftvolume ]]> -; +`; (function () { diff --git a/function-template.js b/function-template.js index f739cae..fa1c682 100644 --- a/function-template.js +++ b/function-template.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/garbage_finder.js b/garbage_finder.js index d7072c4..511ec33 100644 --- a/garbage_finder.js +++ b/garbage_finder.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Garbage Finder ゴミ探し @@ -58,7 +58,7 @@ let PLUGIN_INFO = :garbages: (追加|削除)された変数を表示。 ]]> -; +`; // }}} (function () { @@ -116,7 +116,7 @@ let PLUGIN_INFO = function (args) { function makeLI (list) { if (list.length) { - let result = <>; + let result = ``; list.forEach(function (it) (result +=
  • {it}
    • )); return
      {result}
    ; } diff --git a/gmail-commando.js b/gmail-commando.js index 3d2f95f..cfa4cdb 100644 --- a/gmail-commando.js +++ b/gmail-commando.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/gmperator.js b/gmperator.js index df11af2..7d9c988 100644 --- a/gmperator.js +++ b/gmperator.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Vimperator plugin for Greasemonkey @@ -105,7 +105,7 @@ liberator.plugins.gmperator: ) ]]> -; +`; (function(){ @@ -235,7 +235,7 @@ liberator.plugins.gmperator = (function(){ //{{{ // --------------------------- commands.addUserCommand(['gmli[st]','lsgm'],'list Greasemonkey scripts', //{{{ function(args){ - var xml = <>; + var xml = ``; var scripts = GM_getConfig().scripts; var reg; if (args.bang || args.string == 'full'){ diff --git a/google-plus-commando.js b/google-plus-commando.js index a1b7cb8..1b0440d 100644 --- a/google-plus-commando.js +++ b/google-plus-commando.js @@ -34,8 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { @@ -522,7 +521,7 @@ let g:gplus_commando_map_menu = "m" // エントリにコメント function get1 (root) { function button (editor, name) - editor.parentNode.querySelector(S.role('button', <>[id$=".{name}"])); + editor.parentNode.querySelector(S.role('button', `[id$=".{name}"]`)); if (!root) return; @@ -574,7 +573,7 @@ let g:gplus_commando_map_menu = "m" // ダイアログ function get3 (root) { function button (editor, name) - editor.parentNode.querySelector(S.role('button', <>[id$=".{name}"])); + editor.parentNode.querySelector(S.role('button', `[id$=".{name}"]`)); if (!root) return; @@ -832,7 +831,7 @@ let g:gplus_commando_map_menu = "m" ps.backgroundColor = 'white'; ps.border = 'solid 1px grey'; } - panel.innerHTML = <> + panel.innerHTML = ` @@ -843,7 +842,7 @@ let g:gplus_commando_map_menu = "m"
    入力 効果 解説
    *TEXT* TEXT 太字
    -ね こ- ね こ 英数字や半角スペースを入れたらOK
    -Aねこす- Aねこす 英数字を前後に入れても良い
    - ; + `; move(panel); parent.appendChild(panel); @@ -1122,7 +1121,7 @@ let g:gplus_commando_map_menu = "m" for (let [, root] in Iterator(roots)) { if (!root.visible) continue; - xpath.push(String(<>div[contains(@class, "{s2x(S.closeButton)}")])); + xpath.push(String(`div[contains(@class, "{s2x(S.closeButton)}")]`)); xpath = xpath.map(function (it) (root.selector + '//' + it)); break; } diff --git a/google-search.js b/google-search.js index 9be5cea..efda50e 100644 --- a/google-search.js +++ b/google-search.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Google Search, and AutoComplete. @@ -17,7 +17,7 @@ var PLUGIN_INFO = google suggest での飛び先はあくまで google ですが、このプラグインは google の検索結果先に飛びます。 この plugin を作ってから multi_requester.js の存在をしってあっちを使えば・・・、と思いました。いちおう favicon が表示されたりします。 ]]> -; +`; (function() { diff --git a/google-tasks.js b/google-tasks.js index d968b1c..a724043 100644 --- a/google-tasks.js +++ b/google-tasks.js @@ -1,4 +1,4 @@ -var INFO = +var INFO = xml` ebith New BSD License -; +`; let httpGet = util.httpGet; @@ -43,17 +43,17 @@ function setup() { access_token = getAccessToken(); let url = rest_uri + '/users/@me/lists?oauth_token=' + access_token; let lists = JSON.parse(httpGet(url).responseText).items; - let tbody = <>; + let tbody = ``; for (let i=0; i☑{tasks[i2].title} : <>☐{tasks[i2].title}; + let taskTitle = (tasks[i2].status == 'completed') ? `☑{tasks[i2].title}` : `☐{tasks[i2].title}`; tbody += {lists[i].title}{taskTitle}; } } - liberator.echo(<>{tbody}
    ); + liberator.echo(`{tbody}
    `); }, { subCommands: [ diff --git a/googledocs.js b/googledocs.js index 12e0200..f732ad9 100644 --- a/googledocs.js +++ b/googledocs.js @@ -37,7 +37,7 @@ * */ // Last Change: 2009/01/14 22:14:16. -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} provide extended-hints modes for Google Docs @@ -74,7 +74,7 @@ Google Docs のトップページ ( http://docs.google.com/ ) で ';d' と押し let googledocs_mapping='g' ||< ]]> -; +`; ( function () { diff --git a/googlekanji.js b/googlekanji.js index 7381aca..3bea153 100644 --- a/googlekanji.js +++ b/googlekanji.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Google Kanji Google 漢字 @@ -55,7 +55,7 @@ let PLUGIN_INFO = が開き、補完が可能になるので、正しそうな漢字を選びます。 すると、クリップボードにその漢字がコピーされます。 ]]> -; +`; // }}} (function () { diff --git a/haiku.js b/haiku.js index ba38854..3cbf928 100644 --- a/haiku.js +++ b/haiku.js @@ -22,7 +22,7 @@ // un-fav someone's last status.. mean remove Hatena Star. // :haiku! #keyword // show the keyword timeline. -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Hatena Haiku Client @@ -52,7 +52,7 @@ The script allows you to update Haiku status from Vimperator. :haiku! #keyword: show the keyword timeline. ]]> -; +`; (function(){ liberator.plugins.haiku = { @@ -149,8 +149,8 @@ The script allows you to update Haiku status from Vimperator. statuses.forEach(function(status) { var text = status.text; var keyword = status.keyword; - var star = status.favorited > 0 ? <>{'x' + status.favorited} : <>; - var replies = <>; + var star = status.favorited > 0 ? `{'x' + status.favorited}` : ``; + var replies = ``; if (text.indexOf(keyword+"=") == 0) text = status.text.substr(keyword.length + 1); text = convert(text); @@ -159,16 +159,16 @@ The script allows you to update Haiku status from Vimperator. if (status.replies.length > 0){ replies =
    ; status.replies.forEach(function(rep){ - replies.* += <> + replies.* += `
    {rep.user.screen_name} {rep.user.name}
    {rep.text.substr(keyword.length)}
    - ; + `; }); } - html += <> + html += `
    {status.user.screen_name} {replies}
    - ; + `; }); return html; } diff --git a/happy_hacking_vimperator.js b/happy_hacking_vimperator.js index 1b0aa79..d721295 100644 --- a/happy_hacking_vimperator.js +++ b/happy_hacking_vimperator.js @@ -32,7 +32,7 @@ THE POSSIBILITY OF SUCH DAMAGE. */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Happy Happy Vimperator This plugin makes you to True Vimperatorer @@ -51,7 +51,7 @@ let PLUGIN_INFO = == Requirements == Steel Heart ]]> -; +`; (function () { diff --git a/hash.js b/hash.js index 772c3a1..7589cbc 100644 --- a/hash.js +++ b/hash.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} hash of file @@ -15,7 +15,7 @@ hash: :hash md2|md5|sha1|sha256|sha384|sha512 file-path ]]> -; +`; //}}} (function() { diff --git a/hateDAopener.js b/hateDAopener.js index 8e9864f..378ead1 100644 --- a/hateDAopener.js +++ b/hateDAopener.js @@ -31,7 +31,7 @@ // }}} // PLUGIN INFO: {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Search specified Hatena::Diary @@ -84,7 +84,7 @@ let PLUGIN_INFO = - APIを用意する ]]> -; +`; // }}} plugins.hateDAopener = (function(){ @@ -258,13 +258,13 @@ plugins.hateDAopener = (function(){ * template: title & url */ function templateTitleAndUrl(item) - <> + ` {item.name} {item.text.replace(/^https?:\/\//, '')} - ; + `; /** * template: tags diff --git a/hatebuWatchDog.js b/hatebuWatchDog.js index 0a683e4..b87f42c 100644 --- a/hatebuWatchDog.js +++ b/hatebuWatchDog.js @@ -30,7 +30,7 @@ // // }}} // PLUGIN INFO: {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Make notify hatebu-count when specified site's hatebu-count changed. @@ -89,7 +89,7 @@ let PLUGIN_INFO = - 監視フレームワークにのっける ]]> - ; + `; // }}} // Clear all watchers if started watcher exists. diff --git a/hatena-bookmark-search.js b/hatena-bookmark-search.js index 22fc58d..e98fa94 100644 --- a/hatena-bookmark-search.js +++ b/hatena-bookmark-search.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Hatena Bookmark UserSearch @@ -63,7 +63,7 @@ let g:hatena_bookmark_suffix_array='true'; -- キャッシュの追加, SuffixArray 検索の追加 ]]> -; +`; liberator.plugins.HatenaBookmark = (function(){ @@ -116,29 +116,29 @@ HatenaBookmark.reload = function() { HatenaBookmark.Command = { templateDescription: function (item, text) { - return <> + return ` { !(item.extra && item.extra.length) ? "" : { template.map(item.extra, function (e) - <>{e[1]}, - <> /* Non-breaking space */) + `{e[1]}`, + ` `/* Non-breaking space */) } } - + ` }, templateTitleIcon: function (item, text) { var simpleURL = text.replace(/^https?:\/\//, ''); if (simpleURL.indexOf('/') == simpleURL.length-1) simpleURL = simpleURL.replace('/', ''); - return <>{item.icon ? : <>}{item.item.title} + return `{item.icon ? : ``}{item.item.title} { simpleURL } - + ` }, filter: function (_item) { var item = _item.item; diff --git a/hatenaStar.js b/hatenaStar.js index 4c2302a..faca1a1 100644 --- a/hatenaStar.js +++ b/hatenaStar.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Add Hatena Star. @@ -8,7 +8,7 @@ var PLUGIN_INFO = 2.3pre 2.3pre https://github.com/vimpr/vimperator-plugins/raw/master/hatenaStar.js -; +`; (function() { const Cc = Components.classes; diff --git a/hatena_fotolife.js b/hatena_fotolife.js index cb0b146..9d604e4 100644 --- a/hatena_fotolife.js +++ b/hatena_fotolife.js @@ -23,7 +23,7 @@ * IN THE SOFTWARE. * */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Generates and yanks thumbnail tags in Hatena Fotolife @@ -64,7 +64,7 @@ hatena_fotolife_hint_key='f' image_extender_yank_key='f' ||< ]]> -; +`; ( function () { diff --git a/hatena_highlight.js b/hatena_highlight.js index 2ce0d5c..a3f02c5 100644 --- a/hatena_highlight.js +++ b/hatena_highlight.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Clear highlight or highlight keywords in Hatena Services. @@ -26,7 +26,7 @@ Google で検索してはてなにアクセスしたときにハイライトを ||< ]]> -; +`; (function(){ function toggleHighlight(isClear) { var elements = window.content.document.getElementsByTagName('span'); diff --git a/hint-tombloo.js b/hint-tombloo.js index 7c0cfd1..09d9bd6 100644 --- a/hint-tombloo.js +++ b/hint-tombloo.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Hint mode for Tombloo @@ -18,7 +18,7 @@ let g:hint_tombloo_xpath = '//img' Share target element by Tombloo ]]> -; +`; (function () { diff --git a/hints-for-embedded.js b/hints-for-embedded.js index 1fa940b..3f80672 100644 --- a/hints-for-embedded.js +++ b/hints-for-embedded.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { diff --git a/hints-yank-paste.js b/hints-yank-paste.js index 4cd5964..78231c8 100644 --- a/hints-yank-paste.js +++ b/hints-yank-paste.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Adds "Yank element's text/html/attrs" or "Paste to element" hint mode @@ -38,7 +38,7 @@ set hintpastetags='//xpath|//xpath2'; Paste(replace) to input/textarea. ]]> -; +`; (function() { var p = function(msg) { diff --git a/history-search-backward.js b/history-search-backward.js index c5bfe0d..45f796f 100644 --- a/history-search-backward.js +++ b/history-search-backward.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} History search backward like UNIX shell. @@ -16,7 +16,7 @@ liberator.globalVariables.history_search_backward_map = ['']; ||< ]]> -; +`; (function() { let p = function(msg) { diff --git a/imageextender.js b/imageextender.js index d9078b8..d2452d5 100644 --- a/imageextender.js +++ b/imageextender.js @@ -32,7 +32,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} extend image operation. @@ -144,7 +144,7 @@ image_skip_prompt='true' と設定すると、 ';g' で画像の URL をヤンクする拡張ヒントモードが開始されます。 ';e' で画像を保存しますが、その際ダイアログは表示されません。 ]]> -; +`; ( function () { diff --git a/inspector.js b/inspector.js index dac4b4c..884584f 100644 --- a/inspector.js +++ b/inspector.js @@ -1,4 +1,4 @@ -let INFO = +let INFO = xml` inspect the return value of evaluated the expr

    -    ; +`; var inspectorID = "inspector@mozilla.org"; diff --git a/jquery-loader.js b/jquery-loader.js index 9248e9e..4589145 100644 --- a/jquery-loader.js +++ b/jquery-loader.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` jQuery Loader jQuery Loader @@ -52,11 +52,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml`

    Load jQuery for commandline.

     -; +`; // }}} (function () { diff --git a/ldc-completer.js b/ldc-completer.js index 562594c..2ce943e 100644 --- a/ldc-completer.js +++ b/ldc-completer.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    同期して、ローカルにインポートする。

     -; +`; // }}} (function () { diff --git a/ldrize_cooperation_fetch_flv.js b/ldrize_cooperation_fetch_flv.js index df46982..59e9856 100644 --- a/ldrize_cooperation_fetch_flv.js +++ b/ldrize_cooperation_fetch_flv.js @@ -1,5 +1,5 @@ // Last Change: 12-Jun-2009. Jan 2008 -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Flv Downloader for Nicovideo @@ -42,7 +42,7 @@ Flv downloader for nicovideo. Nicovideo Mylist of registration destination. ||< ]]> -; +`; (function () { function Deferred () this instanceof Deferred ? this.init(this) : new Deferred(); @@ -184,7 +184,7 @@ var groupId = liberator.globalVariables.nicovideo_mylist || ''; function NiconicoFlvHandler(url, title) { let videoId = url.match(/\w{2}\d+/)[0]; - let fileName = title.replace(/[?\\*\/:<>|"]/g, '_') + '.flv'; + let fileName = title.replace(/[?\\*\/:`|"]/g, '_') + '.flv'; Deferred.http.get(nicoApiEndPoint + videoId).next(function(apiResult){ let flvUrl = decodeURIComponent(apiResult.responseText.match(/url=(.*?)&/)[1]); diff --git a/literal-bmark.js b/literal-bmark.js index ac2f0a1..ff0d08b 100644 --- a/literal-bmark.js +++ b/literal-bmark.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` literal bmark :bmark command that can included characters such as '"' in the URL. @@ -58,7 +58,7 @@ let PLUGIN_INFO = 引数は :bmark コマンドと同じですが、URL に '"' などの文字を含めることが出来ます。 ただし、-title などのオプションは URL に先行する必要があります。 ]]> -; +`; // }}} (function () { diff --git a/lo.js b/lo.js index 1159a3b..9d450b0 100644 --- a/lo.js +++ b/lo.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Link Opener Link Opener @@ -49,11 +49,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} // Usage: @@ -336,7 +335,7 @@ let INFO = context.process = [ process[0], function (item, text) - (item.thumbnail ? <>{text} + (item.thumbnail ? `{text}` : process[1].apply(this, arguments)) ]; context.completions = lolinks.map(function (it, i) ({elem: it, index: i})); diff --git a/localkeymode.js b/localkeymode.js index ff46394..639c047 100644 --- a/localkeymode.js +++ b/localkeymode.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` localkeymode assign temporary keymap @@ -52,7 +52,7 @@ var PLUGIN_INFO = extra: noremap, count 等の指定。addUserMap にて使用されます。 ]]> -; +`; liberator.plugins.LocalKeyMode = (function() { diff --git a/loginManager.js b/loginManager.js index 80b1eab..efb9e90 100644 --- a/loginManager.js +++ b/loginManager.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} login manager @@ -17,7 +17,7 @@ var PLUGIN_INFO = === TODO === ]]> -; +`; //}}} (function(){ diff --git a/lolipo-ojisan.js b/lolipo-ojisan.js index 68f2dfb..91b87ff 100644 --- a/lolipo-ojisan.js +++ b/lolipo-ojisan.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` lolipo-ojisan ロリポおじさん @@ -58,11 +58,10 @@ let PLUGIN_INFO = ロリポおじさんに話しかけます。 [message] を省略すると、魅惑のチャットモードが始まります。 ]]> -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} @@ -152,10 +151,10 @@ let INFO = let you = getContent('.you > div > div > p'); let ojisan = getContent('.ojisan > div > div > p'); - liberator.echo(<> + liberator.echo(`
    あなた
    {you}
    ロリポおじさん
    {ojisan}
    - ); + `); after && after(); } ); diff --git a/longcat.js b/longcat.js index 58b92e2..fde4c20 100644 --- a/longcat.js +++ b/longcat.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    Meow!

     -; +`; // }}} @@ -195,7 +194,7 @@ let INFO = let canvas = doc.createElement('canvas'); let bg = doc.createElement('div'); - canvas.setAttribute('style', String(<>)); + ]]>`)); - bg.setAttribute('style', String(<>)); + ]]>`)); canvas.width = 114; canvas.height = 100 + n * 100 + 30; diff --git a/maine_coon.js b/maine_coon.js index ad0023f..fab21ca 100644 --- a/maine_coon.js +++ b/maine_coon.js @@ -32,7 +32,7 @@ THE POSSIBILITY OF SUCH DAMAGE. */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Maine Coon メインクーン @@ -139,7 +139,7 @@ let PLUGIN_INFO = == メインクーン == http://ja.wikipedia.org/wiki/%E3%83%A1%E3%82%A4%E3%83%B3%E3%82%AF%E3%83%BC%E3%83%B3 ]]> -; +`; (function () { diff --git a/marker_reader.js b/marker_reader.js index d6fe0a1..2bd1c7c 100644 --- a/marker_reader.js +++ b/marker_reader.js @@ -5,7 +5,7 @@ http://www.gnu.org/copyleft/gpl.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} marker PageDown/PageUp. @@ -44,7 +44,7 @@ let g:marker_reader_mapping = "J,K" adds mapping J = mnext, K = mprev. ]]> -; +`; //}}} plugins.marker_reader = (function() { diff --git a/matanico.js b/matanico.js index 6e25421..802d167 100644 --- a/matanico.js +++ b/matanico.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} update Twitter status to current video/search page information and comment. @@ -111,7 +111,7 @@ matanico_related_tag_format: matanico_related_tag_servicename: matanico_related_tag_format で指定した $SERVICENAME 部分がこの値で展開されます。書式はそのままで投稿する文字列のみを変更したい場合にこの値を変更することで設定が容易になります。設定なしの場合 "またキーワードでニコニコタグ検索してる" が使用されます。 ]]> -; +`; (function () { diff --git a/memo.js b/memo.js index a282f5b..ef94ad0 100644 --- a/memo.js +++ b/memo.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Write a memo to the specified file. @@ -59,7 +59,7 @@ let PLUGIN_INFO = :memo fooooobar! "fooooobar!" と、メモに書く ]]> -; +`; // }}} // References: @@ -122,7 +122,7 @@ let PLUGIN_INFO = if (arg.literalArg) { puts(arg.literalArg); } else { - let out = <>; + let out = ``; gets().split(/\n/).reverse().forEach(function (l) { out +=
  • {l}
    • }); diff --git a/microUpdate.js b/microUpdate.js index 274e20a..85e681e 100644 --- a/microUpdate.js +++ b/microUpdate.js @@ -31,7 +31,7 @@ // }}} // PLUGIN INFO: {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Update blog more quickly. @@ -67,7 +67,7 @@ let PLUGIN_INFO = == ToDo == ]]> -; +`; // }}} plugins.microUpdate = (function() { @@ -84,12 +84,12 @@ plugins.microUpdate = (function() { transport.open('POST', this.endpoint['collection'], false /* synchronous */); transport.setRequestHeader('X-WSSE', hatena.wsseHeader); transport.setRequestHeader('Content-Type', 'application/atom+xml;type=entry;charset="utf-8"'); - transport.send(<> + transport.send(` {title} {content} - .toXMLString()); + `.toXMLString()); return transport.responseXML; } }; diff --git a/migemized_find.js b/migemized_find.js index 5930e16..2f27b85 100644 --- a/migemized_find.js +++ b/migemized_find.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { diff --git a/migemo-find.js b/migemo-find.js index 22560ad..ed529f8 100644 --- a/migemo-find.js +++ b/migemo-find.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Replace default search to migemo. @@ -25,7 +25,7 @@ migemo-find.js は pIXMigemoFind が提供している XUL/Migemo のインタ -- 検索開始文字の先頭が \ なら、通常の検索を行う。migemo りたくない時など用に ]]> -; +`; liberator.plugins.migemoFind = (function() { let p = function(m) Application.console.log(m); diff --git a/mixiecho.js b/mixiecho.js index 2f27b7c..d08af50 100644 --- a/mixiecho.js +++ b/mixiecho.js @@ -83,13 +83,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + statuses.map(function(status) - <> + ` {status.user.name}‬ - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + sprintf(': ', status.text)) .join("
    "); diff --git a/mkcolor.js b/mkcolor.js index 19c65db..0415769 100644 --- a/mkcolor.js +++ b/mkcolor.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` mkcolor mkcolor @@ -51,7 +51,7 @@ let PLUGIN_INFO = - mkcolor に現在の Highlight 設定を書き出します。 ]]> -; +`; // }}} (function () { diff --git a/morse.js b/morse.js index 9543307..99c7e31 100644 --- a/morse.js +++ b/morse.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Morse Morse @@ -54,10 +54,10 @@ let PLUGIN_INFO = :morse text: output text by morse code. ]]> -; +`; // }}} // INFO {{{ -let INFO = +let INFO = xml` -; +`; // }}} diff --git a/mouse_gestures.js b/mouse_gestures.js index 4699f98..21b3aa7 100644 --- a/mouse_gestures.js +++ b/mouse_gestures.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` Mouse Gestures マウスジェスチャー @@ -68,7 +68,7 @@ var PLUGIN_INFO = - noremap flag キーを送る、かつ、そのキーコードを noremap で処理を行いたい場合、true を指定してください。 ]]> -; +`; liberator.plugins.MouseGestures = (function() { diff --git a/mpd-currentsong.js b/mpd-currentsong.js index 983d9ef..829ff1e 100644 --- a/mpd-currentsong.js +++ b/mpd-currentsong.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    {song.Title} / {song.Artist} #NowPlaying +:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) `{song.Title} / {song.Artist} #NowPlaying` ]]>

    @@ -59,11 +58,11 @@ let INFO =

    {song.Title} / {song.Artist} #NowPlaying +:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) `{song.Title} / {song.Artist} #NowPlaying` ]]>

    -; +`; // }}} diff --git a/multi-exec.js b/multi-exec.js index 0c21093..cb93311 100644 --- a/multi-exec.js +++ b/multi-exec.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Multi-execute Add the command which execute some ex-commands. @@ -70,7 +70,7 @@ let PLUGIN_INFO = :mx ; echo 1 ; echo 2 ||< ]]> -; +`; // }}} (function () { diff --git a/my-style.js b/my-style.js index 2ae6098..6d69312 100644 --- a/my-style.js +++ b/my-style.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { @@ -129,14 +128,14 @@ EOM const StyleNamePrefix = 'my-style-'; const DefaultDefinedStyle = { - BLACKBOARD: <>, - NEKOME: <>`, + NEKOME: `, - VIMPMASK: <>`, + VIMPMASK: ` + ]]>` }; if (!__context__.DefinedStyles) { diff --git a/namakubi.js b/namakubi.js index 7d389f5..46d4ed6 100644 --- a/namakubi.js +++ b/namakubi.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Namakubi 生首 @@ -60,10 +60,10 @@ let PLUGIN_INFO = 喋ります！ ]]> -; +`; // }}} // INFO {{{ -let INFO = +let INFO = xml` http://chi.usamimi.info/Program/Application/BouyomiChan/ で Windows 用バイナリが手に入ります。

    -    ; +`; // }}} (function () { diff --git a/newtab.js b/newtab.js index b9e9061..865febe 100644 --- a/newtab.js +++ b/newtab.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    -; +`; // }}} (function () { diff --git a/nextlink.js b/nextlink.js index e96ea1c..df6e073 100644 --- a/nextlink.js +++ b/nextlink.js @@ -5,7 +5,7 @@ http://www.gnu.org/copyleft/gpl.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` nextlink mapping "[[", "]]" by AutoPagerize XPath. @@ -62,7 +62,7 @@ n: == TODO == ]]> -; +`; //}}} liberator.plugins.nextlink = (function() { diff --git a/nicolist.js b/nicolist.js index 854a869..c4892d9 100644 --- a/nicolist.js +++ b/nicolist.js @@ -3,7 +3,7 @@ * http://twitter.com/ebith */ -var INFO = +var INFO = xml` :nicolist open mylist-id video-id

    mylist-idのみであればマイリストを、video-idの指定もあれば動画を開きます

     -    ; +`; commands.addUserCommand( ['nicolist'], diff --git a/nnp_cooperation.js b/nnp_cooperation.js index ea96aac..94a109a 100644 --- a/nnp_cooperation.js +++ b/nnp_cooperation.js @@ -140,7 +140,7 @@ liberator.modules.commands.addUserCommand( } // evaluate variables - let xml = <> + let xml = ` {style()} {table({ numofDisplay: (nodesLength < numofList) ? nodesLength : numofList, @@ -149,7 +149,7 @@ liberator.modules.commands.addUserCommand( statuses: getStatusText(playlistNode.id), items: items, })} - + ` liberator.echo(xml, liberator.modules.commandline.FORCE_MULTILINE); }, diff --git a/notifier.js b/notifier.js index cb78c9d..ff5266f 100644 --- a/notifier.js +++ b/notifier.js @@ -5,7 +5,7 @@ http://www.opensource.jp/licenses/mit-license.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} change notice framework. @@ -122,7 +122,7 @@ buildMessages(diff): this.diff() により抽出されたオブジェクトを元に、liberator.plugins.notifier.Message のインスタンス、 または、その配列を返却して下さい。 ]]> -; +`; //}}} (function() { if (!liberator.plugins.libly) { diff --git a/nume.js b/nume.js index 6063293..ec6e11b 100644 --- a/nume.js +++ b/nume.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    Make numeronymized text.

     -; +`; // }}} diff --git a/open-frame.js b/open-frame.js index 945128d..1560b56 100644 --- a/open-frame.js +++ b/open-frame.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` openframe-command openframeコマンド @@ -52,11 +52,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml`

    新しいタブに選択したフレームを開く

     -; +`; // }}} (function () { diff --git a/opener.js b/opener.js index 88eb1b5..7cd3b3c 100644 --- a/opener.js +++ b/opener.js @@ -1,5 +1,5 @@ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` opener opener @@ -17,11 +17,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml`

    URL 移動時にそのURLが既に開かれていたら、そのタブに移動する

     -; +`; // }}} /* diff --git a/option-selector.js b/option-selector.js index ee29dc7..db4609f 100644 --- a/option-selector.js +++ b/option-selector.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Option Selector Select a option of the select element. @@ -51,7 +51,7 @@ let PLUGIN_INFO = を打つ。 ]]> -; +`; // }}} (function () { diff --git a/options-migrate-user-pref.js b/options-migrate-user-pref.js index 07aa8a7..229c0b5 100644 --- a/options-migrate-user-pref.js +++ b/options-migrate-user-pref.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} options migrate user_pref @@ -41,7 +41,7 @@ EOF ||< ]]> -; +`; (function() { let p = function(msg) { diff --git a/pino.js b/pino.js index ca8cd47..f0de3df 100644 --- a/pino.js +++ b/pino.js @@ -30,7 +30,7 @@ // // }}} // PLUGIN INFO: {{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Open livedoor Reader pinned items @@ -142,7 +142,7 @@ var PLUGIN_INFO = linkに該当するピンを一覧から削除する。 ]]> -; +`; // }}} let self = liberator.plugins.pino = (function() { // COMMAND /////////////////////////////////////////////////////// {{{ diff --git a/pluginManager.js b/pluginManager.js index f191b9a..26442a3 100644 --- a/pluginManager.js +++ b/pluginManager.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Manage Vimperator Plugins @@ -99,7 +99,7 @@ detail: - スタイルの追加(これはすべき？) ]]> -; +`; liberator.plugins.pluginManager = (function(){ @@ -109,22 +109,22 @@ var tags = { // {{{ name: function(info) fromUTF8Octets(info.toString()), author: function(info){ var name = fromUTF8Octets(info.toString()); - var xml = <>{name}; + var xml = `{name}`; if (info.@mail.toString() != '') - xml += <> <'} highlight="URL">{info.@mail}>; + xml += ` <'} highlight="URL">{info.@mail}>`; if (info.@homepage.toString() != '') - xml += <> ({makeLink(info.@homepage.toString())}); + xml += ` ({makeLink(info.@homepage.toString())})`; return xml; }, description: function(info) makeLink(fromUTF8Octets(info.toString())), license: function(info){ - var xml = <>{fromUTF8Octets(info.toString())}; + var xml = `{fromUTF8Octets(info.toString())}`; if (info.@document.toString() != '') - xml += <> {makeLink(info.@document.toString())}; + xml += ` {makeLink(info.@document.toString())}`; return xml; }, require: function(infos){ - let xml = <>; + let xml = ``; for (let i=0; i 0) { let m = s.match(/(?:https?:\/\/|mailto:)\S+/); if (m) { - result += <>{s.slice(0, m.index)}{m[0]}; + result += `{s.slice(0, m.index)}{m[0]}`; s = s.slice(m.index + m[0].length); } else { - result += <>{s}; + result += `{s}`; break; } } @@ -230,7 +230,7 @@ Plugin.prototype = { // {{{ initialize: function(path, context){ this.path = path; this.name = context.NAME; - this.info = context.PLUGIN_INFO || <>; + this.info = context.PLUGIN_INFO || ``; this.getItems(); }, getItems: function(){ @@ -386,7 +386,7 @@ var WikiParser = (function () { return new arguments.callee(lines, result, indents); this.lines = lines; - this.result = result || <>; + this.result = result || ``; this.indents = indents || []; } State.prototype = { @@ -439,7 +439,7 @@ var WikiParser = (function () { Array.concat(ary); function xmlJoin (xs, init) { - let result = init || <>; + let result = init || ``; for (let i = 0, l = xs.length; i < l; i++) result += xs[i]; return result; @@ -470,13 +470,13 @@ var WikiParser = (function () { // FIXME function link (s) { let m; - let result = <>; + let result = ``; while (s && (m = s.match(/(?:https?:\/\/|mailto:)\S+/))) { - result += <>{RegExp.leftContext || ''}{m[0]}; + result += `{RegExp.leftContext || ''}{m[0]}`; s = RegExp.rightContext; } if (s) - result += <>{s}; + result += `{s}`; return result; } @@ -591,7 +591,7 @@ var WikiParser = (function () { if (m) { let h = m[2]; let next = C.many(self.wikiLine)(st.next.indent(m[1])); - return next.indentBack().set(xmlJoin([<>{h}
    ].concat(next.result))).wrap('li'); + return next.indentBack().set(xmlJoin([`{h}
    `].concat(next.result))).wrap('li'); } return Error(c, st); }; @@ -606,7 +606,7 @@ var WikiParser = (function () { emptyLine: function emptyLine (st) { if (/^\s*$/.test(st.head)) { - return st.next.set(<>); + return st.next.set(``); } return Error('spaces', st); }, @@ -614,7 +614,7 @@ var WikiParser = (function () { // St -> St XML plain: function plain (st) { let text = st.head; - return st.next.set(<>{stripAndLink(text)}
    ); + return st.next.set(`{stripAndLink(text)}
    `); }, // St -> St XML @@ -750,7 +750,7 @@ HTMLStack.prototype = { // {{{ } var buf = this.last[this.last.length()-1]; if (buf.nodeKind() == 'text'){ - this.last[this.last.length()-1] += this.isInline(xml) ? <>
    {xml} : xml; + this.last[this.last.length()-1] += this.isInline(xml) ? `
    {xml}` : xml; } else if (this.isInline(xml)){ this.stack[this.length-1] += xml; } else if (buf.localName() == xml.localName()){ @@ -783,7 +783,7 @@ HTMLStack.prototype = { // {{{ if (tmp[tmp.length()-1].nodeKind() == 'element'){ buf[buf.length()-1].* += xml; } else { - buf[buf.length()-1].* += <>
    {xml}; + buf[buf.length()-1].* += `
    {xml}`; } } else { this.last[this.last.length()-1].* += xml; @@ -965,14 +965,14 @@ var public = { return plugins.filter(function(plugin) names.indexOf(plugin.name) >= 0); }, checkVersion: function(names){ - let xml = <>; + let xml = ``; this.getPlugins(names).forEach(function(plugin){ xml += plugin.checkVersion(); }); return xml; }, update: function(names){ - let xml = <>; + let xml = ``; this.getPlugins(names).forEach(function(plugin){ xml += plugin.updatePlugin(); }); @@ -986,7 +986,7 @@ var public = { return; }, list: function(names, verbose){ - let xml = <> + let xml = `` this.getPlugins(names).forEach(function(plugin){ xml += plugin.itemFormatter(verbose); }); diff --git a/plugin_loader.js b/plugin_loader.js index b304fbf..d71a310 100644 --- a/plugin_loader.js +++ b/plugin_loader.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Plugin Loader プラグインローダー @@ -60,7 +60,7 @@ let PLUGIN_INFO = == Link == http://d.hatena.ne.jp/nokturnalmortum/20081008#1223397705 ]]> -; +`; // }}} diff --git a/prevent_focus_ietab.js b/prevent_focus_ietab.js index 4417175..4bf467f 100644 --- a/prevent_focus_ietab.js +++ b/prevent_focus_ietab.js @@ -8,7 +8,7 @@ // }}} // // PLUGIN INFO: {{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` prevent_focus_ietab This plugin prevents focusing IETab automaticaly. @@ -31,7 +31,7 @@ var PLUGIN_INFO = == 使い方 == vimpのpluginディレクトリにこのファイルを格納してください。それだけです。 ]]> -; +`; // }}} (function() { diff --git a/property-panel.js b/property-panel.js index 8a92797..fea7229 100644 --- a/property-panel.js +++ b/property-panel.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/pypi.js b/pypi.js index 2b03c02..2109e13 100644 --- a/pypi.js +++ b/pypi.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` pypi Add a pypi command @@ -15,7 +15,7 @@ var PLUGIN_INFO = :pypi {package or term} ]]> -; +`; liberator.plugins.pypi = (function(){ diff --git a/readcatlater.js b/readcatlater.js index 770bc3e..4b0ccd9 100644 --- a/readcatlater.js +++ b/readcatlater.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Read Cat Later Read it later @@ -73,7 +73,7 @@ let PLUGIN_INFO = == Link == http://d.hatena.ne.jp/nokturnalmortum/20080918#1221729188 ]]> -; +`; // }}} (function () { diff --git a/readitlater.js b/readitlater.js index 32ebed4..53828b7 100644 --- a/readitlater.js +++ b/readitlater.js @@ -5,7 +5,7 @@ * TODO:ADDにbufferからのリストを入れられるように */ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` readitlater Read it Later を快適に使うためのプラグインです @@ -55,7 +55,7 @@ let PLUGIN_INFO = ]]> -; +`; (function(){ diff --git a/refcontrol.js b/refcontrol.js index 54261b3..d5ef0fb 100644 --- a/refcontrol.js +++ b/refcontrol.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` refcontrol control referrer @@ -40,7 +40,7 @@ param: url: 指定したURLでリファラーを送信します。 ]]> -; +`; liberator.plugins.RefControl = (function() { diff --git a/refe.js b/refe.js index b9f5388..43be175 100644 --- a/refe.js +++ b/refe.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    補完で検索し、リファレンスのページを新しいタブに開きます。

     -; +`; // }}} (function () { diff --git a/relatedBlogSearch.js b/relatedBlogSearch.js index e1987e2..f79cf14 100644 --- a/relatedBlogSearch.js +++ b/relatedBlogSearch.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Show/Open related blog @@ -62,7 +62,7 @@ let コマンドで設定してください(しない場合はデフォルト値 %updated%: 更新された日時(%Y-%m-%dT%H:%M:%SZ) ]]> -; +`; liberator.plugins.relatedBlogSearch = (function(){ const LANG = window.navigator.language; diff --git a/removetabs.js b/removetabs.js index a753ab6..d55b6b9 100644 --- a/removetabs.js +++ b/removetabs.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` removetabs RemoveTabs @@ -30,7 +30,7 @@ https://addons.mozilla.org/ja/firefox/addon/4227 noremap :removetabsright ||< ]]> -; +`; (function(){ liberator.modules.commands.addUserCommand(['removetabsleft'], 'remove tabs left', diff --git a/reporter.js b/reporter.js index ed2fd0a..4a022be 100644 --- a/reporter.js +++ b/reporter.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` mkreport Write current information to the specified file @@ -58,7 +58,7 @@ let PLUGIN_INFO = - デフォルトから変更されている preference (about:config でみられる設定) のリスト - バージョンなどの情報 ]]> -; +`; // }}} (function () { diff --git a/resizable_textarea.js b/resizable_textarea.js index dbad5a5..0d87bad 100644 --- a/resizable_textarea.js +++ b/resizable_textarea.js @@ -5,7 +5,7 @@ http://www.opensource.jp/licenses/mit-license.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Allows you to resize textareas. @@ -41,7 +41,7 @@ you can resize current component by using a keyboad. "escape" or "enter": end of resize. ]]> -; +`; //}}} (function() { diff --git a/retweet.js b/retweet.js index 09d4d3e..b97be81 100644 --- a/retweet.js +++ b/retweet.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` retweet ReTweet This Page. @@ -19,7 +19,7 @@ Usage: ReTweet This Post. ]]> -; +`; //}}} // ( diff --git a/reveal-ie-ctrl-a-images.js b/reveal-ie-ctrl-a-images.js index 9424c42..5ce2324 100644 --- a/reveal-ie-ctrl-a-images.js +++ b/reveal-ie-ctrl-a-images.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Reveal Image Reveal IE Ctrl-A images. @@ -63,7 +63,7 @@ let PLUGIN_INFO = g:reveal_ie_image_mode_reverse = 'R': 反対版のヒントモード ]]> -; +`; // }}} (function () { diff --git a/sbmcommentsviewer.js b/sbmcommentsviewer.js index 3e6d599..fb9c647 100644 --- a/sbmcommentsviewer.js +++ b/sbmcommentsviewer.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` SBM Comments Viewer List show Social Bookmark Comments @@ -43,7 +43,7 @@ e.g.) 一度取得したものは(30分ほど)キャッシュに貯めてますので何度も見直すことが可能です。 粋なコマンド名募集中 ]]> -; +`; liberator.plugins.sbmCommentsViewer = (function(){ var isFilterNoComments = liberator.globalVariables.sbm_comments_viewer_filter_nocomments || false; @@ -74,11 +74,11 @@ SBMContainer.prototype = { //{{{ )); }, toHTML: function(format, countOnly){ - var label = <> - {this.faviconURL ? : <>} + var label = ` + {this.faviconURL ? : ``} {manager.type[this.type] + ' ' + this.count + '(' + this.entries.length + ')'} - {this.pageURL ? {this.pageURL} : <>} - ; + {this.pageURL ? {this.pageURL} : ``} + `; if (countOnly){ return label; } else { @@ -87,7 +87,7 @@ SBMContainer.prototype = { //{{{
    ; let self = this; xml.* += (function(){ - var div = <>; + var div = ``; self.entries.forEach(function(e){ if (isFilterNoComments && !e.comment) return; div += e.toHTML(format); @@ -129,10 +129,10 @@ SBMEntry.prototype = { //{{{ while (s.length > 0) { let m = s.match(/(?:https?:\/\/|mailto:)\S+/); if (m) { - result += <>{s.slice(0, m.index)}{m[0]}; + result += `{s.slice(0, m.index)}{m[0]}`; s = s.slice(m.index + m[0].length); } else { - result += <>{s}; + result += `{s}`; break; } } @@ -144,7 +144,7 @@ SBMEntry.prototype = { //{{{ format.forEach(function(colum){ switch(colum){ case 'id': - xml.* += {self.userIcon ? <>{self.id} : <>{self.id}}; + xml.* += {self.userIcon ? `{self.id}` : `{self.id}`}; break; case 'timestamp': xml.* += {self.formatDate()}; diff --git a/scalapi.js b/scalapi.js index e0082da..0de76cc 100644 --- a/scalapi.js +++ b/scalapi.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Scala API document @@ -16,7 +16,7 @@ Scala の API を検索し、保管し、該当のページを開きます。 引数には正規表現も利用できます。 ]]> -; +`; (function() { var p = function(arg) { diff --git a/scenario-actor.js b/scenario-actor.js index 727edb0..d896f17 100644 --- a/scenario-actor.js +++ b/scenario-actor.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} browser act scenario semi-automatic. @@ -78,7 +78,7 @@ and action expressions are quoted by {begin: ...}. - fix bugs. - a lot. ]]> -; +`; //}}} (function() { diff --git a/session-manager.js b/session-manager.js index 117aae3..1560c58 100644 --- a/session-manager.js +++ b/session-manager.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Session Manager Session Manager @@ -51,11 +51,10 @@ let PLUGIN_INFO = ]]> -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} // 参考スクリプト: diff --git a/slideshare.js b/slideshare.js index 9ebc472..0a6f9bc 100644 --- a/slideshare.js +++ b/slideshare.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    フルスクリーン切り換え

     -; +`; // }}} @@ -158,14 +157,14 @@ let INFO = function FlashSlideshare (doc, callback) { let player = doc.querySelector('#player'); - const fullScreenStyle = <>; + ]]>`; let toggleFullscreen = makeFullscreenToggler(doc, makeStyleToggler(fullScreenStyle, player)); diff --git a/spatial-navigation.js b/spatial-navigation.js index 74c15d1..feb0192 100644 --- a/spatial-navigation.js +++ b/spatial-navigation.js @@ -38,7 +38,7 @@ /* Original version is "SpatialNavigation.js" of Firefox. */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Spatial Navigation 空間ナビゲーション @@ -54,11 +54,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/statstat.js b/statstat.js index 6263aa3..aff34d8 100644 --- a/statstat.js +++ b/statstat.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Stat Stat すた☆すた @@ -52,10 +52,10 @@ let PLUGIN_INFO = Links: http://d.hatena.ne.jp/nokturnalmortum/20081202/1228218135 ]]> -; +`; // }}} // INFO {{{ -let INFO = +let INFO = xml` -; +`; // }}} (function () { diff --git a/statusbar_panel.js b/statusbar_panel.js index 7180890..156fd7f 100644 --- a/statusbar_panel.js +++ b/statusbar_panel.js @@ -1,4 +1,4 @@ -let INFO = //{{{ +let INFO = xml` //{{{ -double-clickを指定するとダブルクリックになります。

    -    ; +`; //}}} let MOUSE_BUTTON_LEFT = 0; @@ -140,7 +140,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 <>{item.icon ? item.icon : <>}{text} + return `{item.icon ? item.icon : ``}{text}` }]; var list = generateStatusbarpaneIDlList(arg); diff --git a/statusline-toolbar.js b/statusline-toolbar.js index cabfde9..069ef69 100644 --- a/statusline-toolbar.js +++ b/statusline-toolbar.js @@ -1,4 +1,4 @@ -var INFO = +var INFO = xml` -; +`; var updater = { "star-button": [ diff --git a/stella.js b/stella.js index 88b7dd1..3df8b75 100644 --- a/stella.js +++ b/stella.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Stella すてら @@ -239,7 +239,7 @@ addLocalMappings( == Link == http://d.hatena.ne.jp/nokturnalmortum/20081213/1229168832 ]]> -; +`; // }}} /* {{{ @@ -366,7 +366,7 @@ Thanks: }, fixFilename: function (filename) { - const badChars = /[\\\/:;*?"<>|]/g; + const badChars = /[\\\/:;*?"`|]/g; return filename.replace(badChars, '_'); }, @@ -2033,7 +2033,7 @@ Thanks: context.process = [ process[0], function (item, text) - (item.thumbnail ? <>{text} + (item.thumbnail ? `{text}` : process[1].apply(this, arguments)) ]; lastCompletions = self.player.relations; diff --git a/stylish.js b/stylish.js index d9a9782..0599dad 100644 --- a/stylish.js +++ b/stylish.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} stylish @@ -11,7 +11,7 @@ var PLUGIN_INFO = public domain -; +`; //}}} (function(){ diff --git a/subscldr.js b/subscldr.js index cfdb2a0..c34523e 100644 --- a/subscldr.js +++ b/subscldr.js @@ -9,7 +9,7 @@ // }}} // // PLUGIN INFO: {{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Adds subscriptions to livedoor Reader/Fastladder in place. @@ -44,7 +44,7 @@ var PLUGIN_INFO = ||< ]]> -; +`; // }}} liberator.plugins.subscldr = (function() { diff --git a/tab-history.js b/tab-history.js index e6d61c3..62f75b7 100644 --- a/tab-history.js +++ b/tab-history.js @@ -1,4 +1,4 @@ -var INFO = +var INFO = xml` Go forward the history

    -    ; +`; var tabHistory = (function(){ const gBrowser = window.gBrowser, diff --git a/tabmixplus.js b/tabmixplus.js index 5251dda..ef3b3de 100644 --- a/tabmixplus.js +++ b/tabmixplus.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} add some tabmixplus commands @@ -22,7 +22,7 @@ lock: lock current tab ]]> -; +`; //}}} (function(){ commands.add(["dup[licate]"], "duplicate current tab", function(args) { diff --git a/tabsort.js b/tabsort.js index 40023e5..4dc0a9c 100644 --- a/tabsort.js +++ b/tabsort.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` tabsort Add ":tabsort" and ":tabuniq" command. @@ -59,7 +59,7 @@ let PLUGIN_INFO = ||< なんかを .vimperatorrc に書いておくと良いよ。 ]]> -; +`; // }}} (function () { diff --git a/tada.js b/tada.js index b1a9cf9..7227c2b 100644 --- a/tada.js +++ b/tada.js @@ -9,7 +9,7 @@ // }}} // PLUGIN INFO: {{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Show ToDo items in commandline buffer. Also add item to your Ta-da list. @@ -100,7 +100,7 @@ var PLUGIN_INFO = - 表示のパフォーマンス改善 ]]> -; +`; // }}} liberator.plugins.tada = (function(){ diff --git a/takahashiPresentation.js b/takahashiPresentation.js index 03f5ff9..304ea38 100644 --- a/takahashiPresentation.js +++ b/takahashiPresentation.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} simple takahashi-method presentation tool @@ -18,7 +18,7 @@ presentation: open HTML file includes 
    ...
    and
    ...
    . start :presentation. ]]> -    ; +`; //}}} (function() { let keys = [ diff --git a/tinymenu.js b/tinymenu.js index ea2cd8e..d25179b 100644 --- a/tinymenu.js +++ b/tinymenu.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Tiny Menu for Vimperator @@ -17,7 +17,7 @@ thx icon id:tnx. :opentinymenu: Open the tiny menu. ]]> -; +`; (function() { if (!liberator.plugins.tinymenu) diff --git a/tinyurl.js b/tinyurl.js index 2a8bc0f..9fc9a89 100644 --- a/tinyurl.js +++ b/tinyurl.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} TinyURL from Vimperator @@ -23,7 +23,7 @@ plugins.tinyurl.getExpand(url): return ExpandURL ]]> -; +`; //}}} (function() { diff --git a/toggler.js b/toggler.js index 0f06ca9..f1057a3 100644 --- a/toggler.js +++ b/toggler.js @@ -91,7 +91,7 @@ var manager = { } }, list: function(name){ - var xml = <>; + var xml = ``; if (name && (name in settings)){ xml += settings[name].list(); } else { diff --git a/tombloo.js b/tombloo.js index 69e91fd..eee068b 100644 --- a/tombloo.js +++ b/tombloo.js @@ -1,4 +1,4 @@ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Tombloo integrate plugin @@ -35,7 +35,7 @@ let PLUGIN_INFO = ツールバーから選択できる Tombloo のメニューを実行します ]]> -; +`; (function () { diff --git a/translaten.js b/translaten.js index 13b5597..7e75dd1 100644 --- a/translaten.js +++ b/translaten.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` translaten 自動一括翻訳 @@ -61,7 +61,7 @@ let PLUGIN_INFO = == Link == http://vimperator.g.hatena.ne.jp/nokturnalmortum/20090104/1231070505 ]]> -; +`; // }}} (function () { diff --git a/twopen.js b/twopen.js index 04637f9..e80987a 100644 --- a/twopen.js +++ b/twopen.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` twopen open pages relative to the twitter id @@ -108,7 +108,7 @@ let PLUGIN_INFO = ]]> -; +`; // }}} (function () { diff --git a/uaSwitchLite.js b/uaSwitchLite.js index 6c98a8c..0262eff 100644 --- a/uaSwitchLite.js +++ b/uaSwitchLite.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` UserAgentSwitcherLite switch user agent @@ -38,7 +38,7 @@ var PLUGIN_INFO = EOM ||< ]]> -; +`; liberator.plugins.UserAgentSwitcherLite = (function(){ diff --git a/umihara.js b/umihara.js index d3ca884..4875e82 100644 --- a/umihara.js +++ b/umihara.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Exchange Converter 外国為替換算 @@ -86,7 +86,7 @@ let PLUGIN_INFO = == Require == _libly.js ]]> -; +`; // }}} (function () { diff --git a/unicode.js b/unicode.js index 1f2a038..0ebb35f 100644 --- a/unicode.js +++ b/unicode.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` {NAME} Copy the escaped-unicode text to the clipboard. @@ -50,7 +50,7 @@ let PLUGIN_INFO = :uc :uc! ]]> -; +`; // }}} (function () { diff --git a/usi.js b/usi.js index 10aee50..c716226 100644 --- a/usi.js +++ b/usi.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml`

    -; +`; // }}} (function () { @@ -496,12 +495,12 @@ let INFO = } let n = new Date().getTime(); Utils.timeArraySort(cs); - let contents = <>; + let contents = ``; for (let [, [d, [a, b]]] in Iterator(cs)) { let hl = (n - d) > 0 ? 'ErrorMsg' : ''; contents += {a}{b}; } - liberator.echo(<>{contents}
    ); + liberator.echo(`{contents}
    `); } } ); diff --git a/uuid.js b/uuid.js index 863c5a3..24b84d1 100644 --- a/uuid.js +++ b/uuid.js @@ -1,5 +1,5 @@ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} UUID generator @@ -17,7 +17,7 @@ uuid: == THANKS == http://moz-addon.g.hatena.ne.jp/ZIGOROu/20080417/1208413079 ]]> -; +`; //}}} (function() { diff --git a/video-controller.js b/video-controller.js index 0368afd..fc4aa62 100644 --- a/video-controller.js +++ b/video-controller.js @@ -34,8 +34,7 @@ THE POSSIBILITY OF SUCH DAMAGE. // PLUGIN_INFO {{{ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} diff --git a/vimp_to_android_phone.js b/vimp_to_android_phone.js index f428f59..c0015fc 100644 --- a/vimp_to_android_phone.js +++ b/vimp_to_android_phone.js @@ -1,4 +1,4 @@ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} Send to your Android Phone @@ -7,7 +7,7 @@ var PLUGIN_INFO = 2.3 2.3 https://github.com/vimpr/vimperator-plugins/raw/master/vimp_to_android_phone.js -; +`; (function() { diff --git a/wassr.js b/wassr.js index 5c027ac..8520450 100644 --- a/wassr.js +++ b/wassr.js @@ -81,13 +81,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + statuses.map(function(status) - <> + ` {status.user.screen_name} {status.user_login_id}‬ - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + sprintf(': %s‬', status.html)) .join("
    "); @@ -126,13 +126,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + statuses.map(function(status) - <> + ` {status.user.screen_name} {status.user_login_id}‬ - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + sprintf(': %s‬', status.html)) .join("
    "); @@ -150,12 +150,12 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " "); for (var n = 0; n < items.length; n++) - html += <> + html += ` {items[n].getElementsByTagName('title')[0].textContent.replace(/>/g, '>').replace(/</g, '<').replace(/^%/, '')}‬ : {items[n].getElementsByTagName('description')[0].textContent.replace(/>/g, '>').replace(/</g, '<')}‬
    - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " "); liberator.echo(html, true); } @@ -198,13 +198,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + todos.map(function(todo) - <> + ` todo {todo.todo_rid} - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + sprintf(': %s', todo.body)) .join("
    "); @@ -223,13 +223,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + footmarks.map(function(footmark) - <> + ` {footmark.nick} {footmark.login_id}‬ - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ")).join("
    "); liberator.echo(html, true); @@ -246,13 +246,13 @@ ]]>.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ") + footmarks.map(function(footmark) - <> + ` {footmark.nick} {footmark.login_id}‬ - .toSource() + `.toSource() .replace(/(?:\r?\n|\r)[ \t]*/g, " ")).join("
    "); liberator.echo(html, true); diff --git a/win-mouse.js b/win-mouse.js index 285b838..89dae08 100644 --- a/win-mouse.js +++ b/win-mouse.js @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { @@ -558,7 +557,7 @@ let INFO = function displayCurrent () { let pos = API.position; let col = API.getPixel(pos); - return liberator.echo(<>[Position] {pos.x}, {pos.y} [Color] {col.r}, {col.g}, {col.b} ({col.name})); + return liberator.echo(`[Position] {pos.x}, {pos.y} [Color] {col.r}, {col.g}, {col.b} ({col.name})`); } commands.addUserCommand( diff --git a/xpath_hint.js b/xpath_hint.js index 754a105..835595a 100644 --- a/xpath_hint.js +++ b/xpath_hint.js @@ -5,7 +5,7 @@ http://www.opensource.jp/licenses/mit-license.html }}} END LICENSE BLOCK ***/ // PLUGIN_INFO//{{{ -var PLUGIN_INFO = +var PLUGIN_INFO = xml` {NAME} add "get element's XPath" hint mode @@ -22,7 +22,7 @@ var PLUGIN_INFO = copy selected element's XPath ]]> -; +`; //}}} (function(){ diff --git a/yetmappings.js b/yetmappings.js index 955bb23..d7ba675 100644 --- a/yetmappings.js +++ b/yetmappings.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Yet Mappings Display the keys that are not mapped yet. @@ -54,7 +54,7 @@ let PLUGIN_INFO = == Links == http://d.hatena.ne.jp/nokturnalmortum/20081109/1226223461 ]]> -; +`; // }}} (function () { diff --git a/zip-de-download.js b/zip-de-download.js index 9e0de28..27aad76 100644 --- a/zip-de-download.js +++ b/zip-de-download.js @@ -1,4 +1,4 @@ -let INFO = +let INFO = xml` -; +`; // FIXME: 将来的には、storageに入れるべき // FIXME: あと、それぞれダウンロード先を指定できた方が良い(?) @@ -320,14 +320,14 @@ let SITE_INFO = [ } if ("-list" in arg){ let [file, urls, comment] = self.download(arg[0], true, option); - let xml = <> + let xml = `

    Download :{file.path}

    {comment}

      {liberator.modules.template.map(urls, function(url)
    1. {url}
      2. )}

    - ; + `; liberator.echo(xml, true); return; } diff --git a/zoom-em-all.js b/zoom-em-all.js index 3479bcc..177cc6a 100644 --- a/zoom-em-all.js +++ b/zoom-em-all.js @@ -33,7 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // PLUGIN_INFO {{{ -let PLUGIN_INFO = +let PLUGIN_INFO = xml` Zoom Em All Zoom Em All @@ -52,11 +52,10 @@ let PLUGIN_INFO = -; +`; // }}} // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} (function () { diff --git "a/\350\267\263.js" "b/\350\267\263.js" index ef89be4..a6d351e 100644 --- "a/\350\267\263.js" +++ "b/\350\267\263.js" @@ -33,8 +33,7 @@ THE POSSIBILITY OF SUCH DAMAGE. }}} */ // INFO {{{ -let INFO = -<> +let INFO = xml` -; +`; // }}} -- cgit v1.2.3 From 862198772d1b50822d888bae4d13d3ee8aa69740 Mon Sep 17 00:00:00 2001 From: anekos Date: Sat, 6 Apr 2013 18:18:33 +0900 Subject: ﾐｮｸｽ --- auto-bookmark.js | 35 ++++++++++++++++------------------- erection.js | 4 ++-- google-tasks.js | 8 ++++---- migemized_find.js | 2 +- mpd-currentsong.js | 4 ++-- readitlater.js | 34 +++++++++++++++++----------------- statusbar_panel.js | 7 +++---- stella.js | 10 +++++----- umihara.js | 2 +- zip-de-download.js | 4 ++-- 10 files changed, 53 insertions(+), 57 deletions(-) diff --git a/auto-bookmark.js b/auto-bookmark.js index 7da83ef..96ed9dc 100644 --- a/auto-bookmark.js +++ b/auto-bookmark.js @@ -350,18 +350,15 @@ let INFO = xml` 'autobookmark', 'Auto bookmarking', function () { + function block ([name, data]) { + return xml` +
    ${name}
    +
    ${data.current.title} ${data.current.URL} (${def(data, 'scroll.x', '?')}, ${def(data, 'scroll.y', '?')}) (${def(data, 'pages.length', '?')})
    + `; + } + liberator.echo( -
    { - template.map( - bookmarks, - function ([name, data]) { - return ` -
    {name}
    -
    {data.current.title} {data.current.URL} ({def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}) ({def(data, 'pages.length', '?')})
    - `; - } - ) - }
    + xml`
    ${template.map(bookmarks, block)}
    ` ); }, { @@ -446,21 +443,21 @@ let INFO = xml` let name = args.literalArg; let data = bookmarks.get(name); if (data) { - liberator.echo(` + liberator.echo(xml`
    Name
    -
    {name}
    +
    ${name}
    Start URL
    -
    {data.start.URL}
    +
    {data.start.URL}
    Current Title
    -
    {data.current.Title}
    +
    ${data.current.Title}
    Current URL
    -
    {data.current.URL}
    +
    {data.current.URL}
    Current Position
    -
    {def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}
    +
    ${def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}
    Pages
    -
    { - template.map(data.pages, function (it) (
  • {it.URL}
    • )) +
    ${ + template.map(data.pages, function (it) (`
  • ${it.URL}
    • `)) }
    `); diff --git a/erection.js b/erection.js index 23dcd3e..b78182c 100644 --- a/erection.js +++ b/erection.js @@ -79,7 +79,7 @@ let INFO = xml` (function () { - const VERSION = INFO.@version[0]; + const VERSION = '1.1.1'; function erect (callback) { const VC = @@ -225,7 +225,7 @@ let INFO = xml` ['s[how]'], 'Show text and image', makeErectionCommand(function (e) { - liberator.echo(` + liberator.echo(xml`

    {e.text}

    diff --git a/google-tasks.js b/google-tasks.js index a724043..7da89a4 100644 --- a/google-tasks.js +++ b/google-tasks.js @@ -43,17 +43,17 @@ function setup() { access_token = getAccessToken(); let url = rest_uri + '/users/@me/lists?oauth_token=' + access_token; let lists = JSON.parse(httpGet(url).responseText).items; - let tbody = ``; + let tbody = xml``; for (let i=0; i{tasks[i2].title}` : `☐{tasks[i2].title}`; - tbody += {lists[i].title}{taskTitle}; + let taskTitle = (tasks[i2].status == 'completed') ? xml`☑${tasks[i2].title}` : `☐${tasks[i2].title}`; + tbody += xml`${lists[i].title}${taskTitle}`; } } - liberator.echo(`{tbody}
    `); + liberator.echo(xml`{tbody}
    `); }, { subCommands: [ diff --git a/migemized_find.js b/migemized_find.js index 2f27b85..22a738e 100644 --- a/migemized_find.js +++ b/migemized_find.js @@ -255,7 +255,7 @@ let INFO = xml` } let colorsCompltions = [ - [name, {'\u25a0 ' + value}] + [name, xml`${'\u25a0 ' + value}`] for each ([name, value] in Iterator(colors)) ]; diff --git a/mpd-currentsong.js b/mpd-currentsong.js index 829ff1e..f852b9a 100644 --- a/mpd-currentsong.js +++ b/mpd-currentsong.js @@ -44,7 +44,7 @@ let INFO = xml`

    @@ -58,7 +58,7 @@ let INFO = xml`

    diff --git a/readitlater.js b/readitlater.js index 53828b7..74f1453 100644 --- a/readitlater.js +++ b/readitlater.js @@ -412,18 +412,18 @@ let PLUGIN_INFO = xml` req.addEventListener("success",function(data){ let res = libly.$U.evalJson(data.responseText); - liberator.echo( + liberator.echo(xml` + -
    #ReadItLater Stats
    + -
    - since : {unixtimeToDate(res.user_since)}
    - list : {res.count_list}
    - unread : {res.count_unread}
    - read : {res.count_read}
    + ]]>` + + xml`
    #ReadItLater Stats
    ` + + xml`
    + since : ${unixtimeToDate(res.user_since)}
    + list : ${res.count_list}
    + unread : ${res.count_unread}
    + read : ${res.count_read}
    - ); + `); }); req.addEventListener("failure",function(data){ @@ -452,17 +452,17 @@ let PLUGIN_INFO = xml` ); req.addEventListener("success",function(data){ - liberator.echo( + liberator.echo(xml`
    - X-Limit-User-Limit : {data.transport.getResponseHeader("X-Limit-User-Limit")}
    - X-Limit-User-Remaining : {data.transport.getResponseHeader("X-Limit-User-Remaining")}
    - X-Limit-User-Reset : {data.transport.getResponseHeader("X-Limit-User-Reset")}
    - X-Limit-Key-Limit : {data.transport.getResponseHeader("X-Limit-Key-Limit")}
    - X-Limit-Key-Remaining : {data.transport.getResponseHeader("X-Limit-Key-Remaining")}
    - X-Limit-Key-Reset : {data.transport.getResponseHeader("X-Limit-Key-Reset")}
    + X-Limit-User-Limit : ${data.transport.getResponseHeader("X-Limit-User-Limit")}
    + X-Limit-User-Remaining : ${data.transport.getResponseHeader("X-Limit-User-Remaining")}
    + X-Limit-User-Reset : ${data.transport.getResponseHeader("X-Limit-User-Reset")}
    + X-Limit-Key-Limit : ${data.transport.getResponseHeader("X-Limit-Key-Limit")}
    + X-Limit-Key-Remaining : ${data.transport.getResponseHeader("X-Limit-Key-Remaining")}
    + X-Limit-Key-Reset : ${data.transport.getResponseHeader("X-Limit-Key-Reset")}
    - ); + `); }); req.addEventListener("failure",function(data){ diff --git a/statusbar_panel.js b/statusbar_panel.js index 156fd7f..fe2a52b 100644 --- a/statusbar_panel.js +++ b/statusbar_panel.js @@ -52,15 +52,14 @@ function getImages(panel) { } function makeIcon(panel) { - var icon = ; + var icon = xml``; 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.@style = 'list-style-image: url("' + src + '");' + - '-moz-image-region: ' + style.MozImageRegion; + icon.setAttribute('style','list-style-image: url("' + src + '");' + '-moz-image-region: ' + style.MozImageRegion); } } return icon; @@ -140,7 +139,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 `{item.icon ? item.icon : ``}{text}` + return xml`{item.icon ? item.icon : ``}{text}` }]; var list = generateStatusbarpaneIDlList(arg); diff --git a/stella.js b/stella.js index 3df8b75..425b839 100644 --- a/stella.js +++ b/stella.js @@ -956,7 +956,7 @@ Thanks: [ 'tags', XMLList([ - [{v.textContent}] + xml`[${v.textContent}]` for ([, v] in Iterator(doc.querySelectorAll('#eow-tags > li > a'))) ].join('')) ], @@ -1112,7 +1112,7 @@ Thanks: [ 'tags', XMLList([ - [{v.textContent}] + xml`[${v.textContent}]` for ([, v] in Iterator(doc.querySelectorAll('#eow-tags > li > a'))) ].join('')) ], @@ -1339,12 +1339,12 @@ Thanks: get pageinfo () { let v = content.wrappedJSObject.Video; return [ - ['thumbnail', ], + ['thumbnail', xml``], ['comment', U.toXML(v.description)], [ 'tag', [ - [{t}] + xml`[${t}]` for each (t in Array.slice(v.tags)) ].join('') ] @@ -2054,7 +2054,7 @@ Thanks: function (verbose) (self.isValid && self.player.has('pageinfo', 'r') ? [ - [n,
    {modules.template.maybeXML(v)}
    ] + [n, xml`
    ${modules.template.maybeXML(v)}
    `] for each ([n, v] in self.player.pageinfo) ] : []) diff --git a/umihara.js b/umihara.js index 4875e82..075fa90 100644 --- a/umihara.js +++ b/umihara.js @@ -137,7 +137,7 @@ let PLUGIN_INFO = xml` ]; function echo (msg) { - liberator.echo(
    {msg}
    ); + liberator.echo(xml`
    ${msg}
    `); } function kawase (value, clipboard, from, to) { diff --git a/zip-de-download.js b/zip-de-download.js index 27aad76..a6d8a97 100644 --- a/zip-de-download.js +++ b/zip-de-download.js @@ -6,7 +6,7 @@ let INFO = xml` teramako MIT -

    +

    特定ページの画像とかのURLを取ってきて一気にZIPにしてダウンロードするお

    -- cgit v1.2.3 From e315a55b7a090e112bfa75177a120064be558efa Mon Sep 17 00:00:00 2001 From: fifnel Date: Sun, 7 Apr 2013 09:19:52 +0900 Subject: fix E4X for vimperator 3.6+ --- statusline-toolbar.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/statusline-toolbar.js b/statusline-toolbar.js index 069ef69..a5b4ce7 100644 --- a/statusline-toolbar.js +++ b/statusline-toolbar.js @@ -39,7 +39,8 @@ var updater = { } ], }; -var css = .toString() + +]]>`.toString() + ({ - WINNT: , - Linux: , - Darwin: `, + Linux: xml``, + Darwin: xml` + ]]>` })[Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS].toString(); function $(id) document.getElementById(id); -- cgit v1.2.3 From 27808e83be05aac27880d2e06bd8d593f4961a94 Mon Sep 17 00:00:00 2001 From: anekos Date: Sun, 7 Apr 2013 12:09:59 +0900 Subject: Fix いいいぃいぃぃぃぃいぃぃふぉおおおおおおうううううえっっっっっっくす！！！ --- memo.js | 16 ++++++++-------- twittperator.js | 6 +++--- twittperator/twsidebar.tw | 29 ++++++++++++++--------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/memo.js b/memo.js index ef94ad0..53f19c1 100644 --- a/memo.js +++ b/memo.js @@ -122,9 +122,9 @@ let PLUGIN_INFO = xml` if (arg.literalArg) { puts(arg.literalArg); } else { - let out = ``; + let out = xml``; gets().split(/\n/).reverse().forEach(function (l) { - out +=
  • {l}
    • + out += xml`
  • ${l}
    • `; }); liberator.echo(out); } @@ -142,16 +142,16 @@ let PLUGIN_INFO = xml` let desc = item[1] || this.process[1].call(this, item, item.description); if (item.description && item.description.length) { - return
    + return xml`
  • - {item.description} + ${item.description}
    • -
    ; +
    `; } - return
    -
  • {item[0]} 
    • -
    ; + return xml`
    +
  • ${item[0]} 
    • +
    `; }; context.filters = [function (item) this.match(item.description)]; diff --git a/twittperator.js b/twittperator.js index 604503c..40bc733 100644 --- a/twittperator.js +++ b/twittperator.js @@ -1707,9 +1707,9 @@ let INFO = xml` let center = m[0]; let [head, tail] = [center[0], center.slice(1)]; let right = str.substring(m.index + m[0].length); - let content = head === "@" ? ` ${center} ` - : ` ${center} `; - return `${Utils.anchorLink(left)}${content}${Utils.anchorLink(right)}`; + let content = head === "@" ? xml` ${center} ` + : xml` ${center} `; + return xml`${Utils.anchorLink(left)}${content}${Utils.anchorLink(right)}`; } return str; }, // }}} diff --git a/twittperator/twsidebar.tw b/twittperator/twsidebar.tw index ee8ba3b..191fc13 100644 --- a/twittperator/twsidebar.tw +++ b/twittperator/twsidebar.tw @@ -84,7 +84,7 @@ liberator.modules.TWAnekoSB = ANekoSB = (function () { str = str.trim(); let reg = /https?:\/\/[^\s]+|[#@]\w+/g; XML.ignoreWhitespace = false; - let m, i = 0, buf = "", x = ; + let m, i = 0, buf = "", x = xml``; while((m=reg.exec(str))){ buf = str.substring(i, m.index); if (buf) @@ -103,8 +103,7 @@ liberator.modules.TWAnekoSB = ANekoSB = (function () { klass += " twlist-url"; href = m[0]; } - x.appendChild({m[0]}); + x.appendChild(xml`${m[0]}`); i=reg.lastIndex; } buf = str.substr(i); @@ -128,32 +127,32 @@ liberator.modules.TWAnekoSB = ANekoSB = (function () { let richlistitemClasses = [className('tweet-panel'), className('tweet-' + t.type)]; let nameClass = className('item-name') + ' ' + (t.protected ? className('tweet-protected') : ''); xml = - 70 ? 2 : 0)), "width: " + px(sbWidth - 100) + ' !important' ].join(';')} xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - + - - - {escapeBreakers(t.text)} + ${escapeBreakers(t.text)} - - + + - ; + `; return xml; } -- cgit v1.2.3 From 8eb425bbdb21e37603603db84d444c90a2d30fb5 Mon Sep 17 00:00:00 2001 From: retlet Date: Tue, 9 Apr 2013 03:27:44 +0900 Subject: xml`` の囲み漏れ --- pino.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pino.js b/pino.js index f0de3df..877ec98 100644 --- a/pino.js +++ b/pino.js @@ -159,13 +159,13 @@ let self = liberator.plugins.pino = (function() { if (args["-list"]) { //let items = pins.items(); - let list =
    {items.length} items. + let list = xml`
    {items.length} items.
      { [
    • {i.title}
      • for each (i in items) ].reduce(function(a, b) a + b) }
    -
    ; +
    `; liberator.echo(list, commandline.FORCE_MULTILINE); return; } -- cgit v1.2.3