diff options
| -rw-r--r-- | scripts/main.js | 35 | ||||
| -rw-r--r-- | scripts/rz_core.js | 8 |
2 files changed, 23 insertions, 20 deletions
diff --git a/scripts/main.js b/scripts/main.js index bc246925..67213056 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -1,13 +1,24 @@ -define('main', ['rz_core', 'textanalysis.ui', 'buttons', 'history', 'drag_n_drop', 'robot'], -function(RZ, textanalysis_ui, buttons, history, drag_n_drop, robot) { -return { -main: function() { - console.log('Rhizi main started'); - drag_n_drop.init(); - $('#editname').onkeyup = function() { RZ.expand(this); }; - $('#editlinkname').onkeyup = function() { RZ.expand(this); }; - $('#textanalyser').onkeyup = function() { RZ.expand(this); }; +define(['textanalysis.ui', 'buttons', 'history', 'drag_n_drop', 'robot'], +function(textanalysis_ui, buttons, history, drag_n_drop, robot) { - textanalysis_ui.main(); -}}; -}); + function expand(obj){ + if (!obj.savesize) { + obj.savesize = obj.size; + } + obj.size = Math.max(obj.savesize, obj.value.length); + } + + this.main = function() { + console.log('Rhizi main started'); + drag_n_drop.init(); + $('#editname').onkeyup = function() { expand(this); }; + $('#editlinkname').onkeyup = function() { expand(this); }; + $('#textanalyser').onkeyup = function() { expand(this); }; + + textanalysis_ui.main(); + } + + return { + main: main }; + } +); diff --git a/scripts/rz_core.js b/scripts/rz_core.js index e4a2a3f4..a4d5c323 100644 --- a/scripts/rz_core.js +++ b/scripts/rz_core.js @@ -717,18 +717,10 @@ function customSize(type) { return size; } -function expand(obj){ - if (!obj.savesize) { - obj.savesize = obj.size; - } - obj.size = Math.max(obj.savesize, obj.value.length); -} - window.graph = graph; window.force = force; return { - expand: expand, graph: graph, force: force, load_from_json: function(result) { |