From edf91a5ab2a6afa88999403af5b11b722bb0b378 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Tue, 17 Feb 2015 12:52:24 +0200 Subject: client/server: support optimizing with require.js using node run r.js built is controlled by property do-client-optimize which defaults to false. Even if the optimized main is built (single file main-built.js and source map file main-built.js.map) they are not used unless rhizi-config.conf client_optimize is set to True which causes app.js to use main-built.js and not main.js The resulting file is 687 KiloBytes large. Pretty scary, but it still loads faster this way. (from very small tests locally). This is without compression done by the server. --- src/server/rz_api.py | 3 ++- src/server/rz_server.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/rz_api.py b/src/server/rz_api.py index 738174ec..e53f19cd 100644 --- a/src/server/rz_api.py +++ b/src/server/rz_api.py @@ -154,4 +154,5 @@ def index(): return render_template('index.html', rz_username=rz_username, rz_config__hostname=hostname, - rz_config__port=port) + rz_config__port=port, + rz_config__optimized_main='true' if current_app.rz_config.optimized_main else 'false') diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 20f0b30f..6868317f 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -57,6 +57,9 @@ class Config(object): cfg['static_url_path'] = '/static' cfg['user_db_path'] = os.path.join(cfg['config_dir'], 'user_db.db') + # client configuration + cfg['optimized_main'] = False + # Mail settings cfg['mail_hostname'] = 'localhost' cfg['mail_port'] = 25 -- cgit v1.3.1