Merge branch 'develop' into gh-pages

nominalaeon · Oct 18, 2017 · da5b19d · da5b19d
2 parents bd39a46 + 55dc0e4
commit da5b19d
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 191 deletions.
diff --git a/bower.json b/bower.json
@@ -6,7 +6,7 @@
         "email": "[email protected]",
         "homepage": "http://rodenbeek.com"
     }],
-    "version": "0.1.3",
+    "version": "0.1.4",
 
     "homepage": "https://github.com/nominalaeon/french-dip",
     "ignore": [

diff --git a/french-dip.js b/french-dip.js
@@ -1,37 +1,30 @@
-(function(root, factory) {
-  'use strict';
 
-  if (typeof define === 'function' && define.amd) {
-    define(['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    module.exports = factory(exports);
-  } else {
-    factory(root || {});
-  }
-}(this, function(root) {
+(function () {
   /**
    * 
    * A flexible, light-weight module for creating custom components
    *
    * @module french-dip
    *
    * @name FrenchDipJS
-   * @version 0.1.1
+   * @version 0.1.4
    * @License MIT License
    * 
    */
   'use strict';
+
   var _Components = {};
   var errors = [];
 
   if (!Array.prototype.includes) {
     _includesPolyfill();
   }
+
   if (!Object.assign || typeof Object.assign != 'function') {
     _assignPolyfill();
   }
 
-  root.FrenchDip = {
+  window.FrenchDip = {
     register: register
   };
 
@@ -51,8 +44,10 @@
 
     function initComponent(el) {
       var instanceOptions = Object.assign({}, options, _parseInstanceOptions(el, options));
+
       Component.prototype.root = el;
       Component.prototype.options = instanceOptions;
+
       new Component();
     }
   }
@@ -65,9 +60,11 @@
     // Initialize FrenchDip'ed Components
     components.forEach(function(name) {
       var selector = '[data-frenchdip="' + name + '"]';
+
       if (typeof _Components[name] !== 'function') {
         return errors.push(name);
       }
+
       new FrenchDip(selector, {}, _Components[name]);
     });
     _logErrors();
@@ -192,4 +189,4 @@
       return false;
     };
   }
-}));
+})();
diff --git a/french-dip.min.js b/french-dip.min.js
@@ -2,25 +2,17 @@
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
-(function (root, factory) {
-  'use strict';
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-  if (typeof define === 'function' && define.amd) {
-    define(['exports'], factory);
-  } else if (typeof exports !== 'undefined') {
-    module.exports = factory(exports);
-  } else {
-    factory(root || {});
-  }
-})(undefined, function (root) {
+(function () {
   /**
    * 
    * A flexible, light-weight module for creating custom components
    *
    * @module french-dip
    *
    * @name FrenchDipJS
-   * @version 0.1.1
+   * @version 0.1.4
    * @License MIT License
    * 
    */
@@ -32,11 +24,12 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
   if (!Array.prototype.includes) {
     _includesPolyfill();
   }
+
   if (!Object.assign || typeof Object.assign != 'function') {
     _assignPolyfill();
   }
 
-  root.FrenchDip = {
+  window.FrenchDip = {
     register: register
   };
 
@@ -55,9 +48,11 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     Array.prototype.forEach.call(elements, initComponent);
 
     function initComponent(el) {
-      var instanceOptions = Object.assign({}, options, _parseInstanceOptions(el, options));
+      var instanceOptions = _extends({}, options, _parseInstanceOptions(el, options));
+
       Component.prototype.root = el;
       Component.prototype.options = instanceOptions;
+
       new Component();
     }
   }
@@ -70,9 +65,11 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     // Initialize FrenchDip'ed Components
     components.forEach(function (name) {
       var selector = '[data-frenchdip="' + name + '"]';
+
       if (typeof _Components[name] !== 'function') {
         return errors.push(name);
       }
+
       new FrenchDip(selector, {}, _Components[name]);
     });
     _logErrors();
@@ -202,4 +199,4 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       return false;
     };
   }
-});
+})();