diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-12 17:27:46 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-13 08:36:09 +0200 |
| commit | 96534de0c0dceefde8795e879927c5bedbdaa858 (patch) | |
| tree | 0c063105fe64f72b90dcf02bb55c0ad2ea4fd2ac /src/client | |
| parent | 118e82810eb87d056d0fdd938dc3d598d0b53ccb (diff) | |
add feedback - no email yet, just client side plus server parse client post
Notes:
* using https://github.com/ivoviz/feedback
+ commit 337a8146e567a06035fb1f1ffedfce083be2a2d1
* with tiny changes to use require.js:
+ html2canvas.js & feedback.js (not minified) start+end lines
changed to call define
+ feedback.js changed to not load html2canvas since require.js does
that for us (dropping _html2canvas and getScript usage)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app.js | 4 | ||||
| -rw-r--r-- | src/client/main.js | 5 | ||||
| -rw-r--r-- | src/client/rz_config.js | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/client/app.js b/src/client/app.js index 4bb762d5..b0485090 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -12,7 +12,9 @@ FileSaver: lib_path + 'FileSaver', jquery: lib_path + 'jquery', 'jquery-ui': lib_path + 'jquery-ui', - socketio: lib_path + '/socket.io/socket.io.min_0.9.10', + socketio: lib_path + 'socket.io/socket.io.min_0.9.10', + html2canvas: lib_path + 'html2canvas', + feedback: lib_path + 'feedback', } } diff --git a/src/client/main.js b/src/client/main.js index 5c837b75..4d83fbde 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'], -function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop, robot, model_core, rz_config, rz_core, selection, util, search) { +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) { function expand(obj){ if (!obj.savesize) { @@ -74,6 +74,7 @@ function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop, model_core.init(rz_config); textanalysis.init(rz_core.main_graph); search.init(); + $.feedback({ajaxURL: rz_config.feedback_url}); } return { diff --git a/src/client/rz_config.js b/src/client/rz_config.js index 2258a77a..858fbf18 100644 --- a/src/client/rz_config.js +++ b/src/client/rz_config.js @@ -6,5 +6,6 @@ define(function() { 'rz_server_port': '8080', 'backend_enabled': true, 'backend__maintain_ws_connection': false, + 'feedback_url': '/feedback', }; }); |