Implemented proper jQuery loading/factory method

kasparsz · Sep 1, 2016 · 0a5cd4b · 0a5cd4b
1 parent 7145628
commit 0a5cd4b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.0] - 2016-09-01
+### Changed
+- Implemented proper jQuery loading/factory method
 
 ## [0.3.1] - 2016-08-29
 ### Added
 - ```debug``` configuration option [\#1](https://github.com/kasparsz/jquery-app/issues/1)
 
 
+[0.4.0]: https://github.com/kasparsz/jquery-app/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/kasparsz/jquery-app/compare/v0.2.2...v0.3.1
diff --git a/dist/jquery-app.js b/dist/jquery-app.js
@@ -5,8 +5,15 @@
  * Licensed under the MIT License.
  */
 
-(function (global) {
-    var $ = global.jQuery || window.jQuery;
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		factory(require('jquery'));
+	} else {
+		factory(jQuery);
+    }
+}(function ($) {
     var REGEX_SPLIT = /\s*,\s*/;
     var REGEX_NOT_LOWERCASE = /[^a-z]/;
     var PROPERTY_NAME = 'jQueryAppData';
@@ -130,4 +137,4 @@
         return this;
     };
 
-})(this);
+}));
diff --git a/dist/jquery-app.min.js b/dist/jquery-app.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-app",
   "description": "Declarative jQuery plugin initialization on DOM elements",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "homepage": "https://github.com/kasparsz/jquery-app",
   "repository": "kasparsz/jquery-app",
   "bugs": {

diff --git a/src/index.js b/src/index.js
@@ -5,8 +5,15 @@
  * Licensed under the MIT License.
  */
 
-(function (global) {
-    const $ = global.jQuery || window.jQuery;
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(['jquery'], factory);
+	} else if (typeof exports === 'object') {
+		factory(require('jquery'));
+	} else {
+		factory(jQuery);
+    }
+}(function ($) {
     const REGEX_SPLIT = /\s*,\s*/;
     const REGEX_NOT_LOWERCASE = /[^a-z]/;
     const PROPERTY_NAME = 'jQueryAppData';
@@ -130,4 +137,4 @@
         return this;
     };
 
-})(this);
+}));