GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-24 03:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

minibar/syntax editor integration fixes

Browse Source 
When starting from the minibar, the selected set of target languages is now
preserved when switching back and forth.
This commit is contained in:
hallgren
2013-04-12 14:30:27 +00:00
parent 965adf74d6
commit 95e68117a9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/www/js/grammar_manager.js
View File

@@ -44,7 +44,8 @@ function GrammarManager(server,opts) {
this.grammars=[]; this.grammars=[];
this.grammar_dirs=[]; this.grammar_dirs=[];
this.startcat = null; // current startcat 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 ----------------------------- */ /* --- Main program, this gets things going ----------------------------- */
this.init=function(){ this.init=function(){

2
src/www/minibar/minibar_online.js
View File

@@ -32,7 +32,7 @@ if(window.Editor) // Syntax editor loaded?
lin_action: function(new_input,langFrom) { lin_action: function(new_input,langFrom) {
var grammar_url=editor.menu.ui.grammar_menu.value // hmm var grammar_url=editor.menu.ui.grammar_menu.value // hmm
var startcat=editor.menu.ui.startcat_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, minibar.input.set_input_for(grammar_url,
{from:langFrom, {from:langFrom,
startcat:startcat, startcat:startcat,

2
src/www/syntax-editor/editor_menu.js
View File

@@ -193,7 +193,7 @@ EditorMenu.prototype.update_language_menu=function(menu,grammar) {
if(!hasPrefix(ln,"Disamb")) { if(!hasPrefix(ln,"Disamb")) {
var lp=langpart(ln,grammar.name); var lp=langpart(ln,grammar.name);
var opt=option(lp,ln); var opt=option(lp,ln);
if (elem(lp, t.gm.options.initial.languages)) { if (elem(ln, t.gm.languages)) {
opt.selected=true; opt.selected=true;
} }
menu.appendChild(opt); menu.appendChild(opt);