ﾐｮｸｽ

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`
+          <dt style="font-weight: bold">${name}</dt>
+          <dd>${data.current.title} <a href=${data.current.URL}> ${data.current.URL} </a> (${def(data, 'scroll.x', '?')}, ${def(data, 'scroll.y', '?')}) (${def(data, 'pages.length', '?')})</dd>
+        `;
+      }
+
       liberator.echo(
-        <dl>{
-          template.map(
-            bookmarks,
-            function ([name, data]) {
-              return `
-                <dt style="font-weight: bold">{name}</dt>
-                <dd>{data.current.title} <a href={data.current.URL}> {data.current.URL} </a> ({def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}) ({def(data, 'pages.length', '?')})</dd>
-              `;
-            }
-          )
-        }</dl>
+        xml`<dl>${template.map(bookmarks, block)}</dl>`
       );
     },
     {
@@ -446,21 +443,21 @@ let INFO = xml`
             let name = args.literalArg;
             let data = bookmarks.get(name);
             if (data) {
-              liberator.echo(`
+              liberator.echo(xml`
                 <dl>
                   <dt>Name</dt>
-                  <dd>{name}</dd>
+                  <dd>${name}</dd>
                   <dt>Start URL</dt>
-                  <dd><a href={data.start.URL}>{data.start.URL}</a></dd>
+                  <dd><a href=${data.start.URL}>{data.start.URL}</a></dd>
                   <dt>Current Title</dt>
-                  <dd>{data.current.Title}</dd>
+                  <dd>${data.current.Title}</dd>
                   <dt>Current URL</dt>
-                  <dd><a href={data.current.URL}>{data.current.URL}</a></dd>
+                  <dd><a href=${data.current.URL}>{data.current.URL}</a></dd>
                   <dt>Current Position</dt>
-                  <dd>{def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}</dd>
+                  <dd>${def(data, 'scroll.x', '?')}, {def(data, 'scroll.y', '?')}</dd>
                   <dt>Pages</dt>
-                  <dd>{
-                    template.map(data.pages, function (it) (<li>{it.URL}</li>))
+                  <dd>${
+                    template.map(data.pages, function (it) (`<li>${it.URL}</li>`))
                   }</dd>
                 </dl>
               `);
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`
               <div style="height: 800px">
                 <h1>{e.text}</h1>
                 <img src={e.imageURL} />
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<lists.length; i++) {
         let url = rest_uri + '/lists/' + lists[i].id + '/tasks?oauth_token=' + access_token;
         let tasks = JSON.parse(httpGet(url).responseText).items;
         if (!tasks) { continue; } //空っぽのリストは飛ばす
         for (let i2=0; i2<tasks.length; i2++) {
-          let taskTitle = (tasks[i2].status == 'completed') ? `&#x2611;<del>{tasks[i2].title}</del>`  : `&#x2610;{tasks[i2].title}`;
-          tbody += <tr style="border-bottom: 1px dotted;"><td style="width: 20%">{lists[i].title}</td><td>{taskTitle}</td></tr>;
+          let taskTitle = (tasks[i2].status == 'completed') ? xml`&#x2611;<del>${tasks[i2].title}</del>`  : `&#x2610;${tasks[i2].title}`;
+          tbody += xml`<tr style="border-bottom: 1px dotted;"><td style="width: 20%">${lists[i].title}</td><td>${taskTitle}</td></tr>`;
         }
       }
-      liberator.echo(`<table style="width: 100%; line-height: 1.6; border-collapse: collapse; border-top: 1px solid;">{tbody}</table>`);
+      liberator.echo(xml`<table style="width: 100%; line-height: 1.6; border-collapse: collapse; border-top: 1px solid;">{tbody}</table>`);
     },
     {
       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, <span style={'color: ' + name}>{'\u25a0 ' + value}</span>]
