diff --git a/README.md b/README.md index 0995fff..1f599a3 100644 --- a/README.md +++ b/README.md @@ -155,13 +155,10 @@ requirejs.config({ baseUrl: 'lib', paths: { app: 'src' - }, - shim: { - 'app/jail': ['jquery'] } }); -require(["jquery", "app/jail"], function() { +require(["jquery", "app/jail"], function($) { $(function(){ $('img.lazy').jail(); }); diff --git a/demo/js/require-main.js b/demo/js/require-main.js index 1f51389..a08e77b 100644 --- a/demo/js/require-main.js +++ b/demo/js/require-main.js @@ -4,10 +4,6 @@ requirejs.config({ paths: { app: '../src' - }, - - shim: { - 'app/jail': ['jquery'] } }); @@ -15,4 +11,4 @@ require(["jquery", "app/jail"], function() { $(function(){ $('img.lazy').jail(); }); -}); \ No newline at end of file +}); diff --git a/demo/js/require-main2.js b/demo/js/require-main2.js index 6ab4d40..39e9a5d 100644 --- a/demo/js/require-main2.js +++ b/demo/js/require-main2.js @@ -4,14 +4,10 @@ requirejs.config({ paths: { app: '../src' - }, - - shim: { - 'app/jail': ['jquery'] } }); -require(["jquery", "app/jail"], function() { +require(["jquery", "app/jail"], function($) { $(function(){ $('img.lazy').each(function(i){ $(this).jail({ @@ -22,4 +18,4 @@ require(["jquery", "app/jail"], function() { }); }); }); -}); \ No newline at end of file +}); diff --git a/src/jail.js b/src/jail.js index ad3a70c..2196e8d 100644 --- a/src/jail.js +++ b/src/jail.js @@ -20,16 +20,15 @@ */ ;(function ( name, definition ){ - var theModule = definition(jQuery), - hasDefine = typeof define === 'function' && define.amd; + var hasDefine = typeof define === 'function' && define.amd; if ( hasDefine ){ // AMD module - define( name , ['jquery'], theModule ); + define( ['jquery'], definition ); } else { // assign 'jail' to global objects - ( this.jQuery || this.$ || this )[name] = theModule; + ( this.jQuery || this.$ || this )[name] = definition(jQuery); } }( 'jail', function ($) {