merging develop

momjs · Jun 17, 2015 · 68da8b8 · 68da8b8
2 parents 71dceab + 417a611
commit 68da8b8
Showing 1 changed file with 28 additions and 27 deletions.
diff --git a/src/moduleSystem/settings.js b/src/moduleSystem/settings.js
@@ -1,30 +1,35 @@
 /*exported settingsCreator */
 function settingsCreator() {
-   'use strict';
-
-   var settings = {
-      rootNode: document,
-      defaultScope: constants.scope.multiInstance,
-      moduleSettingsSelector: 'script[type="%name%/settings"],script[type="true/%name%/settings"]',
-      partSettingsSelector: 'head script[type="%name%/settings"]',
-      attribute: 'modules',
-      selector: '[%attribute%]',
-      domMutationSupport: false,
-      customIdAttribute: 'mom-id'
-   };
-
-
-   function init() {
-      settings.actualSelector = replacePlaceholder(settings.selector, 'attribute', settings.attribute);
-      settings.mergeWith = mergeWith;
-      settings.getModuleSettingsSelector = getModuleSettingsSelelector;
-      settings.getPartSettingsSelector = getPartSettingsSelector;
-   }
+  'use strict';
 
+  var settings = {
+    rootNode: document,
+    defaultScope: constants.scope.multiInstance,
+    moduleSettingsSelector: 'script[type="%name%/settings"],script[type="true/%name%/settings"]',
+    partSettingsSelector: 'head script[type="%name%/settings"]',
+    attribute: 'modules',
+    selector: '[%attribute%]',
+    domMutationSupport: false,
+    customIdAttribute: 'mom-id'
+  };
 
-   function getModuleSettingsSelelector(moduleName) {
-      return replacePlaceholder(settings.moduleSettingsSelector, 'name', moduleName);
-   }
+  init();
+
+  return settings;
+
+  //////////////////////////////////////////////////////////
+
+  function init() {
+    settings.actualSelector = replacePlaceholder(settings.selector, 'attribute', settings.attribute);
+    settings.mergeWith = mergeWith;
+    settings.getModuleSettingsSelector = getModuleSettingsSelelector;
+    settings.getPartSettingsSelector = getPartSettingsSelector;
+  }
+
+
+  function getModuleSettingsSelelector(moduleName) {
+    return replacePlaceholder(settings.moduleSettingsSelector, 'name', moduleName);
+  }
 
    function getPartSettingsSelector(partName) {
       return replacePlaceholder(settings.partSettingsSelector, 'name', partName);
@@ -48,8 +53,4 @@ function settingsCreator() {
       merge(settings, newSettings);
       init();
    }
-
-   init();
-
-   return settings;
 }