Merge branch 'master' into soon

www/common/outer/serviceworker.js

@@ -19,6 +19,8 @@ var debug = function (msg) { console.log(msg); };
 var init = function (client, cb) {
     debug('SW INIT');
 
+    require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) {
+        if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); }
         require([
             '/common/requireconfig.js'
         ], function (RequireConfig) {
@@ -142,6 +144,7 @@ var init = function (client, cb) {
                 };
             });
         });
+    });
 };
 
 self.addEventListener('message', function (e) {

www/common/outer/sharedworker.js

@@ -19,6 +19,8 @@ var debug = function (msg) { console.log(msg); };
 var init = function (client, cb) {
     debug('SharedW INIT');
 
+    require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) {
+        if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); }
         require([
             '/common/requireconfig.js'
         ], function (RequireConfig) {
@@ -143,6 +145,7 @@ var init = function (client, cb) {
                 };
             });
         });
+    });
 };
 
 onconnect = function(e) {

www/common/outer/webworker.js

@@ -7,9 +7,11 @@ localStorage = {
     getItem: function (k) { return localStorage[k]; }
 };
 
-require([
+require(['/api/config?cb=' + (+new Date()).toString(16)], function (ApiConfig) {
+    if (ApiConfig.requireConf) { require.config(ApiConfig.requireConf); }
+    require([
         '/common/requireconfig.js'
-], function (RequireConfig) {
+    ], function (RequireConfig) {
         require.config(RequireConfig());
         require([
             '/common/common-util.js',
@@ -97,4 +99,5 @@ require([
                 msgEv.fire(e);
             };
         });
+    });
 });