carousel options

lib/carousel.js

@@ -1,5 +1,5 @@
 // Carousel
-interactions.carousel = function ( fragment ) {
+interactions.carousel = function ( fragment, options ) {
   if (fragment.constructor == Object)
     var groups = assignElements(fragment, "carousel");
   else
@@ -14,7 +14,7 @@ interactions.carousel = function ( fragment ) {
       }
       $(this).attr("data-ur-state", type == "prev" ? "disabled" : "enabled");
     });
-    Uranium.carousel[id] = new Carousel(group);
+    Uranium.carousel[id] = new Carousel(group, options);
     $(group["set"]).data("urInit", true);
     $(group["set"]).attr("data-ur-state", "enabled"); // should be data-ur-init or fire event
   });
@@ -25,7 +25,7 @@ interactions.carousel = function ( fragment ) {
     return num >= 0 ? Math.floor(num) : Math.ceil(num);
   }
 
-  function Carousel(set) {
+  function Carousel(set, options) {
     var self = this;
     self.urId = set["_id"];
     self.container = set["set"];
@@ -63,6 +63,8 @@ interactions.carousel = function ( fragment ) {
       verticalScroll: true      // determines if dragging carousel vertically scrolls the page on touchscreens, this is almost always true
     };
 
+    $.extend(self.options, options);
+
     self.count = self.items.length;     // number of items (excluding clones)
     self.itemIndex = 0;                 // index of active item (including clones)
     self.translate = 0;                 // current numerical css translate value
@@ -203,7 +205,7 @@ interactions.carousel = function ( fragment ) {
 
       if (self.options.cloneLength == 0) {
         if (self.options.fill)
-          self.options.cloneLength = self.options.center ? self.options.fill - 1 : self.options.fill;
+          self.options.cloneLength = self.options.center ? Math.min(1, self.options.fill - 1) : self.options.fill;
         else if (self.options.center) {
           // insert enough clones at front and back to never see a blank space
           var cloneLengths = [0, 0];

lib/helpers.js

@@ -94,12 +94,13 @@ function assignElements( set, type, customFn ) {
     $.each(set, function(key, comps) {
       if (typeof comps == "string")
         set[key] = comps = $(comps);
-      $(comps).each(function(i) {
-        if ($(this).data("urCompInit"))
+      for (var i = comps.length - 1; i >= 0; i--) {
+        var comp = comps.eq(i);
+        if (comp.data("urCompInit"))
           comps.splice(i, 1);
         else
-          $(this).data("urCompInit", type);
-      });
+          comp.data("urCompInit", type);
+      }
       $(comps).attr("data-ur-id", setId);
       if (key == "set")
         $(comps).attr("data-ur-set", type);

lib/zoom.js

@@ -27,7 +27,6 @@ interactions.zoom = function ( fragment ) {
     this.container = set["set"];
     this.img = set["img"];
     this.state = "disabled";
-    this.transform3d = transform3d;
 
     // Optionally:
     this.button = set["button"];
@@ -57,6 +56,17 @@ interactions.zoom = function ( fragment ) {
     var time1 = 0, time2 = 0;
     var slidex, slidey;
 
+    this.transform3d = transform3d;
+    var custom3d = $container.attr("data-ur-transform3d");
+    if (custom3d)
+      this.transform3d = custom3d != "disabled";
+    if (self.transform3d) {
+      translatePrefix = "translate3d(";
+      translateSuffix = ",0)";
+      scalePrefix = " scale3d(";
+      scaleSuffix = ",1)";
+    }
+
     $(self.img).each(function() {
       loadedImgs.push($(this).attr("src"));
       $(this).data("urZoomImg", new Img(this));
@@ -74,16 +84,7 @@ interactions.zoom = function ( fragment ) {
 
 
     function initialize() {
-      var custom3d = $container.attr("data-ur-transform3d");
-      if (custom3d)
-        self.transform3d = custom3d != "disabled";
-      if (self.transform3d) {
-        translatePrefix = "translate3d(";
-        translateSuffix = ",0)";
-        scalePrefix = " scale3d(";
-        scaleSuffix = ",1)";
-      }
-      $container.attr("data-ur-transform3d", self.transform3d ? "enabled" : "disabled");
+      $container.attr("data-ur-transform3d", zoomer.transform3d ? "enabled" : "disabled");
 
       canvasWidth = canvasWidth || $img.parent().outerWidth();
       canvasHeight = canvasHeight || $img.parent().outerHeight();
@@ -228,6 +229,8 @@ interactions.zoom = function ( fragment ) {
     function setState(state) {
       zoomer.state = state;
       $img.attr("data-ur-state", state);
+      if (zoomer.img.length == 1)
+        $container.attr("data-ur-state", state); // backwards compatibility
     }
 
     function zoomHelper(x, y) {