From cebfb9fc0cb757368ed8cb2265c5fe54f71a2629 Mon Sep 17 00:00:00 2001
From: Willian <willianpts@gmail.com>
Date: Fri, 17 Jan 2014 18:40:25 -0200
Subject: [PATCH 1/2] Let the amd loader handle jquery loading. This way, we
 dont need to specify a shim for jail.

---
 README.md   | 3 ---
 src/jail.js | 7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0995fff..31f1bf1 100644
--- a/README.md
+++ b/README.md
@@ -155,9 +155,6 @@ requirejs.config({
     baseUrl: 'lib',
     paths: {
         app: 'src'
-    },
-    shim: {
-        'app/jail': ['jquery']
     }
 });
 
diff --git a/src/jail.js b/src/jail.js
index ad3a70c..66c4555 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( name , ['jquery'], definition );
 		
 	}  else { // assign 'jail' to global objects
 		
-		( this.jQuery || this.$ || this )[name] = theModule;
+		( this.jQuery || this.$ || this )[name] = definition(jQuery);
 
 	}
 }( 'jail', function ($) {

From 3822c62a22712543a1775edddfcdb06bd3832c95 Mon Sep 17 00:00:00 2001
From: Willian <willianpts@gmail.com>
Date: Sat, 18 Jan 2014 10:49:05 -0200
Subject: [PATCH 2/2] Removing module id at the define() call so that jail.js
 doesn't need to be at a specific dir.

See http://requirejs.org/docs/api.html#modulename
---
 README.md                | 2 +-
 demo/js/require-main.js  | 6 +-----
 demo/js/require-main2.js | 8 ++------
 src/jail.js              | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 31f1bf1..1f599a3 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ requirejs.config({
     }
 });
 
-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 66c4555..2196e8d 100644
--- a/src/jail.js
+++ b/src/jail.js
@@ -24,7 +24,7 @@
 
 	if ( hasDefine ){  // AMD module
 
-		define( name , ['jquery'], definition );
+		define( ['jquery'], definition );
 		
 	}  else { // assign 'jail' to global objects