Skip to content

Commit

Permalink
Fixed JSCS format warnings/issues.
Browse files Browse the repository at this point in the history
Bump version.
  • Loading branch information
ceilino committed Dec 20, 2015
1 parent 1f47bdb commit 8f7babc
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 18 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<a name="1.1.18"></a>

# 1.1.18 (2015-20-Dec)

- Set minZoomLevel to 1.01, that helps to zoom small images.

<a name="1.1.2"></a>

# 1.1.2 (2015-01-June)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ez-plus",
"title": "EZ Plus",
"version": "1.1.17",
"version": "1.1.18",
"description": "A jQuery image zoom plug-in, with tints, easing and gallery integration.",
"author": {
"name": "Igor Lino",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ez-plus",
"title": "EZ Plus",
"version": "1.1.17",
"version": "1.1.18",
"description": "A jQuery image zoom plug-in, with tints, easing and gallery integration.",
"keywords": [
"zoom",
Expand Down
32 changes: 16 additions & 16 deletions src/jquery.ez-plus.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,16 @@ if (typeof Object.create !== 'function') {
var newImg = new Image();
newImg.onload = function () {
//set the large image dimensions - used to calculte ratio's
if (newImg.width/element.width() <= minZoom){
self.largeWidth = element.width()*minZoom;
} else {
self.largeWidth = newImg.width;
}
if (newImg.width/element.height() <= minZoom){
self.largeHeight = element.height()*minZoom;
} else {
self.largeHeight = newImg.height;
}
if (newImg.width / element.width() <= minZoom) {
self.largeWidth = element.width() * minZoom;
} else {
self.largeWidth = newImg.width;
}
if (newImg.width / element.height() <= minZoom) {
self.largeHeight = element.height() * minZoom;
} else {
self.largeHeight = newImg.height;
}
//once image is loaded start the calls
self.startZoom();
self.currentImage = self.imageSrc;
Expand Down Expand Up @@ -289,8 +289,8 @@ if (typeof Object.create !== 'function') {
'height:' + self.nzHeight + 'px;' + '' +
'width:' + self.nzWidth + 'px;' +
'z-index:' + self.options.zIndex + '"></div>');
if (self.$elem.attr("id")) {
self.zoomContainer.attr("id", self.$elem.attr("id") + "-zoomContainer");
if (self.$elem.attr('id')) {
self.zoomContainer.attr('id', self.$elem.attr('id') + '-zoomContainer');
}
$(self.options.zoomContainerAppendTo).append(self.zoomContainer);

Expand Down Expand Up @@ -523,8 +523,8 @@ if (typeof Object.create !== 'function') {
e.preventDefault();

if (theEvent == 0) {
// fixes last event inversion bug
return false;
// fixes last event inversion bug
return false;
}

if (theEvent / 120 > 0) {
Expand Down Expand Up @@ -1116,8 +1116,8 @@ if (typeof Object.create !== 'function') {
self.yp = 0;
}
var interval = 16;
if (Number.isInteger(parseInt(self.options.easing))){
interval = parseInt(self.options.easing);
if (Number.isInteger(parseInt(self.options.easing))) {
interval = parseInt(self.options.easing);
}
//if loop not already started, then run it
if (!self.loop) {
Expand Down

0 comments on commit 8f7babc

Please sign in to comment.