Rename applyUserSettings to applySiteSettings

spec/utils.js

@@ -6,7 +6,7 @@
 
     return describe("Converse.js Utilities", function() {
 
-        it("applyUserSettings: recursively applies user settings", function () {
+        it("applySiteSettings: recursively applies user settings", function () {
             var context = {};
             var settings = {
                 show_toolbar: true,
@@ -37,7 +37,7 @@
                     'invalid': false 
                 }
             };
-            utils.applyUserSettings(context, settings, user_settings);
+            utils.applySiteSettings(context, settings, user_settings);
 
             expect(context.something_else).toBeUndefined();
             expect(context.show_toolbar).toBeFalsy();
@@ -56,7 +56,7 @@
                     'toggle_occupants': true
                 }
             };
-            utils.applyUserSettings(context, settings, user_settings);
+            utils.applySiteSettings(context, settings, user_settings);
             expect(_.keys(context.visible_toolbar_buttons)).toEqual(_.keys(settings.visible_toolbar_buttons));
             expect(context.visible_toolbar_buttons.toggle_occupants).toBeTruthy();
         });

src/headless/converse-core.js

@@ -533,7 +533,7 @@ const api = _converse.api = {
         update (settings) {
             u.merge(DEFAULT_SETTINGS, settings);
             u.merge(_converse, settings);
-            u.applyUserSettings(_converse, settings, _converse.user_settings);
+            u.applySiteSettings(_converse, settings, _converse.site_settings);
         },
 
         /**
@@ -1594,7 +1594,7 @@ function initSettings (settings) {
     // Allow only whitelisted configuration attributes to be overwritten
     assignIn(_converse.settings, pick(settings, Object.keys(DEFAULT_SETTINGS)));
     assignIn(_converse, _converse.settings);
-    _converse.user_settings = settings; // XXX: See whether _converse can be removed
+    _converse.site_settings = settings;
 }
 
 

src/headless/utils/core.js

@@ -235,7 +235,7 @@ u.merge = function merge (first, second) {
     }
 };
 
-u.applyUserSettings = function applyUserSettings (context, settings, user_settings) {
+u.applySiteSettings = function applySiteSettings (context, settings, user_settings) {
     /* Configuration settings might be nested objects. We only want to
      * add settings which are whitelisted.
      */
@@ -244,7 +244,7 @@ u.applyUserSettings = function applyUserSettings (context, settings, user_settin
             continue;
         }
         if (isObject(settings[k]) && !Array.isArray(settings[k])) {
-            applyUserSettings(context[k], settings[k], user_settings[k]);
+            applySiteSettings(context[k], settings[k], user_settings[k]);
         } else {
             context[k] = user_settings[k];
         }