msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

minibar: fix bug that prevented minibar from working in Webkit browsers

Browse Source 
The with(...) {...} statement has different scoping rules in Webkit browsers
and Gecko browsers, so it is better to avoid it.
This commit is contained in:
hallgren
2013-04-25 14:55:24 +00:00
parent 5612fcfacf
commit debe305484
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/www/minibar/minibar.js
View File

@@ -153,17 +153,17 @@ Minibar.prototype.show_grammarlist=function(dir,grammar_names,dir_count) {
t.grammars=[]; t.grammars=[];
t.grammar_dirs=[]; t.grammar_dirs=[];
} }
with(t) {
grammar_dirs.push(dir); t.grammar_dirs.push(dir);
grammars=grammars.concat(grammar_names.map(function(g){return dir+g})) t.grammars=t.grammars.concat(grammar_names.map(function(g){return dir+g}))
function glabel(g) { function glabel(g) {
return hasPrefix(dir,"/tmp/gfse.") ? "gfse: "+g : g return hasPrefix(dir,"/tmp/gfse.") ? "gfse: "+g : g
} }
function opt(g) { return option(glabel(g),dir+g); } function opt(g) { return option(glabel(g),dir+g); }
appendChildren(grammar_menu,map(opt,grammar_names)); appendChildren(t.grammar_menu,map(opt,grammar_names));
function pick() { function pick() {
var grammar_url=grammar_menu.value var grammar_url=t.grammar_menu.value
local.put("last_grammar",grammar_url) t.local.put("last_grammar",grammar_url)
t.select_grammar(grammar_url); t.select_grammar(grammar_url);
} }
function pick_first_grammar() { function pick_first_grammar() {
@@ -176,7 +176,7 @@ Minibar.prototype.show_grammarlist=function(dir,grammar_names,dir_count) {
} }
var grammar0=t.options.initial_grammar var grammar0=t.options.initial_grammar
if(!grammar0) { if(!grammar0) {
var last_grammar=local.get("last_grammar"); var last_grammar=t.local.get("last_grammar");
if(last_grammar && elem(last_grammar,t.grammars)) if(last_grammar && elem(last_grammar,t.grammars))
grammar0=last_grammar; grammar0=last_grammar;
} }
@@ -187,7 +187,7 @@ Minibar.prototype.show_grammarlist=function(dir,grammar_names,dir_count) {
// Wait at most 1.5s before showing the grammar menu. // Wait at most 1.5s before showing the grammar menu.
if(first_time) t.timeout=setTimeout(pick_first_grammar,1500); if(first_time) t.timeout=setTimeout(pick_first_grammar,1500);
if(t.grammar_dirs.length>=dir_count) pick_first_grammar(); if(t.grammar_dirs.length>=dir_count) pick_first_grammar();
}
} }
Minibar.prototype.select_grammar=function(grammar_url) { Minibar.prototype.select_grammar=function(grammar_url) {