diff options
author | Doug Kearns <dougkearns@gmail.com> | 2011-01-23 17:12:37 +1100 |
---|---|---|
committer | Doug Kearns <dougkearns@gmail.com> | 2011-01-23 17:12:37 +1100 |
commit | 79247daec78b71b5c56b7987ccd86a032d5390f6 (patch) | |
tree | d334a84e799a78228bc17c1cddd50a85fa9dc00b /common | |
parent | 7d50100d67a5ef82c80cb30a4b80df38d80fde95 (diff) | |
download | pentadactyl-79247daec78b71b5c56b7987ccd86a032d5390f6.tar.gz |
Don't output blank lines for empty pageinfo sections.
Diffstat (limited to 'common')
-rw-r--r-- | common/content/buffer.js | 9 | ||||
-rw-r--r-- | common/modules/template.jsm | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/common/content/buffer.js b/common/content/buffer.js index abbfb23c..21008477 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -486,7 +486,7 @@ var Buffer = Module("buffer", { * section's output. */ addPageInfoSection: function addPageInfoSection(option, title, func) { - this.pageInfo[option] = [func, title]; + this.pageInfo[option] = [func, title]; // TODO: are these reversed intentionally? --djk }, /** @@ -1023,10 +1023,9 @@ var Buffer = Module("buffer", { return; } - let option = sections || options["pageinfo"]; - let list = template.map(option, function (option) { - let opt = buffer.pageInfo[option]; - return opt ? template.table(opt[1], opt[0](true)) : undefined; + let list = template.map(sections || options["pageinfo"], function (option) { + let [data, title] = buffer.pageInfo[option]; + return template.table(title, data(true)); }, <br/>); dactyl.echo(list, commandline.FORCE_MULTILINE); }, diff --git a/common/modules/template.jsm b/common/modules/template.jsm index 483cc1d8..91b6613b 100644 --- a/common/modules/template.jsm +++ b/common/modules/template.jsm @@ -292,7 +292,6 @@ var Template = Module("Template", { // </e4x> if (table.tr.length() > 1) return table; - return XML(); }, tabular: function tabular(headings, style, iter) { |