gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-28 07:22:27 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of most remaining comprehensions.

Browse Source
This commit is contained in:
Kris Maglione
2015-12-20 15:53:43 -08:00
parent 0aba8fb619
commit 916ea412a5
34 changed files with 372 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/aardvark.js
View File

@@ -1153,13 +1153,13 @@ var Aardvark = Class("Aardvark", {
// valid selectable element
findValidElement: function findValidElement(elem) {
for (; elem; elem = elem.parentNode) {
if (Set.has(this.alwaysValidElements, elem.localName))
if (hasOwnProperty(this.alwaysValidElements, elem.localName))
break;
let { display } = DOM(elem).style;
if (Set.has(this.validIfBlockElements, elem.localName) && display == "block")
if (hasOwnProperty(this.validIfBlockElements, elem.localName) && display == "block")
break;
if (Set.has(this.validIfNotInlineElements, elem.localName) && display != "inline")
if (hasOwnProperty(this.validIfNotInlineElements, elem.localName) && display != "inline")
break;
}
return elem;

2
plugins/flashblock.js
View File

@@ -404,7 +404,7 @@ var CSS =
*
* Change XBL binding for <object> tags, click to view flash
*/
String.literal`
String.raw`
pseudoembed {
display: inline-block;

32
plugins/http-headers.js
View File

@@ -31,6 +31,9 @@ var Controller = Class("Controller", XPCOM(Ci.nsIController), {
supportsCommand: function (cmd) { return cmd === this.command; },
});
var winMap = new WeakMap();
var docMap = new WeakMap();
var HttpObserver = Class("HttpObserver",
XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]), {
@@ -58,7 +61,11 @@ var HttpObserver = Class("HttpObserver",
getHeaders: function getHeaders(win, request) {
request.QueryInterface(Ci.nsIChannel);
let headers = overlay.getData(win.document, "headers", Object);
let doc = win.document;
let data = docMap.get(doc);
let headers = data && data.headers || {};
if ("response" in headers)
return;
@@ -81,10 +88,9 @@ var HttpObserver = Class("HttpObserver",
}
catch (e) {}
let controller = this.getController(win);
if (controller)
win.controllers.removeController(controller);
win.controllers.appendController(Controller("dactyl-headers", { headers: headers, url: win.document.documentURI }));
let data = { headers: headers, url: doc.documentURI };
winMap.set(win, data);
docMap.set(doc, data);
}
},
@@ -118,27 +124,19 @@ var HttpObserver = Class("HttpObserver",
} catch (e) {}
}
}),
getController: function getController(win) {
for (let i of util.range(0, win.controllers.getControllerCount())) {
let controller = win.controllers.getControllerAt(i);
if (controller.supportsCommand("dactyl-headers") && controller.wrappedJSObject instanceof Controller)
return controller.wrappedJSObject;
}
}
});
let observer = HttpObserver();
let onUnload = observer.closure.cleanup;
let onUnload = observer.bound.cleanup;
function* iterHeaders(buffer, type) {
let win = buffer.focusedFrame;
let store = win.document[overlay.id];
let store = docMap.get(win.document);
if (!store || !store.headers)
store = observer.getController(win);
store = winMap.get(win);
if (store)
for (let [k, v] of values(store.headers[type] || []))
for (let [k, v] of (store.headers[type] || []))
yield [k, v];
}