diff options
| author | hallgren <hallgren@chalmers.se> | 2013-04-12 14:30:27 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2013-04-12 14:30:27 +0000 |
| commit | eb941d6eac5fe17b338c5d3bc6ecda19444c48bd (patch) | |
| tree | cfeef7eeb1f028f9c2518ee607ee1f21e5c1855a | |
| parent | a0d785610d2e426f7d8e1a376cf53870d5f5f98d (diff) | |
minibar/syntax editor integration fixes
When starting from the minibar, the selected set of target languages is now
preserved when switching back and forth.
| -rw-r--r-- | src/www/js/grammar_manager.js | 3 | ||||
| -rw-r--r-- | src/www/minibar/minibar_online.js | 2 | ||||
| -rw-r--r-- | src/www/syntax-editor/editor_menu.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/www/js/grammar_manager.js b/src/www/js/grammar_manager.js index 11d13d71c..474c4b704 100644 --- a/src/www/js/grammar_manager.js +++ b/src/www/js/grammar_manager.js @@ -44,7 +44,8 @@ function GrammarManager(server,opts) { this.grammars=[]; this.grammar_dirs=[]; this.startcat = null; // current startcat - this.languages = []; // current languages (empty means all langs) + this.languages = this.options.initial.languages || []; + // current languages (empty means all langs) /* --- Main program, this gets things going ----------------------------- */ this.init=function(){ diff --git a/src/www/minibar/minibar_online.js b/src/www/minibar/minibar_online.js index 685f9ddb8..c969caa52 100644 --- a/src/www/minibar/minibar_online.js +++ b/src/www/minibar/minibar_online.js @@ -32,7 +32,7 @@ if(window.Editor) // Syntax editor loaded? lin_action: function(new_input,langFrom) { var grammar_url=editor.menu.ui.grammar_menu.value // hmm var startcat=editor.menu.ui.startcat_menu.value // hmm - var toLangs=multiMenuSelections(editor.menu.ui.to_menu) // hmm + var toLangs=gm.languages // hmm minibar.input.set_input_for(grammar_url, {from:langFrom, startcat:startcat, diff --git a/src/www/syntax-editor/editor_menu.js b/src/www/syntax-editor/editor_menu.js index 33ce23ae4..6076db935 100644 --- a/src/www/syntax-editor/editor_menu.js +++ b/src/www/syntax-editor/editor_menu.js @@ -193,7 +193,7 @@ EditorMenu.prototype.update_language_menu=function(menu,grammar) { if(!hasPrefix(ln,"Disamb")) { var lp=langpart(ln,grammar.name); var opt=option(lp,ln); - if (elem(lp, t.gm.options.initial.languages)) { + if (elem(ln, t.gm.languages)) { opt.selected=true; } menu.appendChild(opt); |