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

Add a conditional clause because conditional clauses are awesome.

Browse Source
This commit is contained in:
Kris Maglione
2011-10-03 22:52:22 -04:00
parent 54357e1f22
commit 1afa56335d
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/commandline.js
View File

@@ -1208,7 +1208,8 @@ var CommandLine = Module("commandline", {
else if (!this.waiting) { else if (!this.waiting) {
let cursor = this.selected; let cursor = this.selected;
if (cursor && cursor[0] == context) { if (cursor && cursor[0] == context) {
if (cursor[1] >= context.items.length) { if (cursor[1] >= context.items.length
|| this.completion != context.items[cursor[1]].result) {
this.selected = null; this.selected = null;
this.itemList.select(null); this.itemList.select(null);
} }

13
common/modules/config.jsm
View File

@@ -259,11 +259,14 @@ var ConfigBase = Class("ConfigBase", {
} }
function processJar(file) { function processJar(file) {
let jar = services.ZipReader(file); let jar = services.ZipReader(file);
if (jar) { if (jar)
if (jar.hasEntry("chrome.manifest")) try {
process(File.readStream(jar.getInputStream("chrome.manifest"))); if (jar.hasEntry("chrome.manifest"))
jar.close(); process(File.readStream(jar.getInputStream("chrome.manifest")));
} }
finally {
jar.close();
}
} }
for each (let dir in ["UChrm", "AChrom"]) { for each (let dir in ["UChrm", "AChrom"]) {