gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-09 21:25:44 +01:00
Code Issues Projects Releases Wiki Activity

Do the right thing wrt frames in :pageinfo.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-03 14:35:38 -04:00
parent 504c5a7386
commit 684dd0994d
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/content/buffer.js
View File

@@ -22,8 +22,6 @@ const Buffer = Module("buffer", {
this.pageInfo = {}; this.pageInfo = {};
this.addPageInfoSection("f", "Feeds", function (verbose) { this.addPageInfoSection("f", "Feeds", function (verbose) {
let doc = window.content.document;
const feedTypes = { const feedTypes = {
"application/rss+xml": "RSS", "application/rss+xml": "RSS",
"application/atom+xml": "Atom", "application/atom+xml": "Atom",
@@ -62,15 +60,20 @@ const Buffer = Module("buffer", {
} }
let nFeed = 0; let nFeed = 0;
for (let link in util.evaluateXPath(["link[@href and (@rel='feed' or (@rel='alternate' and @type))]"], doc)) { for (let [i, win] in Iterator(buffer.allFrames())) {
let rel = link.rel.toLowerCase(); let doc = win.document;
let feed = { title: link.title, href: link.href, type: link.type || "" };
if (isValidFeed(feed, doc.nodePrincipal, rel == "feed")) { for (let link in util.evaluateXPath(["link[@href and (@rel='feed' or (@rel='alternate' and @type))]"], doc)) {
nFeed++; let rel = link.rel.toLowerCase();
let type = feedTypes[feed.type] || "RSS"; let feed = { title: link.title, href: link.href, type: link.type || "" };
if (verbose) if (isValidFeed(feed, doc.nodePrincipal, rel == "feed")) {
yield [feed.title, template.highlightURL(feed.href, true) + <span class="extra-info">&#xa0;({type})</span>]; nFeed++;
let type = feedTypes[feed.type] || "RSS";
if (verbose)
yield [feed.title, template.highlightURL(feed.href, true) + <span class="extra-info">&#xa0;({type})</span>];
}
} }
} }
if (!verbose && nFeed) if (!verbose && nFeed)
@@ -78,7 +81,7 @@ const Buffer = Module("buffer", {
}); });
this.addPageInfoSection("g", "General Info", function (verbose) { this.addPageInfoSection("g", "General Info", function (verbose) {
let doc = window.content.document; let doc = buffer.focusedFrame.document;
// get file size // get file size
const ACCESS_READ = Ci.nsICache.ACCESS_READ; const ACCESS_READ = Ci.nsICache.ACCESS_READ;
@@ -134,7 +137,7 @@ const Buffer = Module("buffer", {
this.addPageInfoSection("m", "Meta Tags", function (verbose) { this.addPageInfoSection("m", "Meta Tags", function (verbose) {
// get meta tag data, sort and put into pageMeta[] // get meta tag data, sort and put into pageMeta[]
let metaNodes = window.content.document.getElementsByTagName("meta"); let metaNodes = buffer.focusedFrame.document.getElementsByTagName("meta");
return Array.map(metaNodes, function (node) [(node.name || node.httpEquiv), template.highlightURL(node.content)]) return Array.map(metaNodes, function (node) [(node.name || node.httpEquiv), template.highlightURL(node.content)])
.sort(function (a, b) util.compareIgnoreCase(a[0], b[0])); .sort(function (a, b) util.compareIgnoreCase(a[0], b[0]));
@@ -305,7 +308,7 @@ const Buffer = Module("buffer", {
* buffer. Only returns style sheets for the 'screen' media type. * buffer. Only returns style sheets for the 'screen' media type.
*/ */
get alternateStyleSheets() { get alternateStyleSheets() {
let stylesheets = window.getAllStyleSheets(window.content); let stylesheets = window.getAllStyleSheets(buffer.focusedFrame);
return stylesheets.filter( return stylesheets.filter(
function (stylesheet) /^(screen|all|)$/i.test(stylesheet.media.mediaText) && !/^\s*$/.test(stylesheet.title) function (stylesheet) /^(screen|all|)$/i.test(stylesheet.media.mediaText) && !/^\s*$/.test(stylesheet.title)