diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app.js | 1 | ||||
| -rw-r--r-- | src/client/main.js | 4 | ||||
| -rw-r--r-- | src/client/model/graph.js | 4 | ||||
| -rw-r--r-- | src/client/rz_api_backend.js | 2 | ||||
| -rw-r--r-- | src/client/rz_core.js | 4 | ||||
| -rw-r--r-- | src/client/rz_mesh.js | 2 | ||||
| -rw-r--r-- | src/client/textanalysis.ui.js | 4 |
7 files changed, 10 insertions, 11 deletions
diff --git a/src/client/app.js b/src/client/app.js index dd2b034a..b0485090 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -5,7 +5,6 @@ 'socketio': { exports: 'io' }, }, paths: { - rz_config: '/rz_config', autocomplete: lib_path + 'autocomplete', caret: lib_path + 'caret', Bacon: lib_path + 'Bacon', diff --git a/src/client/main.js b/src/client/main.js index 0b728f95..42d22aff 100644 --- a/src/client/main.js +++ b/src/client/main.js @@ -1,5 +1,5 @@ -define(['textanalysis.ui', 'textanalysis', 'buttons', 'history', 'drag_n_drop', 'robot', 'model/core', 'rz_config', 'rz_core', 'view/selection', 'util', 'view/search', 'feedback'], -function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop, robot, model_core, rz_config, rz_core, selection, util, search, feedback) { +define(['textanalysis.ui', 'textanalysis', 'buttons', 'history', 'drag_n_drop', 'robot', 'model/core', 'rz_core', 'view/selection', 'util', 'view/search', 'feedback'], +function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop, robot, model_core, rz_core, selection, util, search, feedback) { function expand(obj){ if (!obj.savesize) { diff --git a/src/client/model/graph.js b/src/client/model/graph.js index 4e8673e5..d163e406 100644 --- a/src/client/model/graph.js +++ b/src/client/model/graph.js @@ -1,7 +1,7 @@ "use strict" -define(['Bacon', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history', 'rz_config'], -function (Bacon, consts, util, model_core, model_util, model_diff, rz_api_backend, rz_api_mesh, history, rz_config) { +define(['Bacon', 'consts', 'util', 'model/core', 'model/util', 'model/diff', 'rz_api_backend', 'rz_api_mesh', 'history'], +function (Bacon, consts, util, model_core, model_util, model_diff, rz_api_backend, rz_api_mesh, history) { var debug = false; diff --git a/src/client/rz_api_backend.js b/src/client/rz_api_backend.js index 740304e7..9f59b8a1 100644 --- a/src/client/rz_api_backend.js +++ b/src/client/rz_api_backend.js @@ -3,7 +3,7 @@ /** * API calls designed to execute against a local backend service */ -define([ 'rz_config' ], function(rz_config) { +define([], function() { function RZ_API_Backend() { diff --git a/src/client/rz_core.js b/src/client/rz_core.js index 103b62c6..8251659d 100644 --- a/src/client/rz_core.js +++ b/src/client/rz_core.js @@ -1,7 +1,7 @@ "use strict" -define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/helpers', 'view/view', 'rz_observer', 'view/selection', 'rz_config', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input'], -function($, d3, consts, rz_bus, util, model_graph, model_core, view_helpers, view, rz_observer, selection, rz_config, rz_mesh, model_diff, graph_view, svg_input) { +define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/helpers', 'view/view', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input'], +function($, d3, consts, rz_bus, util, model_graph, model_core, view_helpers, view, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input) { var addednodes = [], vis, diff --git a/src/client/rz_mesh.js b/src/client/rz_mesh.js index 64895713..f452a833 100644 --- a/src/client/rz_mesh.js +++ b/src/client/rz_mesh.js @@ -3,7 +3,7 @@ /** * Manage backend websocket connection */ -define([ 'rz_config', 'util', 'model/diff', 'model/util', 'socketio'], function(rz_config, util, model_diff, model_util, io) { +define([ 'util', 'model/diff', 'model/util', 'socketio'], function(util, model_diff, model_util, io) { var ws_server_url = 'http://%h:%p/graph'; // socketio namespace ws_server_url = ws_server_url.replace('%h', rz_config.rz_server_host); diff --git a/src/client/textanalysis.ui.js b/src/client/textanalysis.ui.js index ba9a466c..b330d98b 100644 --- a/src/client/textanalysis.ui.js +++ b/src/client/textanalysis.ui.js @@ -1,7 +1,7 @@ "use strict" -define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'rz_config', 'textanalysis', 'view/completer', 'util'], -function($, Bacon, consts, rz_bus, rz_core, rz_config, textanalysis, completer, util) { +define(['jquery', 'Bacon', 'consts', 'rz_bus', 'rz_core', 'textanalysis', 'view/completer', 'util'], +function($, Bacon, consts, rz_bus, rz_core, textanalysis, completer, util) { var text = "", // Last text of sentence element_name = '#textanalyser', |
