Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image rotate control is added #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Image rotate control is added #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7bb41
image rotate control is added
gchokeen Jul 14, 2014
58c3277
rotate animate clear and cross browser issue fixed
gchokeen Jul 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 66 additions & 3 deletions src/jquery.fs.zoomer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
zoomIn: null,
zoomOut: null,
next: null,
rotate: null,
previous: null
},
customClass: "",
Expand Down Expand Up @@ -115,6 +116,9 @@
offset: null,
touches: [],
zoomPercentage: 1,

rAngle: 90,
rotatePos: 0,

pinchStartX0: 0,
pinchStartX1: 0,
Expand Down Expand Up @@ -172,6 +176,7 @@
data.controls.$zoomOut.off(".zoomer");
data.controls.$next.off(".zoomer");
data.controls.$previous.off(".zoomer");
data.controls.$rotate.off(".zoomer");

data.$target.removeClass("zoomer-element")
.data("zoomer", null)
Expand Down Expand Up @@ -338,16 +343,18 @@
data.$target.addClass("zoomer-element")
.html(data.$zoomer);

if (data.controls.zoomIn || data.controls.zoomOut || data.controls.next || data.controls.previous) {
if (data.controls.zoomIn || data.controls.zoomOut || data.controls.next || data.controls.previous || data.controls.rotate) {
data.controls.$zoomIn = $(data.controls.zoomIn);
data.controls.$zoomOut = $(data.controls.zoomOut);
data.controls.$next = $(data.controls.next);
data.controls.$previous = $(data.controls.previous);
data.controls.$rotate = $(data.controls.rotate);
} else {
html = '<div class="zoomer-controls zoomer-controls-' + data.controls.position + '">';
html += '<span class="zoomer-previous">&lsaquo;</span>';
html += '<span class="zoomer-zoom-out">-</span>';
html += '<span class="zoomer-zoom-in">+</span>';
html += '<span class="zoomer-zoom-rotate">&#8631</span>';
html += '<span class="zoomer-next">&rsaquo;</span>';
html += '</div>';

Expand All @@ -358,6 +365,7 @@
data.controls.$zoomOut = data.$zoomer.find(".zoomer-zoom-out");
data.controls.$next = data.$zoomer.find(".zoomer-next");
data.controls.$previous = data.$zoomer.find(".zoomer-previous");
data.controls.$rotate = data.$zoomer.find(".zoomer-zoom-rotate");
}

// Cache jquery objects
Expand All @@ -371,6 +379,8 @@
.on("touchend.zoomer mouseup.zoomer", data, _clearZoom);
data.controls.$next.on("click.zoomer", data, _nextImage);
data.controls.$previous.on("click.zoomer", data, _previousImage);
data.controls.$rotate.on("click.zoomer", data, _rotateImage);

data.$zoomer.on("mousedown.zoomer", data, _dragStart)
.on("touchstart.zoomer MSPointerDown.zoomer", ":not(.zoomer-controls)", data, _onTouch);

Expand Down Expand Up @@ -794,7 +804,7 @@
*/
function _nextImage(e) {
var data = e.data;

data = _clearAnimateRotate(data);
if (!data.loading && data.index+1 < data.images.length) {
data.index++;
_load.apply(data.$target, [ data ]);
Expand All @@ -809,7 +819,7 @@
*/
function _previousImage(e) {
var data = e.data;

data = _clearAnimateRotate(data);
if (!data.loading && data.index-1 >= 0) {
data.index--;
_load.apply(data.$target, [ data ]);
Expand Down Expand Up @@ -849,6 +859,24 @@
data.keyDownTime = 1;
data.action = "zoom_out";
}

/**
* @method private
* @name _rotateImage
* @description Handles rotates button click
* @param e [object] "Event Data"
*/
function _rotateImage(e) {
e.preventDefault();
e.stopPropagation();

var data = e.data;
data = _AnimateRotate(data);
data.keyDownTime = 1;
data.action = "";
}



/**
* @method private
Expand All @@ -862,6 +890,7 @@

var data = e.data;
data = _clearZoomPosition(data);


data.keyDownTime = 0;
data.action = "";
Expand All @@ -884,6 +913,40 @@

return data;
}

/**
* @method private
* @name _AnimateRotate
* @description Sets rotate position
* @param data [object] "Instance Data"
*/

function _AnimateRotate(data){

$({deg: data.rotatePos}).animate({deg: data.rAngle}, {
step: function(now, fx){
$(".zoomer-image").css({
'-webkit-transform' : 'rotate(' + now + 'deg)',
'-moz-transform' : 'rotate(' + now + 'deg)',
'-ms-transform' : 'rotate(' + now + 'deg)',
'transform' : 'rotate(' + now + 'deg)'
});
}
});

data.rotatePos = data.rotatePos + 90;
data.rAngle = data.rAngle + 90;

return data;
}

function _clearAnimateRotate(data){
data.rotatePos = 0;
data.rAngle = 90;

return data;
}


/**
* @method private
Expand Down