Merge pull request #243 from aspiers/fix/commonjs

fix CommonJS support (fixes #242)
needim · Jan 17, 2015 · 560767e · 560767e
2 parents d93ecb6 + 33bbbbd
commit 560767e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -28,7 +28,7 @@ module.exports = function(grunt) {
                 src: 'js/noty/packaged/jquery.noty.packaged.js',
                 dest: 'js/noty/packaged/jquery.noty.packaged.js',
                 options: {
-                    wrapper: ["!function(root, factory) {\n\t if (typeof define === 'function' && define.amd) {\n\t\t define(['jquery'], factory);\n\t } else {\n\t\t factory(root.jQuery);\n } }(this, function($) {\n", "\n});"]
+                    wrapper: ["!function(root, factory) {\n\t if (typeof define === 'function' && define.amd) {\n\t\t define(['jquery'], factory);\n\t } else if (typeof exports === 'object') {\n\t\t module.exports = factory(require('jquery'));\n\t } else {\n\t\t factory(root.jQuery);\n\t }\n}(this, function($) {\n", "\nreturn window.noty;\n\n});"]
                 }
             }
         },

diff --git a/js/noty/jquery.noty.js b/js/noty/jquery.noty.js
@@ -530,5 +530,5 @@
 
     // Helpers
     window.noty = function noty(options) {
-        return jQuery.notyRenderer.init(options);
-    };
+        return $.notyRenderer.init(options);
+    };
diff --git a/js/noty/packaged/jquery.noty.packaged.js b/js/noty/packaged/jquery.noty.packaged.js
@@ -1,9 +1,12 @@
 !function(root, factory) {
 	 if (typeof define === 'function' && define.amd) {
 		 define(['jquery'], factory);
+	 } else if (typeof exports === 'object') {
+		 module.exports = factory(require('jquery'));
 	 } else {
 		 factory(root.jQuery);
- } }(this, function($) {
+	 }
+}(this, function($) {
 
 /*!
  @package noty - jQuery Notification Plugin
@@ -537,8 +540,9 @@
 
     // Helpers
     window.noty = function noty(options) {
-        return jQuery.notyRenderer.init(options);
+        return $.notyRenderer.init(options);
     };
+
 $.noty.layouts.bottom = {
     name     : 'bottom',
     options  : {},
@@ -1427,4 +1431,6 @@ $.noty.themes.relax = {
 };
 
 
+return window.noty;
+
 });
diff --git a/js/noty/packaged/jquery.noty.packaged.min.js b/js/noty/packaged/jquery.noty.packaged.min.js
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "type": "git",
     "url": "git://github.com/needim/noty.git"
   },
+  "main": "js/noty/packaged/jquery.noty.packaged.js",
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.5",