Final SimpleModal 1.4.3 changes

ericmmartin · ericmmartin · commit fad4131a41b5 · 2012-09-08T08:36:20.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,8 +1,9 @@
 ==== SimpleModal ChangeLog ====
 
 == 1.4.3 ==
- * Date: August 22, 2012
+ * Date: September 08, 2012
  * Changed $.boxModel to $.support.boxModel (requires jQuery 1.3+)
+ * Fixed potential noConflict bug. Thanks to Erik Westra
 
 
 == 1.4.2 ==
diff --git a/src/jquery.simplemodal.js b/src/jquery.simplemodal.js
@@ -246,7 +246,7 @@
 			// determine how to handle the data based on its type
 			if (typeof data === 'object') {
 				// convert DOM object to a jQuery object
-				data = data instanceof jQuery ? data : $(data);
+				data = data instanceof $ ? data : $(data);
 				s.d.placeholder = false;
 
 				// if the object came from the DOM, keep track of its parent
