aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bitly.js5
-rw-r--r--epub-reader.js7
-rw-r--r--gmail-commando.js36
-rw-r--r--lo.js15
-rw-r--r--migemized_find.js16
-rw-r--r--mpd-currentsong.js8
-rw-r--r--multi-exec.js5
-rw-r--r--namakubi.js21
-rw-r--r--proxy.js10
-rw-r--r--refe.js49
-rw-r--r--slideshare.js8
-rw-r--r--video-controller.js29
12 files changed, 119 insertions, 90 deletions
diff --git a/bitly.js b/bitly.js
index 5d4af2d..5b654ed 100644
--- a/bitly.js
+++ b/bitly.js
@@ -90,7 +90,10 @@ let PLUGIN_INFO = xml`
callback();
},
{
- default: let (e = content.document.querySelector('#bitly_api_key')) (e ? e.value : '')
+ default: (function () {
+ let e = content.document.querySelector('#bitly_api_key');
+ return e ? e.value : ''
+ })()
}
);
}
diff --git a/epub-reader.js b/epub-reader.js
index 2976c05..9b2a10c 100644
--- a/epub-reader.js
+++ b/epub-reader.js
@@ -142,9 +142,10 @@ let INFO = xml`
return main;
}
- function getIndexLinks ()
- let (frame = content.document.querySelector('#nav_frame').contentDocument)
- Array.slice(frame.querySelectorAll('.navPoint .childLevel > a'));
+ function getIndexLinks () {
+ let frame = content.document.querySelector('#nav_frame').contentDocument;
+ return Array.slice(frame.querySelectorAll('.navPoint .childLevel > a'));
+ }
let api = __context__.API = {
bookmark:
diff --git a/gmail-commando.js b/gmail-commando.js
index cfa4cdb..a8be13e 100644
--- a/gmail-commando.js
+++ b/gmail-commando.js
@@ -240,9 +240,10 @@ let INFO = xml`
get translateButton () (this.mail && this.mail.querySelector('div.adJ > .B9.J-J5-Ji')),
get translateButtons () A(this.doc.querySelectorAll('div.adJ > .B9.J-J5-Ji')),
- get mail ()
- let (es = this.mails.filter(function (it) !it.querySelector('.ads > .hH')))
- (es.length && es[0]),
+ get mail () {
+ let es = this.mails.filter(function (it) !it.querySelector('.ads > .hH'));
+ return (es.length && es[0])
+ },
get mails () A(this.doc.querySelectorAll('.h7')),
get threadButtons () this.doc.querySelectorAll('div.hk > span > u'),
@@ -333,19 +334,22 @@ let INFO = xml`
__noSuchMethod__: function () void 0,
// XXX storage はちょっと重いっぽいので、ちょっと工夫する
- label: let (last = []) function (context) {
- if (Commando.inGmail) {
- var labels = Elements.labels.map(function (it) it.textContent);
- if (last.toString() != labels)
- Commando.storage.set('labels', labels);
- } else {
- var labels = last.length ? last : Commando.storage.get('labels', []);
- }
- context.completions = [
- [label.replace(/\s*\(\d+\+?\)$/, ''), label]
- for ([, label] in Iterator(labels))
- ];
- },
+ label: (function () {
+ let last = [];
+ return function (context) {
+ if (Commando.inGmail) {
+ var labels = Elements.labels.map(function (it) it.textContent);
+ if (last.toString() != labels)
+ Commando.storage.set('labels', labels);
+ } else {
+ var labels = last.length ? last : Commando.storage.get('labels', []);
+ }
+ context.completions = [
+ [label.replace(/\s*\(\d+\+?\)$/, ''), label]
+ for ([, label] in Iterator(labels))
+ ];
+ };
+ })(),
labelAndValue: function (context) {
KeywordValueCompleter.label(context);
diff --git a/lo.js b/lo.js
index 45d4e3f..2232e49 100644
--- a/lo.js
+++ b/lo.js
@@ -236,7 +236,8 @@ let INFO = xml`
const WHERE_COMPLETIONS = ['f', 't', 'n', 'b', 'c', 'w'];
- let (foihandle) {
+ (function () {
+ let foihandle;
commands.addUserCommand(
['fo[pen]', 'filteropen'],
@@ -299,9 +300,10 @@ let INFO = xml`
true
);
- }
+ })();
- let (lolinks = []) {
+ (function () {
+ let lolinks = [];
commands.addUserCommand(
['lo[pen]', 'linkopen'],
'Filtered open',
@@ -334,7 +336,10 @@ let INFO = xml`
context.keys = {
text: function ({elem, index}) (index + ': ' + join((elem.textContent || elem.href))),
description: function ({elem}) (elem.href),
- thumbnail: function ({elem}) let (img = elem.querySelector('img')) (img && img.src)
+ thumbnail: function ({elem}) {
+ let img = elem.querySelector('img');
+ return img && img.src;
+ }
};
context.compare = CompletionContext.Sort.number;
let process = Array.slice(context.process);
@@ -350,7 +355,7 @@ let INFO = xml`
true
);
- }
+ })();
})();
diff --git a/migemized_find.js b/migemized_find.js
index f1840f0..90cba58 100644
--- a/migemized_find.js
+++ b/migemized_find.js
@@ -470,10 +470,10 @@ let INFO = xml`
if (backwards)
frames = frames.reverse();
- frames.some(function (frame)
- let (ret = this.find(expr, backwards, this.makeBodyRange(frame)))
- (ret && (result = this.storage.lastResult = { frame: frame, range: ret}))
- , this);
+ frames.some(function (frame) {
+ let ret = this.find(expr, backwards, this.makeBodyRange(frame));
+ return ret && (result = this.storage.lastResult = { frame: frame, range: ret});
+ }, this);
this.removeHighlight(color);
@@ -527,10 +527,10 @@ let INFO = xml`
let [head, tail] = slashArray(frames, last.frame);
let next = backwards ? head.reverse().concat(tail.reverse())
: tail.concat(head);
- next.some(function (frame)
- let (ret = this.find(str, backwards, this.makeBodyRange(frame)))
- (ret && (result = {frame: frame, range: ret}))
- , this);
+ next.some(function (frame) {
+ let ret = this.find(str, backwards, this.makeBodyRange(frame));
+ return ret && (result = {frame: frame, range: ret});
+ }, this);
}
this.storage.lastResult = result;
diff --git a/mpd-currentsong.js b/mpd-currentsong.js
index 98b6d4a..df83f9f 100644
--- a/mpd-currentsong.js
+++ b/mpd-currentsong.js
@@ -69,9 +69,11 @@ let INFO = xml`
(function () {
let socketService =
- let (stsvc = Cc['@mozilla.org/network/socket-transport-service;1'])
- let (svc = stsvc.getService())
- svc.QueryInterface(Ci.nsISocketTransportService);
+ (function () {
+ let stsvc = Cc['@mozilla.org/network/socket-transport-service;1'];
+ let svc = stsvc.getService();
+ return svc.QueryInterface(Ci.nsISocketTransportService);
+ })();
function getSongInfo () {
let host = liberator.globalVariables.mpd_currentsong_host || 'localhost';
diff --git a/multi-exec.js b/multi-exec.js
index cb93311..7b7100f 100644
--- a/multi-exec.js
+++ b/multi-exec.js
@@ -80,8 +80,9 @@ let PLUGIN_INFO = xml`
'Multiple ex',
function (args) {
let [sep, body] = ['|', args.string];
- let (m = body.match(/^(\S)\s+(.*)$/))
- m && ([sep, body] = [m[1], m[2]]);
+ let m = body.match(/^(\S)\s+(.*)$/);
+ if (m)
+ [sep, body] = [m[1], m[2]];
body.split(sep)
.map(function (it) it.replace(/^\s+/, ''))
.forEach(liberator.execute, liberator);
diff --git a/namakubi.js b/namakubi.js
index 46d4ed6..e8bf306 100644
--- a/namakubi.js
+++ b/namakubi.js
@@ -136,21 +136,24 @@ let INFO = xml`
};
let socketService =
- let (stsvc = Components.classes["@mozilla.org/network/socket-transport-service;1"])
- let (svc = stsvc.getService())
- svc.QueryInterface(Components.interfaces["nsISocketTransportService"]);
+ (function () {
+ let stsvc = Components.classes["@mozilla.org/network/socket-transport-service;1"];
+ let svc = stsvc.getService();
+ return svc.QueryInterface(Components.interfaces["nsISocketTransportService"]);
+ })();
function talk (msg, option) {
- function value (name, size)
- let (v = (option && typeof option[name] !== 'undefined') ? option[name] : talkOption[name].value)
- (size ? intToBin(v, size) : v);
+ function value (name, size) {
+ let v = (option && typeof option[name] !== 'undefined') ? option[name] : talkOption[name].value;
+ return (size ? intToBin(v, size) : v);
+ }
let transport = socketService.createTransport(null, 0, value('host'), value('port'), null);
let outputStream = transport.openOutputStream(0, 0, 0);
- let (binaryOutputStream =
- Components.classes["@mozilla.org/binaryoutputstream;1"].
- createInstance(Components.interfaces["nsIBinaryOutputStream"]))
+ (function () {
+ let binaryOutputStream = Components.classes["@mozilla.org/binaryoutputstream;1"].createInstance(Components.interfaces["nsIBinaryOutputStream"]);
binaryOutputStream.setOutputStream(outputStream);
+ })();
msg = strToBin(msg);
let buf =
diff --git a/proxy.js b/proxy.js
index f45406e..b6c8b6f 100644
--- a/proxy.js
+++ b/proxy.js
@@ -86,7 +86,9 @@
];
};
- var proxy_settings = liberator.globalVariables.proxy_settings;
+ function proxy_settings () {
+ return liberator.globalVariables.proxy_settings;
+ }
commands.addUserCommand(["proxy"], 'Proxy settings', function (args) {
const prefs = Components.classes["@mozilla.org/preferences-service;1"]
@@ -96,7 +98,7 @@
if (!name) {
liberator.echo("Usage: proxy {setting name}");
}
- proxy_settings.some(function (proxy_setting) {
+ proxy_settings().some(function (proxy_setting) {
if (proxy_setting.conf_name.toLowerCase() != name.toLowerCase()) {
return false;
}
@@ -119,9 +121,9 @@
completer: function (context, args) {
var completions = [];
context.title = ["Proxy Name", "Proxy Usage"];
- context.completions = [[c.conf_name, c.conf_usage] for each (c in proxy_settings)];
+ context.completions = proxy_settings().map(function (it) [it.conf_name, it.conf_usage]);
}
- });
+ }, true);
})();
// vim: set sw=4 ts=4 et:
diff --git a/refe.js b/refe.js
index 43be175..4a289ad 100644
--- a/refe.js
+++ b/refe.js
@@ -110,29 +110,32 @@ let INFO = xml`
},
{
literal: 0,
- completer: let (getter) function (context, args) {
- function setCompletions (context, word) {
- getList(
- word,
- function (list) {
- context.incomplete = false;
- context.completions = list;
- }
- );
- }
-
- let word = args.literalArg;
-
- if (word.length <= 2)
- return;
-
- context.incomplete = true;
- context.filters = [CompletionContext.Filter.textDescription];
-
- if (getter)
- clearTimeout(getter);
- getter = setTimeout(setCompletions.bind(null, context, word), 1000);
- }
+ completer: (function (){
+ let getter;
+ return function (context, args) {
+ function setCompletions (context, word) {
+ getList(
+ word,
+ function (list) {
+ context.incomplete = false;
+ context.completions = list;
+ }
+ );
+ }
+
+ let word = args.literalArg;
+
+ if (word.length <= 2)
+ return;
+
+ context.incomplete = true;
+ context.filters = [CompletionContext.Filter.textDescription];
+
+ if (getter)
+ clearTimeout(getter);
+ getter = setTimeout(setCompletions.bind(null, context, word), 1000);
+ };
+ })()
},
true
);
diff --git a/slideshare.js b/slideshare.js
index ebab616..676625f 100644
--- a/slideshare.js
+++ b/slideshare.js
@@ -126,11 +126,13 @@ let INFO = xml`
let toggleFullscreen =
makeFullscreenToggler(
doc,
- let (isFullscreen = false)
- function () {
+ (function () {
+ let isFullscreen = false;
+ return function () {
doc.querySelector(isFullscreen ? '.btnLeaveFullScreen' : '.btnFullScreen').click();
isFullscreen ^= true;
- }
+ };
+ })()
);
toggleFullscreen(
diff --git a/video-controller.js b/video-controller.js
index 9df5b55..d7a5d6b 100644
--- a/video-controller.js
+++ b/video-controller.js
@@ -126,19 +126,22 @@ let INFO = xml`
},
{
subCommands: [
- let (o = o) new Command(
- [o[0] + '[' + o.slice(1) + ']'],
- o + ' <video>',
- function (args) {
- lastCommand = o;
- lastArgs = args;
- hints.show(HintName);
- },
- {
- literal: 0
- }
- )
- for (o in controlls)
+ (function () {
+ let o = it;
+ return new Command(
+ [o[0] + '[' + o.slice(1) + ']'],
+ o + ' <video>',
+ function (args) {
+ lastCommand = o;
+ lastArgs = args;
+ hints.show(HintName);
+ },
+ {
+ literal: 0
+ }
+ )
+ })()
+ for (it in controlls)
],
},
true
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 23:12:33 +0000