Skip to content

Commit

Permalink
Fixed behaviour minification
Browse files Browse the repository at this point in the history
This is now finished regarding minification
  • Loading branch information
TheCelavi committed Aug 26, 2012
1 parent f59f77c commit 3ba4f16
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions config/dm/assets.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
js:
dmJCarouselLightBehaviorPlugin:
jcarousellight: jquery.jcarousel-light.modified
jcarousellight: jquery.jcarousel-light.modified.min
mousewheel: jquery.mousewheel.min
launch: dmJCarouselLightBehavior
launch: dmJCarouselLightBehavior.min
6 changes: 3 additions & 3 deletions web/js/dmJCarouselLightBehavior.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
if (behavior.showNavigation) {
behavior.btnPrev.remove();
behavior.btnNext.remove();
}
};
$this.empty();
$this.append($this.data('dmJCarouselLightBehaviorPreviousDOM'));

Expand All @@ -42,7 +42,7 @@
$this.data('dmJCarouselLightBehavior', null);
$this.data('dmJCarouselLightBehaviorPreviousDOM', null)
}
}
};

$.fn.dmJCarouselLightBehavior = function(method, behavior){

Expand All @@ -53,7 +53,7 @@
return methods.init.apply( this, [method] );
} else {
$.error( 'Method ' + method + ' does not exist on jQuery.dmJCarouselLightBehavior' );
}
};
});
};

Expand Down
1 change: 1 addition & 0 deletions web/js/dmJCarouselLightBehavior.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions web/js/jquery.jcarousel-light.modified.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $.fn.jCarouselLite = function(o) {
ul.prepend(tLi.slice(tl-v+1).clone())
.append(tLi.slice(0,o.scroll).clone());
o.start += v-1;
}
};

var li = ul.children();
li.css('width', o.itemWidth).css('height', o.itemHeight).css('overflow', 'hidden');
Expand All @@ -72,8 +72,8 @@ $.fn.jCarouselLite = function(o) {
});
if(o.hoverPause) {
$(o.btnPrev).hover(function(){stopAuto();}, function(){startAuto();});
}
}
};
};


if(o.btnNext) {
Expand All @@ -82,8 +82,8 @@ $.fn.jCarouselLite = function(o) {
});
if(o.hoverPause) {
$(o.btnNext).hover(function(){stopAuto();}, function(){startAuto();});
}
}
};
};

if(o.btnGo)
$.each(o.btnGo, function(i, val) {
Expand Down Expand Up @@ -113,7 +113,7 @@ $.fn.jCarouselLite = function(o) {
if(o.auto) {
if(o.hoverPause) {
div.hover(function(){stopAuto();}, function(){startAuto();});
}
};
startAuto();
};

Expand All @@ -138,7 +138,7 @@ $.fn.jCarouselLite = function(o) {
} else { // If non-circular and to points to first or last, we just return.
if(to<0 || to>itemLength-v) return;
else curr = to;
} // If neither overrides it, the curr will still be "to" and we can proceed.
}; // If neither overrides it, the curr will still be "to" and we can proceed.

running = true;

Expand All @@ -159,9 +159,9 @@ $.fn.jCarouselLite = function(o) {
||
[]
).addClass("disabled");
}
};

}
};
return false;
};
});
Expand Down
1 change: 1 addition & 0 deletions web/js/jquery.jcarousel-light.modified.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3ba4f16

Please sign in to comment.