Permalink
Browse files

Final SimpleModal 1.4.3 changes

  • Loading branch information...
1 parent 9c69e01 commit fad4131a41b5fc3a21bbc3c17ef62aeb7f268309 @ericmmartin committed Sep 8, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 ChangeLog.txt
  2. +1 −1 src/jquery.simplemodal.js
View
@@ -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 ==
@@ -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

0 comments on commit fad4131

Please sign in to comment.