diff options
| author | LV-426 <lv-426@taproot.org.il> | 2014-11-19 03:20:36 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2014-11-25 15:08:59 +0200 |
| commit | 356b1785c8e257ec7d161d44495c1e1e724e7291 (patch) | |
| tree | 1f5c08b267c8b2931c7e260a284af7d1587f9fe6 /src/main.js | |
| parent | 5f4c3dbd58d99ddfad18ac22dcbece9ef7698042 (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.js | 9 |
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 }; } |
