From 443857dffe946e93865bfd36bef4001203df2a39 Mon Sep 17 00:00:00 2001 From: drry Date: Mon, 3 Nov 2008 15:58:50 +0000 Subject: * cosmetic changes. git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@22654 d0d07461-0603-4401-acd4-de1884942a52 --- auto_detect_link.js | 20 ++++++---------- bookmarktoolbar-hint.js | 33 +++++++++++--------------- browser_object.js | 61 +++++++++++++++++++++++-------------------------- char-hints-mod.js | 45 ++++++++++++++++++------------------ ex_autocmd.js | 6 ++--- feedSomeKeys.js | 10 ++++---- hatenaStar.js | 22 +++++++++--------- inspector.js | 18 +++++++-------- ldrize_cooperation.js | 43 +++++++++++++++++----------------- mixiecho.js | 2 +- pukka.js | 10 ++++---- sbmcommentsviewer.js | 45 ++++++++++++++++++------------------ stylechanger.js | 10 +++++--- 13 files changed, 156 insertions(+), 169 deletions(-) diff --git a/auto_detect_link.js b/auto_detect_link.js index b05e312..eddf66b 100644 --- a/auto_detect_link.js +++ b/auto_detect_link.js @@ -81,29 +81,23 @@ let defaultSetting = { nextPatterns: [ + //[NnＮｎ][EeＥｅ][XxＸｘ][TtＴｔ]/, /[Nn\uff2e\uff4e][Ee\uff25\uff45][Xx\uff38\uff58][Tt\uff34\uff54]/, + //[FfＦｆ](?:[OoＯｏ][RrＲｒ])?[WwＷｗ](?:[AaＡａ][RrＲｒ])?[DdＤｄ]/, /[Ff\uff26\uff46](?:[Oo\uff2f\uff4f][Rr\uff32\uff52])?[Ww\uff37\uff57](?:[Aa\uff21\uff41][Rr\uff32\uff52])?[Dd\uff24\uff44]/, + //^\s*(?:次|つぎ)[への]/, /つづく|続/, /次|つぎ/, /進む/, /^\s*(?:\u6b21|\u3064\u304e)[\u3078\u306e]/, /\u3064\u3065\u304f|\u7d9a/, /\u6b21|\u3064\u304e/, /\u9032\u3080/, + //^\s*>\s*$/, />+|≫/ /^\s*>\s*$/, />+|\u226b/ ], backPatterns: [ + //[BbＢｂ][AaＡａ][CcＣｃ][KkＫｋ]/, /[PpＰｐ][RrＲｒ][EeＥｅ][VvＶｖ]/, /[Bb\uff22\uff42][Aa\uff21\uff41][Cc\uff23\uff43][Kk\uff2b\uff4b]/, /[Pp\uff30\uff50][Rr\uff32\uff52][Ee\uff25\uff45][Vv\uff36\uff56]/, + //^\s*前[への]/, /前/, /戻る/, /^\s*\u524d[\u3078\u306e]/, /\u524d/, /\u623b\u308b/, + //^\s*<\s*$/, /<+|≪/ /^\s*<\s*$/, /<+|\u226a/ ], -/* オリジナル - nextPatterns: [ - /[NnＮｎ][EeＥｅ][XxＸｘ][TtＴｔ]/, - /[FfＦｆ](?:[OoＯｏ][RrＲｒ])?[WwＷｗ](?:[AaＡａ][RrＲｒ])?[DdＤｄ]/, - /^\s*(?:次|つぎ)[への]/, /つづく|続/, /次|つぎ/, /進む/, - /^\s*>\s*$/, />+|≫/ - ], - backPatterns: [ - /[BbＢｂ][AaＡａ][CcＣｃ][KkＫｋ]/, /[PpＰｐ][RrＲｒ][EeＥｅ][VvＶｖ]/, - /^\s*前[への]/, /前/, /戻る/, - /^\s*<\s*$/, /<+|≪/ - ], -*/ nextMappings: [']]'], backMappings: ['[['], useSuccPattern: true, diff --git a/bookmarktoolbar-hint.js b/bookmarktoolbar-hint.js index a37ab94..3257d30 100644 --- a/bookmarktoolbar-hint.js +++ b/bookmarktoolbar-hint.js @@ -2,7 +2,7 @@ // @name BookmarksToolbar-Hint // @description Feature the BookmarksToolbar-Hint // @description-ja ブックマークツールバーのヒント機能を提供 -// @version 0.2b +// @version 0.2c // ==/VimperatorPlugin== // // Usage: @@ -30,32 +30,25 @@ liberator.plugins.bookmarkToolbarHints = (function(){ return tooltip; } function clearTooltips(){ - while(tooltipbox.hasChildNodes()){ + while (tooltipbox.hasChildNodes()){ tooltipbox.firstChild.hidePopup(); tooltipbox.removeChild(tooltipbox.firstChild); } } - function getToolbar(){ - if (toolbar) - return toolbar; - else - toolbar = document.getElementById('bookmarksBarContent'); - - return toolbar; - } + function getToolbar() toolbar || (toolbar = document.getElementById('bookmarksBarContent')); function onKeyPress(event){ manager.onEvent(event); event.stopPropagation(); event.preventDefault(); } function updateSelector(){ - for (var i=0; i= num*10){ @@ -190,7 +183,7 @@ liberator.plugins.bookmarkToolbarHints = (function(){ useShift = false; window.removeEventListener('keypress',onKeyPress,true); liberator.modules.modes.reset(true); - while(tooltipbox.hasChildNodes()){ + while (tooltipbox.hasChildNodes()){ tooltipbox.firstChild.hidePopup(); tooltipbox.removeChild(tooltipbox.firstChild); } diff --git a/browser_object.js b/browser_object.js index 8217fd8..44f16de 100644 --- a/browser_object.js +++ b/browser_object.js @@ -4,7 +4,7 @@ // License: Creative Commons // Maintainer: Trapezoid - http://unsigned.g.hatena.ne.jp/Trapezoid // -// Map behave like text-object for vimperator0.6.* +// Map behave like text-object for Vimperator // // Variables: // g:browser_object_prefix: @@ -62,25 +62,25 @@ function Tab(){} Tab.prototype = { close: function(ary){ - for(var i = 0 ; i < ary.length; i++){ + for (var i = 0 ; i < ary.length; i++){ let j = ary[i]; window.setTimeout(function(){ j.linkedBrowser.contentWindow.close(); },0); } }, yank: function(ary){ var copyStrings = []; - for(var i = 0 ; i < ary.length; i++) + for (var i = 0 ; i < ary.length; i++) if(typeof ary[i] == "object") copyStrings.push(ary[i].linkedBrowser.contentDocument.location.href); liberator.modules.util.copyToClipboard(copyStrings.join(", ")); }, reload: function(ary){ - for(var i = 0 ; i < ary.length; i++) + for (var i = 0 ; i < ary.length; i++) if(typeof ary[i] == "object") ary[i].linkedBrowser.contentDocument.location.reload(); }, togglePin: function(ary){ - for(var i = 0 ; i < ary.length; i++){ + for (var i = 0 ; i < ary.length; i++){ if(typeof ary[i] == "object") if(ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon == undefined){ var image = document.createElement('image'); @@ -92,18 +92,18 @@ ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = false; } else if(ary[i].linkedBrowser.vimperatorBrowserObjectPin){ - ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = true ; - ary[i].linkedBrowser.vimperatorBrowserObjectPin = false ; + ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = true; + ary[i].linkedBrowser.vimperatorBrowserObjectPin = false; }else{ - ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = false ; - ary[i].linkedBrowser.vimperatorBrowserObjectPin = true ; + ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = false; + ary[i].linkedBrowser.vimperatorBrowserObjectPin = true; } } }, setPin: function(ary){ - for(var i = 0 ; i < ary.length; i++){ + for (var i = 0 ; i < ary.length; i++){ if(typeof ary[i] == "object"){ - ary[i].linkedBrowser.vimperatorBrowserObjectPin = true ; + ary[i].linkedBrowser.vimperatorBrowserObjectPin = true; if(ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon == undefined){ var image = document.createElement('image'); image.setAttribute('src',PINNED_ICON); @@ -116,17 +116,17 @@ } }, unsetPin: function(ary){ - for(var i = 0 ; i < ary.length; i++){ + for (var i = 0 ; i < ary.length; i++){ if(typeof ary[i] == "object"){ if(ary[i].linkedBrowser.vimperatorBrowserObjectPin == true){ - ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = true ; - ary[i].linkedBrowser.vimperatorBrowserObjectPin = false ; + ary[i].linkedBrowser.vimperatorBrowserObjectPinIcon.collapsed = true; + ary[i].linkedBrowser.vimperatorBrowserObjectPin = false; } } } }, - active: function() gBrowser.mTabContainer.selectedIndex , + active: function() gBrowser.mTabContainer.selectedIndex, identify: function(i){try{return i.linkedBrowser.contentDocument.location.host}catch(e){}}, pinned: function(i){ if(typeof i == "object"){ @@ -134,13 +134,13 @@ } return false; }, - collection: function() window.gBrowser.mTabContainer.childNodes , + collection: function() window.gBrowser.mTabContainer.childNodes, }; function Container(){ var collections = {}; function iterator(){ - for(var i in collections) + for (let i in collections) yield collections[i]; throw StopIteration; } @@ -154,10 +154,8 @@ handler: handler, }; }, - get: function(id){ - return collections[id]; - }, - } + get: function(id) collections[id], + }; } var browserObject = {}; @@ -174,38 +172,35 @@ browserObject.scopes.add('l',function(ary){ var active = this.active(); - return [ary[i] for (i in ary) if (i < active)]; + return [ary[i] for (i in ary) if(i < active)]; }); browserObject.scopes.add('r',function(ary){ var active = this.active(); - return [ary[i] for (i in ary) if (i > active)]; + return [ary[i] for (i in ary) if(i > active)]; }); browserObject.scopes.add('o',function(ary){ var active = this.active(); - return [ary[i] for (i in ary) if (i != active)]; + return [ary[i] for (i in ary) if(i != active)]; }); browserObject.scopes.add('c',function(ary) [ary[this.active()]]); browserObject.scopes.add('a',function(ary) ary); browserObject.scopes.add('s',function(ary){ var activeIdentify = this.identify(ary[this.active()]); - return [ary[i] for (i in ary) if (this.identify(ary[i]) == activeIdentify)]; + return [ary[i] for (i in ary) if(this.identify(ary[i]) == activeIdentify)]; }); browserObject.scopes.add('p',function(ary){ - return [ary[i] for (i in ary) if (this.pinned(ary[i]) == true)]; + return [ary[i] for (i in ary) if(this.pinned(ary[i]) == true)]; }); browserObject.targets.add('t',new Tab()); var prefix = liberator.globalVariables.browser_object_prefix || ""; - for (let m in browserObject.motions){ - let motion = m; - for (let s in browserObject.scopes){ - let scope = s; - + for (let motion in browserObject.motions){ + for (let scope in browserObject.scopes){ liberator.modules.mappings.addUserMap([liberator.modules.modes.NORMAL], [prefix + motion.id + scope.id], "Browser Object Mapping", - function (arg) { + function (arg){ var target, targetCollection; target = browserObject.targets.get(arg); @@ -220,7 +215,7 @@ else liberator.echoerr("BrowserObject: motion handler not found"); }, - { flags: liberator.modules.Mappings.flags.ARGUMENT}); + { flags: liberator.modules.Mappings.flags.ARGUMENT }); } let map = liberator.modules.mappings.get(null,motion.id); if(!prefix && map){ diff --git a/char-hints-mod.js b/char-hints-mod.js index 36acdab..02a59b7 100644 --- a/char-hints-mod.js +++ b/char-hints-mod.js @@ -123,7 +123,7 @@ chh.hintchars2number = function (hintstr)//{{{ var converted = ""; // translate users hintchars into a number (chh.conversion) 0 -> 0, 1 -> 1, ... - for (var i = 0, l = hintstr.length; i < l; i++) + for (let i = 0, l = hintstr.length; i < l; i++) converted += "" + chh.conversion[chh.hintchars.indexOf(hintstr[i])]; // add one, since hints begin with 0; @@ -142,7 +142,7 @@ chh.number2hintchars = function (nr)//{{{ // translate numbers into users hintchars // tmp might be 2e -> (chh.transval) 2 and 14 -> (chh.hintchars) according hintchars - for (var i = 0, l = tmp.length; i < l; i++) + for (let i = 0, l = tmp.length; i < l; i++) converted += "" + chh.hintchars[chh.transval[tmp[i]]]; return converted; @@ -201,10 +201,11 @@ chh.yankHint = function (text)//{{{ return false; var elem = chh.validHints[chh.hintNumber - 1] || chh.validHints[0]; + var loc; if (text) - var loc = elem.textContent; + loc = elem.textContent; else - var loc = elem.href; + loc = elem.href; liberator.copyToClipboard(loc); liberator.echo("Yanked " + loc, liberator.commandline.FORCE_SINGLELINE); @@ -284,7 +285,7 @@ chh.generate = function (win)//{{{ chh.docs.push({ doc: doc, start: start, end: chh.hints.length - 1 }); // also generate hints for frames - for (var i = 0; i < win.frames.length; i++) + for (let i = 0; i < win.frames.length; i++) chh.generate(win.frames[i]); liberator.log("shints: generate() completed after: " + (Date.now() - startDate) + "ms"); @@ -317,13 +318,13 @@ chh.showHints = function ()//{{{ var activeHint = chh.hintNumber || 1; chh.validHints = []; - for (var j = 0; j < chh.docs.length; j++) + for (let j = 0; j < chh.docs.length; j++) { - var doc = chh.docs[j].doc; - var start = chh.docs[j].start; - var end = chh.docs[j].end; - var scrollX = doc.defaultView.scrollX; - var scrollY = doc.defaultView.scrollY; + let doc = chh.docs[j].doc; + let start = chh.docs[j].start; + let end = chh.docs[j].end; + let scrollX = doc.defaultView.scrollX; + let scrollY = doc.defaultView.scrollY; outer: for (let i = start; i <= end; i++) @@ -378,11 +379,11 @@ chh.removeHints = function (timeout)//{{{ var firstElemselcolor = ""; var firstElemColor = ""; - for (var j = 0; j < chh.docs.length; j++) + for (let j = 0; j < chh.docs.length; j++) { - var doc = chh.docs[j].doc; - var start = chh.docs[j].start; - var end = chh.docs[j].end; + let doc = chh.docs[j].doc; + let start = chh.docs[j].start; + let end = chh.docs[j].end; for (let i = start; i <= end; i++) { @@ -399,7 +400,7 @@ chh.removeHints = function (timeout)//{{{ else { // restore colors - var elem = chh.hints[i][0]; + let elem = chh.hints[i][0]; elem.style.backgroundColor = chh.hints[i][4]; elem.style.color = chh.hints[i][5]; } @@ -429,7 +430,7 @@ chh.processHints = function (followFirst)//{{{ if (!followFirst) { - var firstHref = chh.validHints[0].getAttribute("href") || null; + let firstHref = chh.validHints[0].getAttribute("href") || null; if (firstHref) { if (chh.validHints.some(function (e) { return e.getAttribute("href") != firstHref; })) @@ -563,7 +564,7 @@ chh.onEvent = function (event)//{{{ if (chh.hintNumber == 0) chh.hintNumber = 1; - var oldID = chh.hintNumber; + let oldID = chh.hintNumber; if (key == "") { if (++chh.hintNumber > chh.validHints.length) @@ -578,7 +579,7 @@ chh.onEvent = function (event)//{{{ return; case "": //TODO: may tweak orig hints.js too (adding 2 lines ...) - var oldID = chh.hintNumber; + let oldID = chh.hintNumber; if (chh.hintNumber > 0) { chh.hintNumber = Math.floor(chh.hintNumber / chh.hintchars.length); @@ -606,7 +607,7 @@ chh.onEvent = function (event)//{{{ if (/^<./.test(key) || key == ":") { //FIXME: won't work probably - var map = null; + let map = null; if ((map = liberator.mappings.get(liberator.modes.NORMAL, key)) || (map = liberator.mappings.get(liberator.modes.HINTS, key))) //TODO { @@ -621,7 +622,7 @@ chh.onEvent = function (event)//{{{ if (chh.hintchars.indexOf(key) >= 0) // TODO: check if in hintchars { chh.hintString += key; - var oldHintNumber = chh.hintNumber; + let oldHintNumber = chh.hintNumber; if (chh.hintNumber == 0 || chh.usedTabKey) { chh.usedTabKey = false; @@ -652,7 +653,7 @@ chh.onEvent = function (event)//{{{ if (chh.hintNumber > 0 && chh.hintNumber * chh.hintchars.length <= chh.validHints.length) { if (chh.timeout > 0) - chh.activeTimeout = setTimeout(function () { chh.processHints(true); }, chh.timeout); + chh.activeTimeout = setTimeout(chh.processHints, chh.timeout, true); return false; } diff --git a/ex_autocmd.js b/ex_autocmd.js index dccccda..190110b 100644 --- a/ex_autocmd.js +++ b/ex_autocmd.js @@ -3,7 +3,7 @@ // License: Creative Commons // Maintainer: Trapezoid - http://unsigned.g.hatena.ne.jp/Trapezoid // -// extends autocmd for vimperator0.6.* +// extends autocmd for Vimperator // Ex Events: // TabSelect // TabLeave @@ -11,7 +11,7 @@ var recentTabURI = null; function tabSelect(e){ - liberator.modules.autocommands.trigger("TabLeave",recentTabURI ? recentTabURI : ""); + liberator.modules.autocommands.trigger("TabLeave",recentTabURI || ""); liberator.modules.autocommands.trigger("TabSelect",gBrowser.selectedTab.linkedBrowser.contentWindow.location.href); recentTabURI = gBrowser.selectedTab.linkedBrowser.contentWindow.location.href; } @@ -20,7 +20,7 @@ gBrowser.tabContainer.addEventListener("TabSelect",tabSelect,false); function currentPageLoad(e){ var doc = e.originalTarget; - if (doc instanceof HTMLDocument && doc == gBrowser.contentDocument){ + if (doc instanceof HTMLDocument && doc == gBrowser.contentDocument){ liberator.modules.autocommands.trigger("CurrentPageLoad",doc.documentURI); recentTabURI = doc.documentURI; } diff --git a/feedSomeKeys.js b/feedSomeKeys.js index 7c3bb77..34b35b7 100644 --- a/feedSomeKeys.js +++ b/feedSomeKeys.js @@ -4,7 +4,7 @@ * @description feed some defined key events into the Web content * @description-ja 定義したkeyイベントをWebページ側へ送ってあげます * @author teramako teramako@gmail.com - * @version 0.1a + * @version 0.1b * ==/VimperatorPlugin== * * 英語での説明を放棄する @@ -257,7 +257,7 @@ function feedKeyIntoContent(keys, useVkey){ var charCode = keys.charCodeAt(i); keyCode = 0; } - if (keys[i] == '<'){ + if (keys[i] == '<'){ var matches = keys.substr(i + 1).match(/^((?:[ACMSacms]-)*)([^>]+)/); if (matches) { if (matches[1]) { @@ -329,10 +329,10 @@ var converter = { commands.addUserCommand(['feedmaps','fmaps'], '', function(args, bang){ var feedkey = args["-depth"]; - var vkey = '-vkey' in args ? true: false; + var vkey = '-vkey' in args; var keys = args.arguments; if ('-' in args) keys.push('-'); - + if (feedkey) keys = keys.map( function(i) [i, (feedkey+"")+i] ); liberator.plugins.feedKey.setup(keys, vkey); }, { @@ -340,7 +340,7 @@ commands.addUserCommand(['feedmaps','fmaps'], '', argCount : "*", options : [ [['-depth', '-d'], commands.OPTION_INT], [['-vkey', '-v'], commands.OPTION_NOARG], - [['-'], commands.OPTION_NOARG ] + [['-'], commands.OPTION_NOARG ] ] } ); diff --git a/hatenaStar.js b/hatenaStar.js index b68538a..a9571f1 100644 --- a/hatenaStar.js +++ b/hatenaStar.js @@ -1,16 +1,16 @@ /** - * For Vimperator 0.7.0 + * For Vimperator 0.7+ * @author mattn mattn.jp@gmail.com */ -(function(){ +(function() { const Cc = Components.classes; const Ci = Components.interfaces; var flasher = null; -function getFlasher(){ - if (!flasher){ +function getFlasher() { + if (!flasher) { flasher = Cc['@mozilla.org/inspector/flasher;1'].createInstance(Ci.inIFlasher); flasher.color = '#FF0000'; flasher.thickness = 2; @@ -18,7 +18,7 @@ function getFlasher(){ return flasher; } -function blink(aNode){ +function blink(aNode) { if (!aNode) { liberator.echoerr('hatenastar not found'); return; @@ -26,7 +26,7 @@ function blink(aNode){ if (aNode.nodeType == 3) aNode = aNode.parentNode; var toggle = true; var flasher = getFlasher(); - for (var i=1; i<7; ++i){ + for (let i=1; i<7; ++i) { setTimeout(function() { if (toggle) flasher.drawElementOutline(aNode); else flasher.repaintElement(aNode); @@ -39,15 +39,15 @@ liberator.modules.commands.addUserCommand(['hatenastar', 'hatenas'], 'add Hatena function (arg, special) { try { arg = arg.string; - var result = buffer.evaluateXPath('.//img[contains(concat(" ", @class, " "), " hatena-star-add-button ")]'); + let result = buffer.evaluateXPath('.//img[contains(concat(" ", @class, " "), " hatena-star-add-button ")]'); if (arg.match(/^(\d+)\?$/)) { blink(result.snapshotItem(Number(RegExp.$1)-1)); return; } - for (var i = 0, l = result.snapshotLength; i < l; i++) { + for (let i = 0, l = result.snapshotLength; i < l; i++) { if (arg == '' || arg == 'all' || arg == (i+1)) { - var s = result.snapshotItem(i); - var e = document.createEvent('MouseEvents'); + let s = result.snapshotItem(i); + let e = document.createEvent('MouseEvents'); e.initMouseEvent('click', true, true, window, 1, 10, 50, 10, 50, 0, 0, 0, 0, 1, s); s.dispatchEvent(e); } @@ -62,7 +62,7 @@ liberator.modules.commands.addUserCommand(['hatenastar', 'hatenas'], 'add Hatena liberator.modules.mappings.addUserMap([liberator.modules.modes.NORMAL], [',?s'], 'add Hatena Star', function (count) { try { - for (var n = 0; n++ < count; liberator.modules.commands.get('hatenastar').execute("all", false, count)); + for (let n = 0; n++ < count; liberator.modules.commands.get('hatenastar').execute("all", false, count)); } catch (e) { liberator.echoerr('hatenaStar: ' + e); } }, { noremap: true, diff --git a/inspector.js b/inspector.js index 22aba05..91d5417 100644 --- a/inspector.js +++ b/inspector.js @@ -1,6 +1,6 @@ /** * ==VimperatorPlugin== - * @name inspector + * @name inspector * @description DOM Inspector commands * @depend "DOM Inspector" inspector@mozilla.org * @author teramako teramako@gmail.com @@ -18,13 +18,13 @@ (function(){ -const inspectorID = 'inspector@mozilla.org'; +const inspectorID = "inspector@mozilla.org"; if (!Application.extensions.has(inspectorID) || !Application.extensions.get(inspectorID).enabled) return; /* これやるとFirefox終了時に実行されるんだけど...なぜ？ -> Ubiquityが悪さしているみたい Object.prototype.inspect = function(){ runInspector(this); -} +}; */ function runInspector(node){ @@ -32,7 +32,7 @@ function runInspector(node){ inspectDOMDocument(node); } else if (node instanceof Node){ inspectDOMNode(node); - } else if (node !== null && typeof(node) != "undefined"){ + } else if (node !== null && typeof node != "undefined"){ inspectObject(node); } } @@ -46,7 +46,7 @@ function getIDList(filter, isChrome){ var options = [ [["-frame","-f"], commands.OPTION_NOARG] ]; -commands.addUserCommand(['inspect','dominspect'],'run DOM Inspector', +commands.addUserCommand(["inspect","dominspect"],"run DOM Inspector", function(args, bang){ var arg = args.arguments[0]; var doc = bang ? document : content.document; @@ -54,16 +54,16 @@ commands.addUserCommand(['inspect','dominspect'],'run DOM Inspector', if (!arg){ node = doc; } else if (arg.charAt(0) == "#"){ - var id = arg.substr(1); + let id = arg.substr(1); node = doc.getElementById(id); - if (!node) { + if (!node){ liberator.echoerr("No such id: " + id ); return; } } else { try { node = __eval(args.string); - } catch (e) { + } catch (e){ liberator.echoerr(e); } } @@ -79,7 +79,7 @@ commands.addUserCommand(['inspect','dominspect'],'run DOM Inspector', return [filter.indexOf(arg), completion.filter(getIDList(arg.substr(1),bang),arg,true)]; } return completion.javascript(filter); - }, + } } ); diff --git a/ldrize_cooperation.js b/ldrize_cooperation.js index dd48fae..48e6176 100644 --- a/ldrize_cooperation.js +++ b/ldrize_cooperation.js @@ -4,9 +4,9 @@ // License: Creative Commons // Maintainer: Trapezoid - http://unsigned.g.hatena.ne.jp/Trapezoid // -// Cooperation LDRize Mappings for vimperator0.6.* +// Cooperation LDRize Mappings for Vimperator // -// Variable: +// Variables: // g:ldrc_captureMapping // Specifies keys that capture by LDRize // usage: let g:ldrc_captureMappings = "['j','k','p','o','?']" @@ -105,7 +105,7 @@ +'lawEX19fqNVqVS/kOE6r1fI8DyHU6XT++ShjzM/Pz8HBAXx/f+/3+9X2WmvO' +'uVKq3GCMUUoxxlarVb1ef3h4+AWNW50eXTIBjgAAAABJRU5ErkJggg=='; - var Class = function(){return function(){this.initialize.apply(this,arguments)}} + var Class = function() function(){this.initialize.apply(this,arguments)}; var _isEnable; @@ -113,7 +113,7 @@ LDRizeCooperation.prototype = { initialize: function(){ var self = this; - this.LDRize = {getSiteinfo: function(){return undefined;}}; + this.LDRize = {getSiteinfo: function() undefined;}; this.Minibuffer = null; this.handlerInfo = handlerInfo; @@ -202,7 +202,7 @@ function setHinttags(enable){ if(enable){ - var siteinfo = self.LDRize.getSiteinfo(); + let siteinfo = self.LDRize.getSiteinfo(); if(siteinfo.link && siteinfo.paragraph){ liberator.modules.options.hinttags = siteinfo.paragraph + "/" + siteinfo.link; liberator.modules.options.extendedhinttags = siteinfo.paragraph + "/" + siteinfo.link; @@ -224,7 +224,7 @@ setHinttags(true); liberator.modules.hints.show("o"); setHinttags(self.isEnableLDRizeCooperation() && self.isModHints); - } ,{}); + },{}); liberator.modules.mappings.addUserMap([liberator.modules.modes.NORMAL], ["f"], "Start QuickHint mode", @@ -256,7 +256,7 @@ showString += link + "
"; }); liberator.modules.commandline.echo(showString, liberator.modules.commandline.HL_NORMAL, liberator.modules.commandline.FORCE_MULTILINE); - } ,{}); + },{}); liberator.modules.commands.addUserCommand(["mb","m","minibuffer"], "Execute Minibuffer", function(arg){self.Minibuffer.execute(arg)}, { @@ -264,7 +264,7 @@ var completionList = []; var command = self.Minibuffer.command; var alias = self.Minibuffer.alias_getter(); - var tokens = filter.split("|").map(function(str){return str.replace(/\s+/g,"")}); + var tokens = filter.split("|").map(function(str) str.replace(/\s+/g,"")); var exp = new RegExp("^" + tokens.pop()); for(let i in command) if(exp.test(i))completionList.push([tokens.concat(i).join(" | "),"MinibufferCommand"]); for(let i in alias) if(exp.test(i))completionList.push([i,"MinibufferAlias"]); @@ -272,20 +272,20 @@ } }); liberator.modules.commands.addUserCommand(["pindownload"], "Download pinned links by any software", - function(arg){ self.downloadLinksByProgram(self.getPinnedItems());} ,{}); + function(arg){ self.downloadLinksByProgram(self.getPinnedItems());}, {}); liberator.modules.commands.addUserCommand(["toggleldrizecooperation","toggleldrc"], "Toggle LDRize Cooperation", function(arg){ self.isEnable = !self.isEnable}, {}); //Options liberator.modules.options.add(['ldrc','ldrizecooperation'],'LDRize cooperation','boolean',this.isEnable, { setter: function(value){ self.isEnable = value; }, - getter: function(){ return self.isEnable; } + getter: function() self.isEnable; } ); liberator.modules.options.add(['ldrchints'],'mod hinttags for LDRize','boolean',this.isModHints, { setter: function(value){ self.isModHints = value; }, - getter: function(){ return self.isModHints; } + getter: function() self.isModHints; } ); }, @@ -301,15 +301,13 @@ }); }, - get isEnable(){ - return _isEnable; - }, + get isEnable() _isEnable, set isEnable(value){ this.LDRizeCooperationPanel.setAttribute("src",value ? DISABLE_ICON : ENABLE_ICON); _isEnable = value; }, - isEnableLDRize: function(){ return this.LDRize.getSiteinfo() != undefined; }, - isEnableLDRizeCooperation: function(){ return this.isEnable && this.isEnableLDRize() }, + isEnableLDRize: function() this.LDRize.getSiteinfo() != undefined, + isEnableLDRizeCooperation: function() this.isEnable && this.isEnableLDRize(), //Pin getPinnedItems: function(){ @@ -317,8 +315,8 @@ var viewXpath = this.LDRize.getSiteinfo()['view'] || linkXpath + "/text()"; return this.LDRize.getPinnedItems().map(function(i){ let linkResult = i.XPath(linkXpath); let viewResult = i.XPath(viewXpath); - return [linkResult, viewResult ? viewResult.textContent : null]} - ); + return [linkResult, viewResult ? viewResult.textContent : null]; + }); }, downloadLinksByProgram: function(links){ var self = this; @@ -328,7 +326,7 @@ if(x.include.test(url)){ setTimeout(function(){ if(typeof x.handler == "object"){ - var args = x.handler[1].map(function(s){ return s.replace(/%URL%/g,url).replace(/%TITLE%/g,title); }); + let args = x.handler[1].map(function(s) s.replace(/%URL%/g,url).replace(/%TITLE%/g,title)); liberator.modules.io.run(x.handler[0],args,false); }else if(typeof x.handler == "string"){ liberator.modules.io.run(x.handler,[url],false); @@ -386,15 +384,16 @@ //Utils addAfter: function(target,name,after){ var original = target[name]; - target[name] = function() { + target[name] = function(){ var tmp = original.apply(target,arguments); after.apply(target,arguments); return tmp; }; }, getClientPosition: function(elem){ + var position; try{ - var position = elem.getBoundingClientRect(); + position = elem.getBoundingClientRect(); }catch(e){ position = elem.parentNode.getBoundingClientRect(); } @@ -408,7 +407,7 @@ evt.initKeyEvent("keypress",true,true,window.content.wrappedJSObject,false,false,false,false,keyCode,charCode); window.content.wrappedJSObject.document.dispatchEvent(evt); }, - } + }; liberator.plugins.LDRizeCooperation = new LDRizeCooperation(); })(); diff --git a/mixiecho.js b/mixiecho.js index c3dbb39..953588f 100644 --- a/mixiecho.js +++ b/mixiecho.js @@ -18,7 +18,7 @@ if (typeof ignoreTags == "string") ignoreTags = [ignoreTags]; var stripTags = []; ignoreTags = ignoreTags.filter(function(tag) tag[tag.length - 1] == "/" || !stripTags.push(tag)) - .map(function(tag) tag.replace(/\/$/, "")); + .map(function(tag) tag.replace(/\/$/, "")); if (stripTags.length > 0) { stripTags = stripTags.length > 1 ? "(?:" + stripTags.join("|") + ")" diff --git a/pukka.js b/pukka.js index 44b8774..683be2b 100644 --- a/pukka.js +++ b/pukka.js @@ -5,13 +5,13 @@ * @description-ja Pukkaを使用してDeliciousにブックマークする * @author otsune info@otsune.com * @namespace http://www.otsune.com/ - * @minVersion 0.6pre + * @minVersion 2.0pre * @version 0.4 * ==/VimperatorPlugin== * * see also http://codesorcery.net/pukka/ * - * Variable: + * Variables: * g:pukka_normalizelink * Specifies keys that use Pathtraq URL Normalizer * usage: let g:pukka_normalizelink = true @@ -29,8 +29,8 @@ var useNormalizelink = liberator.globalVariables.pukka_normalizelink || true; var buf = liberator.modules.buffer; -liberator.modules.commands.addUserCommand( - ['pukka', 'pu'], 'Post to Pukka bookmark', function(args) { +liberator.modules.commands + .addUserCommand(['pukka', 'pu'], 'Post to Pukka bookmark', function(args) { if (!buf.title || !buf.URL || buf.URL == 'about:blank') { return false; } @@ -43,7 +43,7 @@ liberator.modules.commands.addUserCommand( } liberator.open(scheme + 'url=' + url + '&title=' + title + '&extended=' + extend); }, { - bang: false, + bang: false, completer: function(filter) { var complist = []; diff --git a/sbmcommentsviewer.js b/sbmcommentsviewer.js index 1117eb6..ee8e8f7 100644 --- a/sbmcommentsviewer.js +++ b/sbmcommentsviewer.js @@ -1,9 +1,9 @@ /** * ==VimperatorPlugin== * @name SBM Comments Viewer - * @description List show Social BookMark Comments + * @description List show Social Bookmark Comments * @description-ja ソーシャル・ブックマーク・コメントを表示します - * @version 0.1b + * @version 0.1c * ==/VimperatorPlugin== * * Usage: @@ -26,7 +26,7 @@ * * SBMタイプ: * h : hatena bookmark - * d : del.icio.us bookmark + * d : Delicious * l : livedoor clip * z : Buzzurl * XXX:今後増やしていきたい @@ -72,11 +72,11 @@ SBMContainer.prototype = { //{{{ if (countOnly){ return label; } else { - var str = [ + let str = [ '' ]; format.forEach(function(colum){ - var name = manager.format[colum] || '-'; + let name = manager.format[colum] || '-'; str.push(''); }); str.push(''); @@ -176,7 +176,7 @@ function openSBM(url, type, format, countOnly, openToBrowser){ xhr.onreadystatechange = function(){ if (xhr.readyState == 4){ if (xhr.status == 200){ - var sbmContainer = SBM[sbmLabel].parser.call(this, xhr); + let sbmContainer = SBM[sbmLabel].parser.call(this, xhr); if (!sbmContainer) return; cacheManager.add(sbmContainer, url, type); if (openToBrowser) @@ -187,7 +187,7 @@ function openSBM(url, type, format, countOnly, openToBrowser){ liberator.echoerr(sbmURL + ' ' + xhr.status, true); } } - } + }; xhr.send(null); } //}}} /** @@ -226,12 +226,13 @@ var SBM = { //{{{ parser: function(xhr){ var rss = xhr.responseXML; if (!rss){ - liberator.echoerr('del.icio.us feed is none',true); + liberator.echoerr('Delicious feed is none',true); return; } + var pageURL, items; try { - var pageURL = evaluateXPath(rss, '//rss:channel/rss:link')[0].textContent; - var items = evaluateXPath(rss, '//rss:item'); + pageURL = evaluateXPath(rss, '//rss:channel/rss:link')[0].textContent; + items = evaluateXPath(rss, '//rss:item'); } catch(e){ liberator.log(e); } @@ -242,8 +243,8 @@ var SBM = { //{{{ items.forEach(function(item){ var children = item.childNodes; var [id,date,tags,comment,link] = ['','',[],'','']; - for (var i=0; i threshold) delete cache[url][type]; } } diff --git a/stylechanger.js b/stylechanger.js index d6354d8..565adbf 100644 --- a/stylechanger.js +++ b/stylechanger.js @@ -44,12 +44,16 @@ liberator.plugins.styleSheetsManger = (function(){ if (globalVariables.styles) globalVariables.styles.split(/\s*,\s*/).forEach(manager.load); } function getCSSFiles() { - let files = []; + var files = []; io.getRuntimeDirectories('colors') .filter(function(colorDir) colorDir) .forEach(function(colorDir) - io.readDirectory(colorDir).forEach(function(file) - /\.css$/.test(file.leafName.toLowerCase()) && !file.isDirectory() && files.push(file))); + io.readDirectory(colorDir) + .forEach(function(file) { + if (/\.css$/.test(file.leafName.toLowerCase()) && !file.isDirectory()) { + files.push(file); + } + })); return files; } function getURIFromName(aName){ -- cgit v1.2.3
' + label + '
' + name + '