diff options
| author | Alon Levy <alon@pobox.com> | 2015-01-12 11:41:12 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-01-12 11:42:31 +0200 |
| commit | 2974f916df0614c892a94d3e0f192e10aa03b0b6 (patch) | |
| tree | 6e37a43df327af8856fde74bc69251d83e6f171a /src | |
| parent | f6def5675506a35d8be6461411de4626fb71f29e (diff) | |
server/client: s/res/static/, drop dev_mode__resend_from_static
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app.js | 2 | ||||
| -rw-r--r-- | src/server/rz_server.py | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/src/client/app.js b/src/client/app.js index 4d15f342..4bb762d5 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -1,5 +1,5 @@ (function() { - var lib_path = '/res/lib/'; + var lib_path = '/static/lib/'; var config = { shim: { 'socketio': { exports: 'io' }, diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 64a85588..e8fec231 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -166,19 +166,6 @@ def init_rest_interface(cfg, flask_webapp): redirector.func_name = 'redirector_%s' % path.replace('/', '_') return (path, redirector, flask_args) - def dev_mode__resend_from_static(static_url): - """ - redirect static links while in dev mode: - - /res/<path> -> <path> - """ - static_folder = flask.current_app.static_folder - - new_req_path = None - if request.path.startswith('/res/'): - # turn absolute/res/... URLs to static-folder relative - new_req_path = request.path.replace('/res/', '') - return send_from_directory(static_folder, new_req_path) - def login_decorator(f): """ [!] security boundary: asserd logged-in user before executing REST api call @@ -209,15 +196,6 @@ def init_rest_interface(cfg, flask_webapp): rest_entry('/monitor/server-info', rz_api.monitor__server_info), ] - if cfg.development_mode: - dev_path_set = ['/static', '/res'] - rest_dev_entry_set = [] - for dev_path in dev_path_set: - rest_dev_entry_set.append(rest_entry(dev_path + '/<path:static_url>', - dev_mode__resend_from_static, - {'methods': ['GET']})) - rest_entry_set += rest_dev_entry_set - for re_entry in rest_entry_set: rest_path, f, flask_args = re_entry |