+    [name, xml`<span style=${'color: ' + name}>${'\u25a0 ' + value}</span>`]
     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`
     <project name="Vimperator" minVersion="3.0"/>
     <p>
       <code><![CDATA[
-:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) `{song.Title} / {song.Artist} #NowPlaying`
+:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) xml\`\${song.Title} / \${song.Artist} #NowPlaying\`
       ]]> </code>
     </p>
   </plugin>
@@ -58,7 +58,7 @@ let INFO = xml`
     <project name="Vimperator" minVersion="3.0"/>
     <p>
       <code><![CDATA[
-:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) `{song.Title} / {song.Artist} #NowPlaying`
+:cabbrev -javascript .song let (song = plugins.mpdCurrentsong.API.getSongInfo()) xml\`\${song.Title} / \${song.Artist} #NowPlaying\`
       ]]> </code>
     </p>
   </plugin>
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`
 			<style type="text/css"><![CDATA[
 				div.stats{font-weight:bold;text-decoration:underline;color:gold;padding-left:1em;line-height:1.5em;}
-			]]></style> +
-			<div>#ReadItLater Stats</div> +
-			<div class="stats">
-				since : {unixtimeToDate(res.user_since)} <br />
-				list : {res.count_list} <br />
-				unread : {res.count_unread} <br />
-				read : {res.count_read} <br />
+			]]></style>` +
+			xml`<div>#ReadItLater Stats</div>` +
+			xml`<div class="stats">
+				since : ${unixtimeToDate(res.user_since)} <br />
+				list : ${res.count_list} <br />
+				unread : ${res.count_unread} <br />
+				read : ${res.count_read} <br />
 			</div>
-			);
+			`);
 		});
 
 		req.addEventListener("failure",function(data){
@@ -452,17 +452,17 @@ let PLUGIN_INFO = xml`
 		);
 
 		req.addEventListener("success",function(data){
-			liberator.echo(
+			liberator.echo(xml`
 			<div>
-				X-Limit-User-Limit : {data.transport.getResponseHeader("X-Limit-User-Limit")} <br />
-				X-Limit-User-Remaining : {data.transport.getResponseHeader("X-Limit-User-Remaining")} <br />
-				X-Limit-User-Reset : {data.transport.getResponseHeader("X-Limit-User-Reset")} <br />
-				X-Limit-Key-Limit : {data.transport.getResponseHeader("X-Limit-Key-Limit")} <br />
-				X-Limit-Key-Remaining : {data.transport.getResponseHeader("X-Limit-Key-Remaining")} <br />
-				X-Limit-Key-Reset : {data.transport.getResponseHeader("X-Limit-Key-Reset")} <br />
+				X-Limit-User-Limit : ${data.transport.getResponseHeader("X-Limit-User-Limit")} <br />
+				X-Limit-User-Remaining : ${data.transport.getResponseHeader("X-Limit-User-Remaining")} <br />
+				X-Limit-User-Reset : ${data.transport.getResponseHeader("X-Limit-User-Reset")} <br />
+				X-Limit-Key-Limit : ${data.transport.getResponseHeader("X-Limit-Key-Limit")} <br />
+				X-Limit-Key-Remaining : ${data.transport.getResponseHeader("X-Limit-Key-Remaining")} <br />
+				X-Limit-Key-Reset : ${data.transport.getResponseHeader("X-Limit-Key-Reset")} <br />
 
 			</div>
-			);
+			`);
 		});
 
 		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 = <image xmlns={XUL.uri}/>;
+    var icon = xml`<image xmlns=${XUL.uri}/>`;
     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 `<span highlight="CompIcon">{item.icon ? item.icon : ``}</span><span class="td-strut"/>{text}`
+                return xml`<span highlight="CompIcon">{item.icon ? item.icon : ``}</span><span class="td-strut"/>{text}`
             }];
 
             var list = generateStatusbarpaneIDlList(arg);
diff --git a/stella.js b/stella.js
index 3df8b75..425b839 100644
--- a/stella.js
+++ b/stella.js
@@ -956,7 +956,7 @@ Thanks:
         [
           'tags',
           XMLList([
-            <span>[<a href={v.href}>{v.textContent}</a>]</span>
+            xml`<span>[<a href=${v.href}>${v.textContent}</a>]</span>`
             for ([, v] in Iterator(doc.querySelectorAll('#eow-tags > li > a')))
           ].join(''))
         ],
@@ -1112,7 +1112,7 @@ Thanks:
         [
           'tags',
           XMLList([
-            <span>[<a href={v.href}>{v.textContent}</a>]</span>
+            xml`<span>[<a href=${v.href}>${v.textContent}</a>]</span>`
             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', <img src={v.thumbnail} />],
+        ['thumbnail', xml`<img src=${v.thumbnail} />`],
         ['comment', U.toXML(v.description)],
         [
           'tag',
           [
-            <span>[<a href={this.makeURL(t, Player.URL_TAG)}>{t}</a>]</span>
+            xml`<span>[<a href=${this.makeURL(t, Player.URL_TAG)}>${t}</a>]</span>`
             for each (t in Array.slice(v.tags))
           ].join('')
         ]
@@ -2054,7 +2054,7 @@ Thanks:
         function (verbose)
           (self.isValid && self.player.has('pageinfo', 'r')
             ? [
-                [n, <div style="white-space: normal">{modules.template.maybeXML(v)}</div>]
+                [n, xml`<div style="white-space: normal">${modules.template.maybeXML(v)}</div>`]
                 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(<pre>{msg}</pre>);
+    liberator.echo(xml`<pre>${msg}</pre>`);
   }
 
   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`
   <author email="teramako@gmail.com">teramako</author>
   <license href="http://opensource.org/licenses/mit-license.php">MIT</license>
   <project name="Vimperator" minVersion="2.3"/>
-  <p xmlns={XHTML}>
+  <p xmlns=${XHTML}>
     特定ページの画像とかのURLを取ってきて一気にZIPにしてダウンロードするお
     <code style='font-family: sans-serif !important;'><![CDATA[
 　　　　　　　　　　　　 ／）
@@ -17,7 +17,7 @@ let INFO = xml`
 　　　　／　 　,i　　　,二ﾆ⊃（ ●）.　（●）＼
 　　　/　 　　ﾉ　　　 ilﾞフ::::::⌒（__人__）⌒::::: ＼
 　　　　　　,ｲ｢ﾄ､　　,!,!|　　　　　|r┬-|　　　　　|
-　　　　　/　iﾄヾヽ_/ｨ"＼ 　　 　 `ー'´ 　 　 ／
+　　　　　/　iﾄヾヽ_/ｨ"＼ 　　 　 \`ー'´ 　 　 ／
     ]]></code>
   </p>
   <item>