fix: twittperator.js

1 files 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`
   <plugin name="Twittperator" version="1.19.0"
           href="https://github.com/vimpr/vimperator-plugins/raw/master/twittperator.js"
           summary="Twitter Client using OAuth and Streaming API">
@@ -333,7 +332,7 @@ let INFO =
         プラグイン書きましょう。
     </p>
   </plugin>
-</>;
+`;
 
 // }}}
 
@@ -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 === "@" ? <a highlight="URL" href={setting.showTLURLScheme + "://twitter.com/" + tail}> {center} </a>
-                                   : <a highlight="URL" href={center}> {center} </a>;
-        return <>{Utils.anchorLink(left)}{content}{Utils.anchorLink(right)}</>;
+        let content = head === "@" ? `<a highlight="URL" href=${setting.showTLURLScheme + "://twitter.com/" + tail}> ${center} </a>`
+                                   : `<a highlight="URL" href=${center}> ${center} </a>`;
+        return `${Utils.anchorLink(left)}${content}${Utils.anchorLink(right)}`;
       }
       return str;
     }, // }}}
@@ -1783,7 +1782,7 @@ let INFO =
         {},
         function(json) {
           function idToIcon (id) {
-            return <span><a href={'http://twitter.com/#!/' + id}>{icons[id] ? <img src={icons[id]}/> : <>&#128568;</>}</a></span>;
+            return `<span><a href=${'http://twitter.com/#!/' + id}>${icons[id] ? `<img src=${icons[id]}/>` : "&#128568;"}</a></span>`;
           }
 
           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`
             <dl>
-              <dt>Retweeter {json.retweeters_count}</dt>
-              <dd>{template.map(json.retweeters, idToIcon)}</dd>
-              <dt>Favoriters {json.favoriters_count}</dt>
-              <dd>{template.map(json.favoriters, idToIcon)}</dd>
+              <dt>Retweeter ${json.retweeters_count}</dt>
+              <dd>${template.map(json.retweeters, idToIcon)}</dd>
+              <dt>Favoriters ${json.favoriters_count}</dt>
+              <dd>${template.map(json.favoriters, idToIcon)}</dd>
             </dl>
-          </>);
+          `);
         }
       );
     }, // }}}
