From e6caec107ce1325ea5866c10d9f7000e75608180 Mon Sep 17 00:00:00 2001 From: wlt_lain Date: Tue, 16 Apr 2013 22:47:07 -0700 Subject: fix #40 drop E4X sbmcommentsviewer.js --- sbmcommentsviewer.js | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'sbmcommentsviewer.js') diff --git a/sbmcommentsviewer.js b/sbmcommentsviewer.js index fb9c647..a049432 100644 --- a/sbmcommentsviewer.js +++ b/sbmcommentsviewer.js @@ -12,7 +12,7 @@ var PLUGIN_INFO = xml` viewSBMComments [url] [options] url : 省略時は現在のURL options: - -f, -format : 出力時のフォーマット(`,'区切りのリスト) + -f, -format : 出力時のフォーマット(${'`'},'区切りのリスト) (default: id,timestamp,tags,comment) let g:def_sbm_format = ... で指定可能 -t, -type : 出力するSBMタイプ @@ -74,27 +74,28 @@ SBMContainer.prototype = { //{{{ )); }, toHTML: function(format, countOnly){ - var label = ` - {this.faviconURL ? : ``} - {manager.type[this.type] + ' ' + this.count + '(' + this.entries.length + ')'} - {this.pageURL ? {this.pageURL} : ``} + var label = xml` + ${this.faviconURL ? xml`` : ``} + ${manager.type[this.type] + ' ' + this.count + '(' + this.entries.length + ')'} + ${this.pageURL ? xml`${this.pageURL}` : ``} `; if (countOnly){ return label; } else { - let xml =
-
  • {label}
  • -
    ; + let html = xml``; let self = this; - xml.* += (function(){ - var div = ``; + html = xml`${html}${(function(){ + var div = xml``; self.entries.forEach(function(e){ if (isFilterNoComments && !e.comment) return; - div += e.toHTML(format); + div = xml`${div}${e.toHTML(format)}`; }); return div; - })(); - return xml; + })()}`; + html = xml`
    +
  • ${label}
  • + ${html}
    `; + return html; } } }; //}}} @@ -125,39 +126,40 @@ SBMEntry.prototype = { //{{{ toHTML: function(format){ function makeLink(str, withLink){ let s = str; - let result = XMLList(); + let result = xml``; while (s.length > 0) { let m = s.match(/(?:https?:\/\/|mailto:)\S+/); if (m) { - result += `{s.slice(0, m.index)}{m[0]}`; + result = xml`${result}${s.slice(0, m.index)}${m[0]}`; s = s.slice(m.index + m[0].length); } else { - result += `{s}`; + result = xml`${result}${s}`; break; } } return result; } - var xml =
    ; + var entry = xml``; var self = this; format.forEach(function(colum){ switch(colum){ case 'id': - xml.* += {self.userIcon ? `{self.id}` : `{self.id}`}; + entry = xml`${entry}${self.userIcon ? xml`${self.id}` : `${self.id}`}`; break; case 'timestamp': - xml.* += {self.formatDate()}; + entry = xml`${entry}${self.formatDate()}`; break; case 'tags': - xml.* += {self.tags.join(',')}; break; + entry = xml`${entry}${self.tags.join(',')}`; break; case 'comment': - xml.* += {makeLink(self.comment)}; break; + entry = xml`${entry}${makeLink(self.comment)}`; break; default: - xml.* += -; + entry = xml`${entry}-`; } }); - return xml; + entry = xml`
    ${entry}
    `; + return entry; }, formatDate: function(){ if (!this.timeStamp) return ''; -- cgit v1.2.3