summaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2014-11-19 03:20:36 +0200
committerAlon Levy <alon@pobox.com>2014-11-19 23:23:40 +0200
commitd93874113319d07ed36200da85888a92a4257e22 (patch)
tree22eef2a5cd244b09bad5cb403881069ce61bb458 /src/main.js
parent0027ec34a90f1d22523c16ffa533a1c3b052c358 (diff)
add rz_config, provide id generation scheme control: hash/seq, defaulting to seq
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main.js b/src/main.js
index b55a3a3d..bfe81eb0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,5 @@
-define(['jquery', 'textanalysis.ui', 'buttons', 'history', 'drag_n_drop', 'robot', 'rz_core'],
-function($, textanalysis_ui, buttons, history, drag_n_drop, robot, rz_core) {
+define(['textanalysis.ui', 'buttons', 'history', 'drag_n_drop', 'robot', 'model/core', 'rz_config', 'rz_core'],
+function(textanalysis_ui, buttons, history, drag_n_drop, robot, model_core, rz_config, rz_core) {
function getParameterByName(name) {
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
@@ -25,13 +25,16 @@ function($, textanalysis_ui, buttons, history, drag_n_drop, robot
$('#textanalyser').onkeyup = function() { expand(this); };
textanalysis_ui.main();
+
// TODO: jquery BBQ: $.deparam.querystring().json;
json = getParameterByName('json');
if (json) {
rz_core.load_from_json(json);
}
+ // TODO: interaction between the hack above and this
+ model_core.init(rz_config);
}
-
+
return {
main: main };
}