Skip to content

Commit

Permalink
Bump 0.4.13
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-t committed Apr 6, 2016
1 parent 9cb9de7 commit 43eed25
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "chocolat",
"version": "0.4.12",
"version": "0.4.13",
"main": [
"dist/css/chocolat.css",
"dist/js/jquery.chocolat.js"
Expand Down
3 changes: 2 additions & 1 deletion dist/js/jquery.chocolat.js
Expand Up @@ -26,6 +26,7 @@
timer : false,
timerDebounce : false,
images : [],
enableZoom : true,
};

function Chocolat(element, settings) {
Expand Down Expand Up @@ -593,7 +594,7 @@
var wrapperWidth = this.elems.wrapper.width();
var wrapperHeight = this.elems.wrapper.height();

var isImageZoomable = currentImage.width > wrapperWidth || currentImage.height > wrapperHeight;
var isImageZoomable = ( this.settings.enableZoom && ( currentImage.width > wrapperWidth || currentImage.height > wrapperHeight)) ? true : false;
var isImageStretched = this.elems.img.width() > currentImage.width || this.elems.img.height() > currentImage.height;


Expand Down

0 comments on commit 43eed25

Please sign in to comment.