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

syntax editor + minibar: fix bug with repeated switching back and forth

Browse Source 
By avoiding "this" in callback functions, the code can be kept cleaner.
This commit is contained in:
hallgren
2012-11-23 13:15:16 +00:00
parent 3ae7f0df0e
commit fe9b368b90
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ function Minibar(server,opts) {
/* --- Creating the components of the minibar --------------------------- */ /* --- Creating the components of the minibar --------------------------- */
this.translations=new Translations(server,this.options) this.translations=new Translations(server,this.options)
this.translations.minibar=this; // ref to parent
this.input=new Input(server,this.translations,this.options) this.input=new Input(server,this.translations,this.options)
/* --- Creating user interface elements --------------------------------- */ /* --- Creating user interface elements --------------------------------- */

3
src/www/minibar/minibar_translations.js
View File

@@ -103,8 +103,7 @@ Translations.prototype.show_translations=function(translationResults) {
var tbody=empty("tbody"); var tbody=empty("tbody");
if(options.show_abstract && t.tree) { if(options.show_abstract && t.tree) {
function abs_act() { function abs_act() {
var minibar = self.minibar; self.options.abstract_action(t.tree)
bind(self.options.abstract_action,minibar)(t.tree)
} }
var abs_hdr = options.abstract_action var abs_hdr = options.abstract_action
? button("Abstract",abs_act) ? button("Abstract",abs_act)

9
src/www/syntax-editor/editor_online.js
View File

@@ -35,7 +35,7 @@ if(window.Minibar) // Minibar loaded?
}, },
// get us back to the editor! // get us back to the editor!
abstract_action: function(tree) { abstract_action: function(tree) {
var minibar=this; //var minibar=this;
// how to get hold of new minibar? // how to get hold of new minibar?
var editor_options = { var editor_options = {
target: "editor", target: "editor",
@@ -45,13 +45,14 @@ if(window.Minibar) // Minibar loaded?
abstr: tree abstr: tree
} }
} }
minibar.hide(); editor.minibar.hide();
minibar.editor.show(); editor.show();
} }
} }
editor.hide(); editor.hide();
editor.minibar=new Minibar(server,minibar_options); editor.minibar=new Minibar(server,minibar_options);
editor.minibar.editor = editor; // :S //editor.minibar.editor = editor; // :S
editor.minibar.show()
} }
if(/^\?\/tmp\//.test(location.search)) { if(/^\?\/tmp\//.test(location.search)) {
var args=decodeURIComponent(location.search.substr(1)).split(" ") var args=decodeURIComponent(location.search.substr(1)).split(" ")