@@ -1874,36 +1873,35 @@ let INFO =
     lookupUser: function(users) { // {{{
       function showUsersInfo(json) { // {{{
         let xml = modules.template.map(json, function(user) {
-          return <>
+          return xml`
             <tr>
               <td class="twittperator lookup-user photo">
-                <img src={user.profile_image_url} />
+                <img src=${user.profile_image_url} />
               </td>
               <td class="twittperator lookup-user screen-name">
-                <a href={"https://twitter.com/#!/" + user.screen_name}>
-                  {user.name}
+                <a href=${"https://twitter.com/#!/" + user.screen_name}>
+                  ${user.name}
                 </a>
               </td>
               <td class="twittperator lookup-user attributes">
-                {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()}
               </td>
             </tr>
             <tr>
               <td class="twittperator lookup-user description" colspan="3">
-                {user.description}
+                ${user.description}
               </td>
             </tr>
-          </>;
+          `;
         });
-        liberator.echo(
-          <>
+        liberator.echo(xml`
             <style type="text/css"><![CDATA[
               .twittperator.lookup-user.photo { vertical-align: top; width: 28px; }
               .twittperator.lookup-user.photo img { border: 0px; width: 24px; height: 24px; vertical-align: baseline; margin: 1px; }
@@ -1911,9 +1909,8 @@ let INFO =
               .twittperator.lookup-user.description { white-space: normal !important; }
               .twittperator.lookup-user.description a { text-decoration: none; }
             ]]></style>
-            <table>{xml}</table>
-          </>
-        );
+            <table>${xml}</table>
+        `);
       } // }}}
 
       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 = <style type="text/css"><![CDATA[
+      let html = `<style type="text/css"><![CDATA[
           .twittperator.timeline.user { vertical-align: top; }
           .twittperator.timeline.entry-content { white-space: normal !important; }
           .twittperator.timeline.entry-content a { text-decoration: none; }
           .twittperator.timeline.entry-content.rt:before { content: "RT "; color: silver; }
           img.twittperator.timeline.photo { border: 0px; width: 24px; height: 24px; vertical-align: baseline; margin: 1px; }
-      ]]></style>.toSource()
-                 .replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") +
+      ]]></style>`
+          .replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") +
+          '<table>' +
           s.reduce(function(table, status) {
-            return table.appendChild(
-              ("retweeted_status" in status) ?
-              let (rt = status.retweeted_status)
-              <tr>
+            if ("retweeted_status" in status) {
+              let rt = status.retweeted_status;
+              return table + xml`<tr>
                 <td class="twittperator timeline user">
-                  <a href={userURL(rt.user.screen_name)}>
-                    <img src={rt.user.profile_image_url} alt={rt.user.screen_name} class="twittperator timeline photo"/>
-                    <strong>{rt.user.screen_name}&#x202C;</strong>
+                  <a href=${userURL(rt.user.screen_name)}>
+                    <img src=${rt.user.profile_image_url} alt=${rt.user.screen_name} class="twittperator timeline photo"/>
+                    <strong>${rt.user.screen_name}&#x202C;</strong>
                   </a>
-                  <a href={userURL(status.user.screen_name)}>
-                    <img src={status.user.profile_image_url} alt={status.user.screen_name} class="twittperator timeline photo"/>
+                  <a href=${userURL(status.user.screen_name)}>
+                    <img src=${status.user.profile_image_url} alt=${status.user.screen_name} class="twittperator timeline photo"/>
                   </a>
                 </td>
                 <td class="twittperator timeline entry-content rt">
-                  {Utils.anchorLink(rt.text)}
+                  ${Utils.anchorLink(rt.text)}
                 </td>
                 <td class="twittperator timeline menu">
-                  <a href="javascript: void 0" onclick={menuEvent(status)}>
-                   &#1758;
-                  </a>
+                  <a href="javascript: void 0" onclick=${menuEvent(status)}>&#1758;</a>
                 </td>
-              </tr> :
-              <tr>
+              </tr>`.toString();
+            } else {
+              return table + xml`<tr>
                 <td class="twittperator timeline user">
-                  <a href={userURL(status.user.screen_name)}>
-                    <img src={status.user.profile_image_url} alt={status.user.screen_name} class="twittperator timeline photo"/>
-                    <strong title={status.user.name}>{status.user.screen_name}&#x202C;</strong>
+                  <a href=${userURL(status.user.screen_name)}>
+                    <img src=${status.user.profile_image_url} alt=${status.user.screen_name} class="twittperator timeline photo"/>
+                    <strong title=${status.user.name}>${status.user.screen_name}&#x202C;</strong>
                   </a>
                 </td>
                 <td class="twittperator timeline entry-content">
-                  {Utils.anchorLink(status.text)}
+                  ${Utils.anchorLink(status.text)}
                 </td>
                 <td class="twittperator timeline menu">
-                  <a href="javascript: void 0" onclick={menuEvent(status)}>
-                   &#1758;
-                  </a>
+                  <a href="javascript: void 0" onclick=${menuEvent(status)}>&#1758;</a>
                 </td>
-              </tr>
-              );
-
-          }, <table/>)
-            .toSource().replace(/(?:\r\n|[\r\n])[ \t]*/g, " ");
+              </tr>`.toString();
+            }
+          }, "").replace(/(?:\r\n|[\r\n])[ \t]*/g, " ") +
+          '</table>';
 
-      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 <div highlight="CompTitle" style="white-space: nowrap">
-              <li highlight="CompDesc">{item}&#160;</li>
-          </div>;
+          return xml`<div highlight="CompTitle" style="white-space: nowrap">
+              <li highlight="CompDesc">${item}&#160;</li>
+          </div>`;
         }
 
         let [value, st] = item.item;
         if (st.user) {
-          return <div highlight="CompItem" style="white-space: nowrap">
+          return xml`<div highlight="CompItem" style="white-space: nowrap">
               <li highlight="CompDesc">
-                <img src={st.user.profile_image_url} style="max-width: 24px; max-height: 24px"/>
-                &#160;{st.user.screen_name}: {st.text}
+                <img src=${st.user.profile_image_url} style="max-width: 24px; max-height: 24px"/>
+                &#160;${st.user.screen_name}: ${st.text}
               </li>
-          </div>;
+          </div>`;
         } else {
-          return <div highlight="CompItem" style="white-space: nowrap">
+          return xml`<div highlight="CompItem" style="white-space: nowrap">
               <li highlight="CompDesc">
-                {st.text}
+                ${st.text}
               </li>
-          </div>;
+          </div>`;
         }
       };
 
@@ -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 += <><dt>{n}</dt><dd>{cont}</dd></>;
+            items += `<dt>${n}</dt><dd>${cont}</dd>`;
           }
 
-          return <dl>{items}</dl>;
+          return `<dl>${items}</dl>`;
         }
 
         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)