Merge remote-tracking branch 'origin/develop' into inject-globals

momjs · Jun 17, 2015 · d368678 · d368678
2 parents 68da8b8 + 7ba9cee
commit d368678
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Especially usefull for Content Management Systems (CMS):
 How To Use
 ----------
 ###Parts
-Utility functions like z.B AJAX loader etc.
+Utility functions like e.g. AJAX loader etc.
 ####Creation and registration
 
 ####Creator Parts

diff --git a/src/moduleSystem/settings.js b/src/moduleSystem/settings.js
@@ -31,26 +31,26 @@ function settingsCreator() {
     return replacePlaceholder(settings.moduleSettingsSelector, 'name', moduleName);
   }
 
-   function getPartSettingsSelector(partName) {
-      return replacePlaceholder(settings.partSettingsSelector, 'name', partName);
-   }
+  function getPartSettingsSelector(partName) {
+    return replacePlaceholder(settings.partSettingsSelector, 'name', partName);
+  }
 
-   function replacePlaceholder(text, placeholder, value) {
-      var actualPlaceholder = '%' + placeholder + '%',
-         regEx,
-         result = text;
+  function replacePlaceholder(text, placeholder, value) {
+    var actualPlaceholder = '%' + placeholder + '%';
+    var regEx;
+    var result = text;
 
-      if (stringContains(text, actualPlaceholder)) {
-         regEx = new RegExp(actualPlaceholder, 'g');
+    if (stringContains(text, actualPlaceholder)) {
+      regEx = new RegExp(actualPlaceholder, 'g');
 
-         result = text.replace(regEx, value);
-      }
+      result = text.replace(regEx, value);
+    }
 
       return result;
    }
 
-   function mergeWith(newSettings) {
-      merge(settings, newSettings);
-      init();
-   }
+  function mergeWith(newSettings) {
+    merge(settings, newSettings);
+    init();
+  }
 }