Merge branch 'master' of https://github.com/OwlFonk/OwlCarousel

somi38 · May 12, 2014 · 4460c16 · 4460c16
2 parents eee6d6d + fa980a7
commit 4460c16
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Touch enabled jQuery plugin that lets you create beautiful responsive carousel s
 * Custom events
 * Helpful callbacks
 
-> Tested on IE7, IE8, IE9, IE10, Chrome, Safari, Firefox, Opera, iPhone, iPad, Chrom on Google Nexus.
+> Tested on IE7, IE8, IE9, IE10, Chrome, Safari, Firefox, Opera, iPhone, iPad, Chrome on Google Nexus.
 
 
 ### More Demos

diff --git a/owl-carousel/owl.carousel.js b/owl-carousel/owl.carousel.js
@@ -65,8 +65,10 @@ if (typeof Object.create !== "function") {
         logIn : function () {
             var base = this;
 
-            base.$elem.data("owl-originalStyles", base.$elem.attr("style"));
-            base.$elem.data("owl-originalClasses", base.$elem.attr("class"));
+            base.$elem.data({
+                "owl-originalStyles": base.$elem.attr("style"),
+                "owl-originalClasses": base.$elem.attr("class")
+            });
 
             base.$elem.css({opacity: 0});
             base.orignalItems = base.options.items;
@@ -1163,7 +1165,9 @@ if (typeof Object.create !== "function") {
                     follow = true;
                 }
                 if (follow && itemNumber < base.currentItem + base.options.items && $lazyImg.length) {
-                    base.lazyPreload($item, $lazyImg);
+                    $lazyImg.each(function() {
+                        base.lazyPreload($item, $(this));
+                    });
                 }
             }
         },
@@ -1371,9 +1375,10 @@ if (typeof Object.create !== "function") {
                 }
             }
             base.clearEvents();
-            base.$elem
-                .attr("style", base.$elem.data("owl-originalStyles") || "")
-                .attr("class", base.$elem.data("owl-originalClasses"));
+            base.$elem.attr({
+                style: base.$elem.data("owl-originalStyles") || "",
+                class: base.$elem.data("owl-originalClasses")
+            });
         },
 
         destroy : function () {
@@ -1509,4 +1514,4 @@ if (typeof Object.create !== "function") {
         startDragging : false,
         afterLazyLoad: false
     };
-}(jQuery, window, document));
+}(jQuery, window, document));