summaryrefslogtreecommitdiff
path: root/src/www/syntax-editor
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2013-04-04 14:04:31 +0000
committerhallgren <hallgren@chalmers.se>2013-04-04 14:04:31 +0000
commit3c244ff27f015df6cfa918c9ba3e192f4d5b62ff (patch)
tree6dcc6016bd180b863cd5136d0f9ea1646b566799 /src/www/syntax-editor
parenta22a419bc7ea0dc45f9965e6ffebf42417212d52 (diff)
minibar/syntax editor integration improvements
Work in progress on preserving the start category and selected target languages when switching between the minibar and the syntax editor.
Diffstat (limited to 'src/www/syntax-editor')
-rw-r--r--src/www/syntax-editor/editor.html1
-rw-r--r--src/www/syntax-editor/editor_menu.js7
-rw-r--r--src/www/syntax-editor/editor_online.js5
3 files changed, 6 insertions, 7 deletions
diff --git a/src/www/syntax-editor/editor.html b/src/www/syntax-editor/editor.html
index 9780c24f8..8ebc9a919 100644
--- a/src/www/syntax-editor/editor.html
+++ b/src/www/syntax-editor/editor.html
@@ -24,6 +24,7 @@
<!-- Common -->
<script type="text/javascript" src="../js/grammar_manager.js"></script>
<script type="text/javascript" src="../js/support.js"></script>
+ <script type="text/JavaScript" src="../js/localstorage.js"></script>
<script type="text/javascript" src="../js/pgf_online.js"></script>
<!-- Editor -->
diff --git a/src/www/syntax-editor/editor_menu.js b/src/www/syntax-editor/editor_menu.js
index ea20710a4..33ce23ae4 100644
--- a/src/www/syntax-editor/editor_menu.js
+++ b/src/www/syntax-editor/editor_menu.js
@@ -77,12 +77,7 @@ function EditorMenu(editor,opts) {
if (t.options.show_to_menu) {
appendChildren(t.container, [text(" To: "), t.ui.to_toggle, t.ui.to_menu]);
t.ui.to_menu.onchange = function(){
- var languages = new Array();
- for (i in t.ui.to_menu.options) {
- var opt = t.ui.to_menu.options[i];
- if (opt.selected)
- languages.push(opt.value);
- }
+ var languages = multiMenuSelections(t.ui.to_menu)
t.gm.change_languages(languages);
}
}
diff --git a/src/www/syntax-editor/editor_online.js b/src/www/syntax-editor/editor_online.js
index 913bec05a..dc2325737 100644
--- a/src/www/syntax-editor/editor_online.js
+++ b/src/www/syntax-editor/editor_online.js
@@ -35,8 +35,11 @@ if(window.Minibar) // Minibar loaded?
initial_grammar: editor.menu.ui.grammar_menu.value, // hmm
initial: {
from: langFrom,
- input: s.split(" ") // is it that easy?
+ input: s.split(" "), // is it that easy?
+ startcat: editor.menu.ui.startcat_menu.value // hmm
},
+ initial_toLangs: multiMenuSelections(editor.menu.ui.to_menu), // hmm
+
// get us back to the editor!
abstract_action: function(tree) {
var opts = {