Version Description
= 7.5.08 =
- This version addresses various bug fixes and feature requests.
Download this release
Release Info
Developer | opajaap |
Plugin | WP Photo Album Plus |
Version | 7.5.08.006 |
Comparing to | |
See all releases |
Code changes from version 7.5.08.005 to 7.5.08.006
- changelog.txt +1 -0
- js/wppa-all.js +1 -1
- js/wppa-zoom.js +74 -33
- js/wppa-zoom.min.js +1 -1
- theme/wppa-style.css +5 -0
- wppa-items.php +2 -2
- wppa.php +2 -2
changelog.txt
CHANGED
@@ -4,6 +4,7 @@ WP Photo Album Plus Changelog
|
|
4 |
|
5 |
* Fixed pre-loading in lightbox and corrected previous image selection.
|
6 |
* Made zoomable image code more stable and faster.
|
|
|
7 |
|
8 |
= 7.5.07 =
|
9 |
|
4 |
|
5 |
* Fixed pre-loading in lightbox and corrected previous image selection.
|
6 |
* Made zoomable image code more stable and faster.
|
7 |
+
* Custom datafields were no longer qTranslate style translated. Fixed.
|
8 |
|
9 |
= 7.5.07 =
|
10 |
|
js/wppa-all.js
CHANGED
@@ -13,4 +13,4 @@ var wppaJsPopupVersion="7.5.03";function wppaPopUp(p,t,e,r,a,i,o,n,d,s){var c,l,
|
|
13 |
// wppa-touch
|
14 |
var wppaJsTouchVersion="7.5.03",wppaTriggerElementID=null,wppaFingerCount=0,wppaStartX=0,wppaStartY=0,wppaCurX=0,wppaCurY=0,wppaDeltaX=0,wppaDeltaY=0,wppaHorzDiff=0,wppaVertDiff=0,wppaMinLength=72,wppaSwipeLength=0,wppaSwipeAngle=null,wppaSwipeDirection=null,wppaSwipeOnLightbox=!1,wppaSwipeMocc=0,wppaMobileTimeStart=0;function wppaStartTime(){var p=(new Date).getTime();return wppaMobileTimeStart=p,!0}function wppaInTime(){return(new Date).getTime()-wppaMobileTimeStart<250}function wppaTapLink(p,e){wppaInTime()&&(_bumpClickCount(p),document.location.href=e)}function wppaTouchStart(p,e,a){-1==(wppaSwipeMocc=a)&&(wppaSwipeOnLightbox=!0,p.preventDefault()),1==(wppaFingerCount=p.touches.length)?(wppaStartX=p.touches[0].pageX,wppaStartY=p.touches[0].pageY,wppaTriggerElementID=e):wppaTouchCancel()}function wppaTouchMove(p){wppaSwipeOnLightbox&&p.preventDefault(),1==p.touches.length?(wppaCurX=p.touches[0].pageX,wppaCurY=p.touches[0].pageY):wppaTouchCancel()}function wppaTouchEnd(p){wppaSwipeOnLightbox&&p.preventDefault(),1==wppaFingerCount&&0!=wppaCurX&&(wppaSwipeLength=Math.round(Math.sqrt(Math.pow(wppaCurX-wppaStartX,2)+Math.pow(wppaCurY-wppaStartY,2))),wppaMinLength<=wppaSwipeLength&&(wppaCalculateAngle(),wppaDetermineSwipeDirection(),wppaProcessingRoutine())),wppaTouchCancel()}function wppaTouchCancel(){wppaTriggerElementID=wppaSwipeDirection=wppaSwipeAngle=null,wppaSwipeOnLightbox=!1,wppaSwipeMocc=wppaSwipeLength=wppaVertDiff=wppaHorzDiff=wppaDeltaY=wppaDeltaX=wppaCurY=wppaCurX=wppaStartY=wppaStartX=wppaFingerCount=0}function wppaCalculateAngle(){var p=wppaStartX-wppaCurX,e=wppaCurY-wppaStartY,a=(Math.round(Math.sqrt(Math.pow(p,2)+Math.pow(e,2))),Math.atan2(e,p));(wppaSwipeAngle=Math.round(180*a/Math.PI))<0&&(wppaSwipeAngle=360-Math.abs(wppaSwipeAngle))}function wppaDetermineSwipeDirection(){wppaSwipeDirection=wppaSwipeAngle<=45&&0<=wppaSwipeAngle||wppaSwipeAngle<=360&&315<=wppaSwipeAngle?"left":135<=wppaSwipeAngle&&wppaSwipeAngle<=225?"right":45<wppaSwipeAngle&&wppaSwipeAngle<135?"down":"up"}function wppaProcessingRoutine(){document.getElementById(wppaTriggerElementID);if(wppaSwipeOnLightbox)"left"==wppaSwipeDirection?wppaOvlShowNext():"right"==wppaSwipeDirection&&wppaOvlShowPrev();else{if("right"==wppaSwipeDirection){if(idx=_wppaCurIdx[wppaSwipeMocc]-1,idx<0){if(!wppaSlideWrap)return;idx=_wppaSlides[wppaSwipeMocc].length-1}wppaGotoKeepState(wppaSwipeMocc,idx)}if("left"==wppaSwipeDirection){if(idx=_wppaCurIdx[wppaSwipeMocc]+1,idx==_wppaSlides[wppaSwipeMocc].length){if(!wppaSlideWrap)return;idx=0}wppaGotoKeepState(wppaSwipeMocc,idx)}}wppaTouchCancel()}
|
15 |
// wppa-zoom
|
16 |
-
function wppaDoZoomPan(o){var
|
13 |
// wppa-touch
|
14 |
var wppaJsTouchVersion="7.5.03",wppaTriggerElementID=null,wppaFingerCount=0,wppaStartX=0,wppaStartY=0,wppaCurX=0,wppaCurY=0,wppaDeltaX=0,wppaDeltaY=0,wppaHorzDiff=0,wppaVertDiff=0,wppaMinLength=72,wppaSwipeLength=0,wppaSwipeAngle=null,wppaSwipeDirection=null,wppaSwipeOnLightbox=!1,wppaSwipeMocc=0,wppaMobileTimeStart=0;function wppaStartTime(){var p=(new Date).getTime();return wppaMobileTimeStart=p,!0}function wppaInTime(){return(new Date).getTime()-wppaMobileTimeStart<250}function wppaTapLink(p,e){wppaInTime()&&(_bumpClickCount(p),document.location.href=e)}function wppaTouchStart(p,e,a){-1==(wppaSwipeMocc=a)&&(wppaSwipeOnLightbox=!0,p.preventDefault()),1==(wppaFingerCount=p.touches.length)?(wppaStartX=p.touches[0].pageX,wppaStartY=p.touches[0].pageY,wppaTriggerElementID=e):wppaTouchCancel()}function wppaTouchMove(p){wppaSwipeOnLightbox&&p.preventDefault(),1==p.touches.length?(wppaCurX=p.touches[0].pageX,wppaCurY=p.touches[0].pageY):wppaTouchCancel()}function wppaTouchEnd(p){wppaSwipeOnLightbox&&p.preventDefault(),1==wppaFingerCount&&0!=wppaCurX&&(wppaSwipeLength=Math.round(Math.sqrt(Math.pow(wppaCurX-wppaStartX,2)+Math.pow(wppaCurY-wppaStartY,2))),wppaMinLength<=wppaSwipeLength&&(wppaCalculateAngle(),wppaDetermineSwipeDirection(),wppaProcessingRoutine())),wppaTouchCancel()}function wppaTouchCancel(){wppaTriggerElementID=wppaSwipeDirection=wppaSwipeAngle=null,wppaSwipeOnLightbox=!1,wppaSwipeMocc=wppaSwipeLength=wppaVertDiff=wppaHorzDiff=wppaDeltaY=wppaDeltaX=wppaCurY=wppaCurX=wppaStartY=wppaStartX=wppaFingerCount=0}function wppaCalculateAngle(){var p=wppaStartX-wppaCurX,e=wppaCurY-wppaStartY,a=(Math.round(Math.sqrt(Math.pow(p,2)+Math.pow(e,2))),Math.atan2(e,p));(wppaSwipeAngle=Math.round(180*a/Math.PI))<0&&(wppaSwipeAngle=360-Math.abs(wppaSwipeAngle))}function wppaDetermineSwipeDirection(){wppaSwipeDirection=wppaSwipeAngle<=45&&0<=wppaSwipeAngle||wppaSwipeAngle<=360&&315<=wppaSwipeAngle?"left":135<=wppaSwipeAngle&&wppaSwipeAngle<=225?"right":45<wppaSwipeAngle&&wppaSwipeAngle<135?"down":"up"}function wppaProcessingRoutine(){document.getElementById(wppaTriggerElementID);if(wppaSwipeOnLightbox)"left"==wppaSwipeDirection?wppaOvlShowNext():"right"==wppaSwipeDirection&&wppaOvlShowPrev();else{if("right"==wppaSwipeDirection){if(idx=_wppaCurIdx[wppaSwipeMocc]-1,idx<0){if(!wppaSlideWrap)return;idx=_wppaSlides[wppaSwipeMocc].length-1}wppaGotoKeepState(wppaSwipeMocc,idx)}if("left"==wppaSwipeDirection){if(idx=_wppaCurIdx[wppaSwipeMocc]+1,idx==_wppaSlides[wppaSwipeMocc].length){if(!wppaSlideWrap)return;idx=0}wppaGotoKeepState(wppaSwipeMocc,idx)}}wppaTouchCancel()}
|
15 |
// wppa-zoom
|
16 |
+
function wppaDoZoomPan(o){var h=jQuery,e=g(o);if(!e.initialized&&!e.abort){if(e.isLightbox&&h("#wppa-ovl-spin").show(),!e.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),h(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),e.manual=!1,e.deltaX=0,e.deltaY=0,e.deltaFactor=1,e.run=1,e.busy=!1,e.div=h("#wppa-pan-div-"+e.itemId),e.canvas=document.getElementById("wppa-pan-canvas-"+e.itemId),e.left=h("#wppa-pctl-left-"+e.itemId),e.right=h("#wppa-pctl-right-"+e.itemId),e.up=h("#wppa-pctl-up-"+e.itemId),e.down=h("#wppa-pctl-down-"+e.itemId),e.zoomin=h("#wppa-pctl-zoomin-"+e.itemId),e.zoomout=h("#wppa-pctl-zoomout-"+e.itemId),e.prev=h("#wppa-pctl-prev-"+e.itemId),e.next=h("#wppa-pctl-next-"+e.itemId),e.exit=h("#wppa-exit-btn-2"),e.canvasWidth=e.width,e.canvasHeight=e.height,e.savedCanvasX=0,e.savedCanvasY=0,e.fromHeight=e.image.height,e.fromWidth=e.image.width,e.imageRatio=e.image.width/e.image.height,e.fromX=0,e.fromY=0,e.centerX=e.fromX+e.fromWidth/2,e.centerY=e.fromY+e.fromHeight/2,e.ctx=null,e.buttondown=!1,e.enableManual=!0,e.ctrlbarUpdate=!0,wppaIsMobile?(e.right.on("touchstart",function(t){n(o)}),e.right.on("touchend",function(t){d(o)}),e.left.on("touchstart",function(t){i(o)}),e.left.on("touchend",function(t){d(o)}),e.up.on("touchstart",function(t){r(o)}),e.up.on("touchend",function(t){d(o)}),e.down.on("touchstart",function(t){s(o)}),e.down.on("touchend",function(t){d(o)}),e.zoomin.on("touchstart",function(t){c(o)}),e.zoomin.on("touchend",function(t){d(o)}),e.zoomout.on("touchstart",function(t){u(o)}),e.zoomout.on("touchend",function(t){d(o)}),e.canvas.addEventListener("touchstart",function(t){m(o,t)}),e.canvas.addEventListener("touchmove",function(t){f(o,t)}),e.canvas.addEventListener("touchend",function(t){l(o)})):(e.canvas.addEventListener("mousedown",function(t){m(o,t)}),e.canvas.addEventListener("mousemove",function(t){f(o,t)}),e.canvas.addEventListener("mouseup",function(t){l(o)}),e.canvas.addEventListener("mouseleave",function(t){g(o,{run:0})}),e.canvas.addEventListener("mouseenter",function(t){var a;g(a=o).manual&&(g(a,{run:2}),p(a))}),document.getElementById("wppa-pan-canvas-"+e.itemId).addEventListener("wheel",function(t){var a,n;a=o,(n=t).preventDefault(),n.stopPropagation(),e=g(a),g(a,{run:1,deltaFactor:1+n.deltaY*e.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),p(a),setTimeout(function(){g(a,{deltaFactor:1})},25)}),e.right.on("mousedown",function(t){n(o)}),e.right.on("mouseup",function(t){d(o)}),e.left.on("mousedown",function(t){i(o)}),e.left.on("mouseup",function(t){d(o)}),e.up.on("mousedown",function(t){r(o)}),e.up.on("mouseup",function(t){d(o)}),e.down.on("mousedown",function(t){s(o)}),e.down.on("mouseup",function(t){d(o)}),e.zoomin.on("mousedown",function(t){c(o)}),e.zoomin.on("mouseup",function(t){d(o)}),e.zoomout.on("mousedown",function(t){u(o)}),e.zoomout.on("mouseup",function(t){d(o)})),e.isLightbox&&(h(".wppa-fulls-btn").on("click",function(){g(0,{abort:!0})}),h(".wppa-exit-fulls-btn").on("click",function(){g(0,{abort:!0})}),e.prev&&(e.prev.on("click",function(t){h("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowPrev()}),e.next.on("click",function(t){h("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowNext()})),e.exit.on("click",function(t){h("#wppa-ovl-spin").hide(),g(0,{abort:!0}),wppaOvlHide()})),h(window).on("DOMContentLoaded load resize orientationchange",function(t){a(o)}),a(o),e.initialized=!0,g(o,e),h("#wppa-ovl-spin").hide()}function p(t){var a,n,o,e,i,r=g(t);r.isLightbox?wppaOvlOpen||(r=g(0,{run:0,abort:!0})):wppaOvlOpen&&(r=g(t,{run:0,manual:!1})),r.abort?g(t,{ctx:null}):0!=r.run&&(r.busy||(wppaDebugCounter++,wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter),(r=g(t,{busy:!0})).manual||(r.fromX+=r.deltaX,r.fromY+=r.deltaY,a=r.fromHeight/r.deltaFactor,n=r.fromWidth/r.deltaFactor,50<a&&1!=r.deltaFactor&&(wppaIsFs()||a<=r.image.height)&&(r.fromX-=(n-r.fromWidth)/2,r.fromY-=(a-r.fromHeight)/2,r.fromWidth=n,r.fromHeight=a)),r.fromX=Math.max(0,Math.min(r.image.width-r.fromWidth,r.fromX)),r.fromY=Math.max(0,Math.min(r.image.height-r.fromHeight,r.fromY)),o=screen.width/screen.height,e=(1-r.image.width/r.fromWidth)*r.canvas.width/2,i=(1-r.image.height/r.fromHeight)*r.canvas.height/2,r.ctx=r.canvas.getContext("2d"),o>r.imageRatio&&a>r.image.height&&wppaIsFs()||o<=r.imageRatio&&n>r.image.width&&wppaIsFs()?(r.enableManual=!1,r.ctx.clearRect(0,0,r.canvas.width,r.canvas.height),r.ctx.drawImage(r.image,r.fromX,r.fromY,r.fromWidth,r.fromHeight,e,i,r.canvas.width,r.canvas.height),jQuery(r.canvas).css({cursor:"default"})):(r.enableManual=!0,r.ctx.drawImage(r.image,r.fromX,r.fromY,r.fromWidth,r.fromHeight,0,0,r.canvas.width,r.canvas.height),jQuery(r.canvas).css({cursor:"grab"})),wppaIsFs()?(r.fsMaskTop=i-(r.canvas.height-screen.height)/2,r.fsMaskLeft=e-(r.canvas.width-screen.width)/2,r.fsMaskBottom=screen.height-r.fsMaskTop,r.fsMaskRight=screen.width-r.fsMaskLeft):(r.fsMaskTop=0,r.fsMaskLeft=0,r.fsMaskBottom=0,r.fsMaskRight=0),r.busy=!1,0<r.run&&(r.manual||r.buttondown)&&setTimeout(function(){p(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),g(t,r)))}function a(t){var a,n,o,e,i,r,s,c,u,d=g(t);d.isLightbox?(h("#wppa-overlay-ic").css("display",""),e=(n=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),s=0,u=(c=8)+(d.controls?d.icsize+10:0)+10,n?(c+=2*d.borderWidth,u+=2*d.borderWidth):c=40,a=n?e-u>(o-c)/d.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<d.imageRatio),n&&a&&(s=(e-(r=(i=o-c)/d.imageRatio)-u)/2+20),n&&!a&&(r=(i=d.imageRatio*(e-(d.controls?d.icsize:0)-48))/d.imageRatio,s=20),!n&&a&&(i=(r=screen.height)*d.imageRatio,s=0),n||a||(r=(i=screen.width)/d.imageRatio,s=(screen.height-r)/2),h("#wppa-ovl-pan-container").css({marginTop:s}),h("#wppa-overlay-ic").css({marginTop:0}),d.canvasWidth=i,d.canvasHeight=r,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight,n?(h("#wppa-ovl-pan-container").css({backgroundColor:d.backgroundColor,padding:d.padding,borderRadius:d.borderRadius,borderWidth:d.borderWidth,width:i,marginLeft:0}),h("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}),a?h("#wppa-overlay-ic").css({left:4}):h("#wppa-overlay-ic").css({left:(o-i)/2})):(h("#wppa-overlay-ic").css({marginLeft:0}),h("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(o-i)/2,position:"fixed"}),h("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}))):(d.canvasWidth=h(d.div).parent().width(),d.canvasHeight=d.canvasWidth/d.imageRatio,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight),d.run=2,d.ctrlbarUpdate=!0,g(t,d),p(t)}function n(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{run:2,deltaX:n*=1.5,buttondown:!0,manual:!1}),p(t)}function i(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{run:2,deltaX:-(n*=1.5),buttondown:!0,manual:!1}),p(t)}function r(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{run:2,deltaY:-(n*=1.5),buttondown:!0,manual:!1}),p(t)}function s(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{run:2,deltaY:n*=1.5,buttondown:!0,manual:!1}),p(t)}function c(t){g(t,{run:2,deltaFactor:1.005,buttondown:!0,manual:!1}),p(t)}function u(t){g(t,{run:2,deltaFactor:.995,buttondown:!0,manual:!1}),p(t)}function d(t){g(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function m(t,a){var n=g(t),o=w(a).X,e=w(a).Y;if(wppaIsFs()&&n.isLightbox&&(o<n.fsMaskLeft||o>n.fsMaskRight||e<n.fsMaskTop||e>n.fsMaskBottom))return g(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(g(t,{manual:!0,savedCanvasX:o=v(t,a).X,savedCanvasY:e=v(t,a).Y,run:2}),p(t))}function f(t,a){var n,o,e,i=g(t),r=v(t,a).X,s=v(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,o=(i.savedCanvasX-r)/n+i.fromX,e=(i.savedCanvasY-s)/n+i.fromY,0<o&&0<e&&o+i.fromWidth<i.image.width&&e+i.fromHeight<i.image.height&&g(t,{fromX:o,fromY:e,savedCanvasX:r,savedCanvasY:s}))}function l(t){g(t,{run:1,manual:!1})}function g(t,a){if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function w(t){var a,n;return n=wppaIsMobile?(a=t.touches[0].screenX,t.touches[0].screenY):(a=t.screenX,t.screenY),{X:a,Y:n}}function v(t,a){var n,o,e;return e=wppaIsMobile?(n=g(t),o=a.touches[0].screenX-n.fsMaskLeft,a.touches[0].screenY-n.fsMaskTop):(o=a.offsetX,a.offsetY),{X:o,Y:e}}}
|
js/wppa-zoom.js
CHANGED
@@ -8,7 +8,7 @@
|
|
8 |
function wppaDoZoomPan(mocc) {
|
9 |
|
10 |
var $ = jQuery;
|
11 |
-
var data =
|
12 |
|
13 |
// Been here before with same parms?
|
14 |
if ( data.initialized ) return;
|
@@ -27,6 +27,14 @@ function wppaDoZoomPan(mocc) {
|
|
27 |
}
|
28 |
wppaConsoleLog('Loading image ' + mocc + ' complete');
|
29 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
30 |
// Find additional data
|
31 |
data.manual = false;
|
32 |
data.deltaX = 0;
|
@@ -77,6 +85,7 @@ function wppaDoZoomPan(mocc) {
|
|
77 |
data.zoomout.on("touchend", function(e){buttonUp(mocc, e)});
|
78 |
data.canvas.addEventListener("touchstart", function(e){canvasDown(mocc, e)});
|
79 |
data.canvas.addEventListener("touchmove", function(e){canvasMove(mocc, e)});
|
|
|
80 |
}
|
81 |
else {
|
82 |
data.canvas.addEventListener("mousedown", function(e){canvasDown(mocc, e)});
|
@@ -117,12 +126,6 @@ function wppaDoZoomPan(mocc) {
|
|
117 |
// Install Resize handler
|
118 |
$(window).on("DOMContentLoaded load resize orientationchange",function(e){resize(mocc, e)});
|
119 |
|
120 |
-
// Log url
|
121 |
-
// wppaConsoleLog('Zoom url = '+data.image.src);
|
122 |
-
|
123 |
-
// Do the rendering
|
124 |
-
// render(mocc);
|
125 |
-
|
126 |
// Resize
|
127 |
resize(mocc);
|
128 |
|
@@ -130,27 +133,26 @@ function wppaDoZoomPan(mocc) {
|
|
130 |
data.initialized = true;
|
131 |
|
132 |
// Store data
|
133 |
-
|
134 |
|
135 |
// Remove spinner
|
136 |
$("#wppa-ovl-spin").hide();
|
137 |
|
138 |
// The render function
|
139 |
function render(mocc){
|
140 |
-
wppaDebugCounter++;
|
141 |
-
var data = wppaZoomData[mocc];
|
142 |
|
143 |
-
|
|
|
144 |
|
145 |
if ( data.isLightbox ) {
|
146 |
|
147 |
if ( ! wppaOvlOpen ) {
|
148 |
-
update(0,{abort:true});
|
149 |
}
|
150 |
}
|
151 |
else {
|
152 |
if ( wppaOvlOpen ) {
|
153 |
-
update(mocc,{run:0,manual:false});
|
154 |
}
|
155 |
}
|
156 |
|
@@ -161,10 +163,15 @@ function wppaDoZoomPan(mocc) {
|
|
161 |
|
162 |
if (data.run==0) return;
|
163 |
if (data.busy) return;
|
164 |
-
|
|
|
|
|
|
|
|
|
|
|
165 |
|
166 |
// manual is true when a drag on the canvas is being performed
|
167 |
-
if( ! data.manual ) {
|
168 |
|
169 |
// Panning
|
170 |
data.fromX += data.deltaX;
|
@@ -256,13 +263,13 @@ function wppaDoZoomPan(mocc) {
|
|
256 |
}
|
257 |
|
258 |
// Restore data
|
259 |
-
|
260 |
}
|
261 |
|
262 |
// When a (responsive) resize is required, we resize the wppaScene
|
263 |
function resize(mocc, e){
|
264 |
|
265 |
-
var data =
|
266 |
|
267 |
if ( data.isLightbox ) {
|
268 |
|
@@ -389,8 +396,6 @@ function wppaDoZoomPan(mocc) {
|
|
389 |
|
390 |
data.run=2;
|
391 |
data.ctrlbarUpdate = true;
|
392 |
-
wppaZoomData[mocc] = data;
|
393 |
-
render(mocc);
|
394 |
}
|
395 |
|
396 |
// Not lightbox
|
@@ -401,9 +406,12 @@ function wppaDoZoomPan(mocc) {
|
|
401 |
data.canvas.height = data.canvasHeight;
|
402 |
data.run=2;
|
403 |
data.ctrlbarUpdate = true;
|
404 |
-
wppaZoomData[mocc] = data;
|
405 |
-
render(mocc);
|
406 |
}
|
|
|
|
|
|
|
|
|
|
|
407 |
}
|
408 |
|
409 |
// Previous in lightbox
|
@@ -433,9 +441,16 @@ function wppaDoZoomPan(mocc) {
|
|
433 |
// Horizontal movement right by button
|
434 |
function rightDown(mocc, e){
|
435 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
436 |
update(mocc, {
|
437 |
run :2,
|
438 |
-
deltaX :
|
439 |
buttondown :true,
|
440 |
manual :false
|
441 |
});
|
@@ -445,9 +460,16 @@ function wppaDoZoomPan(mocc) {
|
|
445 |
// Horizontal movement left by button
|
446 |
function leftDown(mocc, e){
|
447 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
448 |
update(mocc, {
|
449 |
run :2,
|
450 |
-
deltaX :-
|
451 |
buttondown :true,
|
452 |
manual :false
|
453 |
});
|
@@ -457,9 +479,16 @@ function wppaDoZoomPan(mocc) {
|
|
457 |
// Vertical movement up by button
|
458 |
function upDown(mocc, e){
|
459 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
460 |
update(mocc, {
|
461 |
run :2,
|
462 |
-
deltaY :-
|
463 |
buttondown :true,
|
464 |
manual :false
|
465 |
});
|
@@ -469,9 +498,16 @@ function wppaDoZoomPan(mocc) {
|
|
469 |
// Vertical movement down by button
|
470 |
function downDown(mocc, e){
|
471 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
472 |
update(mocc, {
|
473 |
run :2,
|
474 |
-
deltaY :
|
475 |
buttondown :true,
|
476 |
manual :false
|
477 |
});
|
@@ -507,9 +543,10 @@ function wppaDoZoomPan(mocc) {
|
|
507 |
|
508 |
e.preventDefault();
|
509 |
e.stopPropagation();
|
|
|
510 |
update(mocc, {
|
511 |
run : 1,
|
512 |
-
deltaFactor : 1 + e.deltaY *
|
513 |
manual : false
|
514 |
});
|
515 |
render(mocc);
|
@@ -531,7 +568,7 @@ function wppaDoZoomPan(mocc) {
|
|
531 |
// when the mouse is pressed on the canvas, we switch to manual control and save current coordinates
|
532 |
function canvasDown(mocc, e){
|
533 |
|
534 |
-
var data =
|
535 |
|
536 |
// Find screen x and y
|
537 |
var X = findscreenxy(e).X;
|
@@ -564,7 +601,7 @@ function wppaDoZoomPan(mocc) {
|
|
564 |
// When the mouse is down (manual control) and moved adjust the coorinates
|
565 |
function canvasMove(mocc, e){
|
566 |
|
567 |
-
var data =
|
568 |
var X = findoffsetxy(mocc,e).X;
|
569 |
var Y = findoffsetxy(mocc,e).Y;
|
570 |
|
@@ -602,7 +639,7 @@ function wppaDoZoomPan(mocc) {
|
|
602 |
// when the mouse enters te canvas
|
603 |
function canvasEnter(mocc, e) {
|
604 |
|
605 |
-
var data =
|
606 |
|
607 |
if ( data.manual ) {
|
608 |
update(mocc, {run:2});
|
@@ -613,9 +650,13 @@ function wppaDoZoomPan(mocc) {
|
|
613 |
// Update data
|
614 |
function update(mocc, data) {
|
615 |
|
616 |
-
|
617 |
-
|
|
|
|
|
618 |
}
|
|
|
|
|
619 |
}
|
620 |
|
621 |
// Find screen x and y
|
@@ -631,12 +672,12 @@ function wppaDoZoomPan(mocc) {
|
|
631 |
}
|
632 |
return {X:X,Y:Y};
|
633 |
}
|
634 |
-
|
635 |
// Find offset x and y
|
636 |
function findoffsetxy(mocc,e) {
|
637 |
|
638 |
if ( wppaIsMobile ) {
|
639 |
-
var data =
|
640 |
var X = e.touches[0].screenX - data.fsMaskLeft;
|
641 |
var Y = e.touches[0].screenY - data.fsMaskTop;
|
642 |
}
|
8 |
function wppaDoZoomPan(mocc) {
|
9 |
|
10 |
var $ = jQuery;
|
11 |
+
var data = update(mocc);
|
12 |
|
13 |
// Been here before with same parms?
|
14 |
if ( data.initialized ) return;
|
27 |
}
|
28 |
wppaConsoleLog('Loading image ' + mocc + ' complete');
|
29 |
|
30 |
+
// Make sure css does not spoil the sizes
|
31 |
+
$(image).css({
|
32 |
+
width :image.naturalWidth,
|
33 |
+
height :image.naturalHeight,
|
34 |
+
maxWidth :image.naturalWidth,
|
35 |
+
maxHeight :image.naturalHeight
|
36 |
+
});
|
37 |
+
|
38 |
// Find additional data
|
39 |
data.manual = false;
|
40 |
data.deltaX = 0;
|
85 |
data.zoomout.on("touchend", function(e){buttonUp(mocc, e)});
|
86 |
data.canvas.addEventListener("touchstart", function(e){canvasDown(mocc, e)});
|
87 |
data.canvas.addEventListener("touchmove", function(e){canvasMove(mocc, e)});
|
88 |
+
data.canvas.addEventListener("touchend", function(e){canvasUp(mocc,e)});
|
89 |
}
|
90 |
else {
|
91 |
data.canvas.addEventListener("mousedown", function(e){canvasDown(mocc, e)});
|
126 |
// Install Resize handler
|
127 |
$(window).on("DOMContentLoaded load resize orientationchange",function(e){resize(mocc, e)});
|
128 |
|
|
|
|
|
|
|
|
|
|
|
|
|
129 |
// Resize
|
130 |
resize(mocc);
|
131 |
|
133 |
data.initialized = true;
|
134 |
|
135 |
// Store data
|
136 |
+
update(mocc,data);
|
137 |
|
138 |
// Remove spinner
|
139 |
$("#wppa-ovl-spin").hide();
|
140 |
|
141 |
// The render function
|
142 |
function render(mocc){
|
|
|
|
|
143 |
|
144 |
+
var data = update(mocc);
|
145 |
+
|
146 |
|
147 |
if ( data.isLightbox ) {
|
148 |
|
149 |
if ( ! wppaOvlOpen ) {
|
150 |
+
data = update(0,{run:0,abort:true});
|
151 |
}
|
152 |
}
|
153 |
else {
|
154 |
if ( wppaOvlOpen ) {
|
155 |
+
data = update(mocc,{run:0,manual:false});
|
156 |
}
|
157 |
}
|
158 |
|
163 |
|
164 |
if (data.run==0) return;
|
165 |
if (data.busy) return;
|
166 |
+
|
167 |
+
// Finally decides to do the rendering
|
168 |
+
wppaDebugCounter++;
|
169 |
+
wppaConsoleLog('Render zoom '+mocc+' '+wppaDebugCounter);
|
170 |
+
|
171 |
+
data = update(mocc,{busy:true});
|
172 |
|
173 |
// manual is true when a drag on the canvas is being performed
|
174 |
+
if ( ! data.manual ) {
|
175 |
|
176 |
// Panning
|
177 |
data.fromX += data.deltaX;
|
263 |
}
|
264 |
|
265 |
// Restore data
|
266 |
+
update(mocc, data);
|
267 |
}
|
268 |
|
269 |
// When a (responsive) resize is required, we resize the wppaScene
|
270 |
function resize(mocc, e){
|
271 |
|
272 |
+
var data = update(mocc);
|
273 |
|
274 |
if ( data.isLightbox ) {
|
275 |
|
396 |
|
397 |
data.run=2;
|
398 |
data.ctrlbarUpdate = true;
|
|
|
|
|
399 |
}
|
400 |
|
401 |
// Not lightbox
|
406 |
data.canvas.height = data.canvasHeight;
|
407 |
data.run=2;
|
408 |
data.ctrlbarUpdate = true;
|
|
|
|
|
409 |
}
|
410 |
+
|
411 |
+
// Save data and render
|
412 |
+
update(mocc, data);
|
413 |
+
render(mocc);
|
414 |
+
|
415 |
}
|
416 |
|
417 |
// Previous in lightbox
|
441 |
// Horizontal movement right by button
|
442 |
function rightDown(mocc, e){
|
443 |
|
444 |
+
var data = update(mocc);
|
445 |
+
var delta = data.image.naturalWidth / data.canvas.width;
|
446 |
+
if ( delta < 1.5 ) {
|
447 |
+
delta = 1.5;
|
448 |
+
}
|
449 |
+
delta *= 1.5;
|
450 |
+
|
451 |
update(mocc, {
|
452 |
run :2,
|
453 |
+
deltaX :delta,
|
454 |
buttondown :true,
|
455 |
manual :false
|
456 |
});
|
460 |
// Horizontal movement left by button
|
461 |
function leftDown(mocc, e){
|
462 |
|
463 |
+
var data = update(mocc);
|
464 |
+
var delta = data.image.naturalWidth / data.canvas.width;
|
465 |
+
if ( delta < 1.5 ) {
|
466 |
+
delta = 1.5;
|
467 |
+
}
|
468 |
+
delta *= 1.5;
|
469 |
+
|
470 |
update(mocc, {
|
471 |
run :2,
|
472 |
+
deltaX :-delta,
|
473 |
buttondown :true,
|
474 |
manual :false
|
475 |
});
|
479 |
// Vertical movement up by button
|
480 |
function upDown(mocc, e){
|
481 |
|
482 |
+
var data = update(mocc);
|
483 |
+
var delta = data.image.naturalHeight / data.canvas.height;
|
484 |
+
if ( delta < 1.5 ) {
|
485 |
+
delta = 1.5;
|
486 |
+
}
|
487 |
+
delta *= 1.5;
|
488 |
+
|
489 |
update(mocc, {
|
490 |
run :2,
|
491 |
+
deltaY :-delta,
|
492 |
buttondown :true,
|
493 |
manual :false
|
494 |
});
|
498 |
// Vertical movement down by button
|
499 |
function downDown(mocc, e){
|
500 |
|
501 |
+
var data = update(mocc);
|
502 |
+
var delta = data.image.naturalHeight / data.canvas.height;
|
503 |
+
if ( delta < 1.5 ) {
|
504 |
+
delta = 1.5;
|
505 |
+
}
|
506 |
+
delta *= 1.5;
|
507 |
+
|
508 |
update(mocc, {
|
509 |
run :2,
|
510 |
+
deltaY :delta,
|
511 |
buttondown :true,
|
512 |
manual :false
|
513 |
});
|
543 |
|
544 |
e.preventDefault();
|
545 |
e.stopPropagation();
|
546 |
+
data = update(mocc);
|
547 |
update(mocc, {
|
548 |
run : 1,
|
549 |
+
deltaFactor : 1 + e.deltaY * data.zoomsensitivity / ( wppaIsChrome ? 10000 : 1000 ),
|
550 |
manual : false
|
551 |
});
|
552 |
render(mocc);
|
568 |
// when the mouse is pressed on the canvas, we switch to manual control and save current coordinates
|
569 |
function canvasDown(mocc, e){
|
570 |
|
571 |
+
var data = update(mocc);
|
572 |
|
573 |
// Find screen x and y
|
574 |
var X = findscreenxy(e).X;
|
601 |
// When the mouse is down (manual control) and moved adjust the coorinates
|
602 |
function canvasMove(mocc, e){
|
603 |
|
604 |
+
var data = update(mocc);
|
605 |
var X = findoffsetxy(mocc,e).X;
|
606 |
var Y = findoffsetxy(mocc,e).Y;
|
607 |
|
639 |
// when the mouse enters te canvas
|
640 |
function canvasEnter(mocc, e) {
|
641 |
|
642 |
+
var data = update(mocc);
|
643 |
|
644 |
if ( data.manual ) {
|
645 |
update(mocc, {run:2});
|
650 |
// Update data
|
651 |
function update(mocc, data) {
|
652 |
|
653 |
+
if (data) {
|
654 |
+
for (var property in data) {
|
655 |
+
wppaZoomData[mocc][property] = data[property];
|
656 |
+
}
|
657 |
}
|
658 |
+
|
659 |
+
return wppaZoomData[mocc];
|
660 |
}
|
661 |
|
662 |
// Find screen x and y
|
672 |
}
|
673 |
return {X:X,Y:Y};
|
674 |
}
|
675 |
+
|
676 |
// Find offset x and y
|
677 |
function findoffsetxy(mocc,e) {
|
678 |
|
679 |
if ( wppaIsMobile ) {
|
680 |
+
var data = update(mocc);
|
681 |
var X = e.touches[0].screenX - data.fsMaskLeft;
|
682 |
var Y = e.touches[0].screenY - data.fsMaskTop;
|
683 |
}
|
js/wppa-zoom.min.js
CHANGED
@@ -1 +1 @@
|
|
1 |
-
function wppaDoZoomPan(o){var
|
1 |
+
function wppaDoZoomPan(o){var h=jQuery,e=g(o);if(!e.initialized&&!e.abort){if(e.isLightbox&&h("#wppa-ovl-spin").show(),!e.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),h(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),e.manual=!1,e.deltaX=0,e.deltaY=0,e.deltaFactor=1,e.run=1,e.busy=!1,e.div=h("#wppa-pan-div-"+e.itemId),e.canvas=document.getElementById("wppa-pan-canvas-"+e.itemId),e.left=h("#wppa-pctl-left-"+e.itemId),e.right=h("#wppa-pctl-right-"+e.itemId),e.up=h("#wppa-pctl-up-"+e.itemId),e.down=h("#wppa-pctl-down-"+e.itemId),e.zoomin=h("#wppa-pctl-zoomin-"+e.itemId),e.zoomout=h("#wppa-pctl-zoomout-"+e.itemId),e.prev=h("#wppa-pctl-prev-"+e.itemId),e.next=h("#wppa-pctl-next-"+e.itemId),e.exit=h("#wppa-exit-btn-2"),e.canvasWidth=e.width,e.canvasHeight=e.height,e.savedCanvasX=0,e.savedCanvasY=0,e.fromHeight=e.image.height,e.fromWidth=e.image.width,e.imageRatio=e.image.width/e.image.height,e.fromX=0,e.fromY=0,e.centerX=e.fromX+e.fromWidth/2,e.centerY=e.fromY+e.fromHeight/2,e.ctx=null,e.buttondown=!1,e.enableManual=!0,e.ctrlbarUpdate=!0,wppaIsMobile?(e.right.on("touchstart",function(t){n(o)}),e.right.on("touchend",function(t){d(o)}),e.left.on("touchstart",function(t){i(o)}),e.left.on("touchend",function(t){d(o)}),e.up.on("touchstart",function(t){r(o)}),e.up.on("touchend",function(t){d(o)}),e.down.on("touchstart",function(t){s(o)}),e.down.on("touchend",function(t){d(o)}),e.zoomin.on("touchstart",function(t){c(o)}),e.zoomin.on("touchend",function(t){d(o)}),e.zoomout.on("touchstart",function(t){u(o)}),e.zoomout.on("touchend",function(t){d(o)}),e.canvas.addEventListener("touchstart",function(t){m(o,t)}),e.canvas.addEventListener("touchmove",function(t){f(o,t)}),e.canvas.addEventListener("touchend",function(t){l(o)})):(e.canvas.addEventListener("mousedown",function(t){m(o,t)}),e.canvas.addEventListener("mousemove",function(t){f(o,t)}),e.canvas.addEventListener("mouseup",function(t){l(o)}),e.canvas.addEventListener("mouseleave",function(t){g(o,{run:0})}),e.canvas.addEventListener("mouseenter",function(t){var a;g(a=o).manual&&(g(a,{run:2}),p(a))}),document.getElementById("wppa-pan-canvas-"+e.itemId).addEventListener("wheel",function(t){var a,n;a=o,(n=t).preventDefault(),n.stopPropagation(),e=g(a),g(a,{run:1,deltaFactor:1+n.deltaY*e.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),p(a),setTimeout(function(){g(a,{deltaFactor:1})},25)}),e.right.on("mousedown",function(t){n(o)}),e.right.on("mouseup",function(t){d(o)}),e.left.on("mousedown",function(t){i(o)}),e.left.on("mouseup",function(t){d(o)}),e.up.on("mousedown",function(t){r(o)}),e.up.on("mouseup",function(t){d(o)}),e.down.on("mousedown",function(t){s(o)}),e.down.on("mouseup",function(t){d(o)}),e.zoomin.on("mousedown",function(t){c(o)}),e.zoomin.on("mouseup",function(t){d(o)}),e.zoomout.on("mousedown",function(t){u(o)}),e.zoomout.on("mouseup",function(t){d(o)})),e.isLightbox&&(h(".wppa-fulls-btn").on("click",function(){g(0,{abort:!0})}),h(".wppa-exit-fulls-btn").on("click",function(){g(0,{abort:!0})}),e.prev&&(e.prev.on("click",function(t){h("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowPrev()}),e.next.on("click",function(t){h("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowNext()})),e.exit.on("click",function(t){h("#wppa-ovl-spin").hide(),g(0,{abort:!0}),wppaOvlHide()})),h(window).on("DOMContentLoaded load resize orientationchange",function(t){a(o)}),a(o),e.initialized=!0,g(o,e),h("#wppa-ovl-spin").hide()}function p(t){var a,n,o,e,i,r=g(t);r.isLightbox?wppaOvlOpen||(r=g(0,{run:0,abort:!0})):wppaOvlOpen&&(r=g(t,{run:0,manual:!1})),r.abort?g(t,{ctx:null}):0!=r.run&&(r.busy||(wppaDebugCounter++,wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter),(r=g(t,{busy:!0})).manual||(r.fromX+=r.deltaX,r.fromY+=r.deltaY,a=r.fromHeight/r.deltaFactor,n=r.fromWidth/r.deltaFactor,50<a&&1!=r.deltaFactor&&(wppaIsFs()||a<=r.image.height)&&(r.fromX-=(n-r.fromWidth)/2,r.fromY-=(a-r.fromHeight)/2,r.fromWidth=n,r.fromHeight=a)),r.fromX=Math.max(0,Math.min(r.image.width-r.fromWidth,r.fromX)),r.fromY=Math.max(0,Math.min(r.image.height-r.fromHeight,r.fromY)),o=screen.width/screen.height,e=(1-r.image.width/r.fromWidth)*r.canvas.width/2,i=(1-r.image.height/r.fromHeight)*r.canvas.height/2,r.ctx=r.canvas.getContext("2d"),o>r.imageRatio&&a>r.image.height&&wppaIsFs()||o<=r.imageRatio&&n>r.image.width&&wppaIsFs()?(r.enableManual=!1,r.ctx.clearRect(0,0,r.canvas.width,r.canvas.height),r.ctx.drawImage(r.image,r.fromX,r.fromY,r.fromWidth,r.fromHeight,e,i,r.canvas.width,r.canvas.height),jQuery(r.canvas).css({cursor:"default"})):(r.enableManual=!0,r.ctx.drawImage(r.image,r.fromX,r.fromY,r.fromWidth,r.fromHeight,0,0,r.canvas.width,r.canvas.height),jQuery(r.canvas).css({cursor:"grab"})),wppaIsFs()?(r.fsMaskTop=i-(r.canvas.height-screen.height)/2,r.fsMaskLeft=e-(r.canvas.width-screen.width)/2,r.fsMaskBottom=screen.height-r.fsMaskTop,r.fsMaskRight=screen.width-r.fsMaskLeft):(r.fsMaskTop=0,r.fsMaskLeft=0,r.fsMaskBottom=0,r.fsMaskRight=0),r.busy=!1,0<r.run&&(r.manual||r.buttondown)&&setTimeout(function(){p(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),g(t,r)))}function a(t){var a,n,o,e,i,r,s,c,u,d=g(t);d.isLightbox?(h("#wppa-overlay-ic").css("display",""),e=(n=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),s=0,u=(c=8)+(d.controls?d.icsize+10:0)+10,n?(c+=2*d.borderWidth,u+=2*d.borderWidth):c=40,a=n?e-u>(o-c)/d.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<d.imageRatio),n&&a&&(s=(e-(r=(i=o-c)/d.imageRatio)-u)/2+20),n&&!a&&(r=(i=d.imageRatio*(e-(d.controls?d.icsize:0)-48))/d.imageRatio,s=20),!n&&a&&(i=(r=screen.height)*d.imageRatio,s=0),n||a||(r=(i=screen.width)/d.imageRatio,s=(screen.height-r)/2),h("#wppa-ovl-pan-container").css({marginTop:s}),h("#wppa-overlay-ic").css({marginTop:0}),d.canvasWidth=i,d.canvasHeight=r,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight,n?(h("#wppa-ovl-pan-container").css({backgroundColor:d.backgroundColor,padding:d.padding,borderRadius:d.borderRadius,borderWidth:d.borderWidth,width:i,marginLeft:0}),h("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}),a?h("#wppa-overlay-ic").css({left:4}):h("#wppa-overlay-ic").css({left:(o-i)/2})):(h("#wppa-overlay-ic").css({marginLeft:0}),h("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(o-i)/2,position:"fixed"}),h("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}))):(d.canvasWidth=h(d.div).parent().width(),d.canvasHeight=d.canvasWidth/d.imageRatio,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight),d.run=2,d.ctrlbarUpdate=!0,g(t,d),p(t)}function n(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{run:2,deltaX:n*=1.5,buttondown:!0,manual:!1}),p(t)}function i(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{run:2,deltaX:-(n*=1.5),buttondown:!0,manual:!1}),p(t)}function r(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{run:2,deltaY:-(n*=1.5),buttondown:!0,manual:!1}),p(t)}function s(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{run:2,deltaY:n*=1.5,buttondown:!0,manual:!1}),p(t)}function c(t){g(t,{run:2,deltaFactor:1.005,buttondown:!0,manual:!1}),p(t)}function u(t){g(t,{run:2,deltaFactor:.995,buttondown:!0,manual:!1}),p(t)}function d(t){g(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function m(t,a){var n=g(t),o=w(a).X,e=w(a).Y;if(wppaIsFs()&&n.isLightbox&&(o<n.fsMaskLeft||o>n.fsMaskRight||e<n.fsMaskTop||e>n.fsMaskBottom))return g(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(g(t,{manual:!0,savedCanvasX:o=v(t,a).X,savedCanvasY:e=v(t,a).Y,run:2}),p(t))}function f(t,a){var n,o,e,i=g(t),r=v(t,a).X,s=v(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,o=(i.savedCanvasX-r)/n+i.fromX,e=(i.savedCanvasY-s)/n+i.fromY,0<o&&0<e&&o+i.fromWidth<i.image.width&&e+i.fromHeight<i.image.height&&g(t,{fromX:o,fromY:e,savedCanvasX:r,savedCanvasY:s}))}function l(t){g(t,{run:1,manual:!1})}function g(t,a){if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function w(t){var a,n;return n=wppaIsMobile?(a=t.touches[0].screenX,t.touches[0].screenY):(a=t.screenX,t.screenY),{X:a,Y:n}}function v(t,a){var n,o,e;return e=wppaIsMobile?(n=g(t),o=a.touches[0].screenX-n.fsMaskLeft,a.touches[0].screenY-n.fsMaskTop):(o=a.offsetX,a.offsetY),{X:o,Y:e}}}
|
theme/wppa-style.css
CHANGED
@@ -587,3 +587,8 @@ display:none;
|
|
587 |
#wppa-fulls-btn-1, #wppa-exit-fulls-btn-1, #wppa-ovl-spin {
|
588 |
z-index:200010;
|
589 |
}
|
|
|
|
|
|
|
|
|
|
587 |
#wppa-fulls-btn-1, #wppa-exit-fulls-btn-1, #wppa-ovl-spin {
|
588 |
z-index:200010;
|
589 |
}
|
590 |
+
|
591 |
+
#wppa-pre-curr {
|
592 |
+
max-width:48000px !important;
|
593 |
+
max-height:48000px !important;
|
594 |
+
}
|
wppa-items.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains functions to retrieve album and photo items
|
6 |
-
* Version 7.
|
7 |
*
|
8 |
*/
|
9 |
|
@@ -473,7 +473,7 @@ function wppa_translate_photo_keywords( $id, $text ) {
|
|
473 |
$custom = $thumb['custom'];
|
474 |
$custom_data = $custom ? wppa_unserialize( $custom ) : array( '', '', '', '', '', '', '', '', '', '' );
|
475 |
for ( $i = '0'; $i < '10'; $i++ ) {
|
476 |
-
$rep = stripslashes( $custom_data[$i] );
|
477 |
|
478 |
// Patch for Rasada. Replace yyyy0101 by yyyy, yyyymmdd by yyyy.mm.dd
|
479 |
if ( strlen( $rep ) == 8 && is_numeric( $rep ) ) {
|
3 |
* Package: wp-photo-album-plus
|
4 |
*
|
5 |
* Contains functions to retrieve album and photo items
|
6 |
+
* Version 7.5.08
|
7 |
*
|
8 |
*/
|
9 |
|
473 |
$custom = $thumb['custom'];
|
474 |
$custom_data = $custom ? wppa_unserialize( $custom ) : array( '', '', '', '', '', '', '', '', '', '' );
|
475 |
for ( $i = '0'; $i < '10'; $i++ ) {
|
476 |
+
$rep = __( stripslashes( $custom_data[$i] ) ); // Replacement, qTranslate style translated
|
477 |
|
478 |
// Patch for Rasada. Replace yyyy0101 by yyyy, yyyymmdd by yyyy.mm.dd
|
479 |
if ( strlen( $rep ) == 8 && is_numeric( $rep ) ) {
|
wppa.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
/*
|
3 |
* Plugin Name: WP Photo Album Plus
|
4 |
* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
|
5 |
-
* Version: 7.5.08.
|
6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
7 |
* Author URI: http://wppa.opajaap.nl/
|
8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
@@ -24,7 +24,7 @@ global $wp_version;
|
|
24 |
|
25 |
/* WPPA GLOBALS */
|
26 |
global $wppa_revno; $wppa_revno = '7508'; // WPPA db version
|
27 |
-
global $wppa_api_version; $wppa_api_version = '7.5.08.
|
28 |
|
29 |
/* Init page js data */
|
30 |
global $wppa_js_page_data; $wppa_js_page_data = '';
|
2 |
/*
|
3 |
* Plugin Name: WP Photo Album Plus
|
4 |
* Description: Easily manage and display your photo albums and slideshows within your WordPress site.
|
5 |
+
* Version: 7.5.08.006
|
6 |
* Author: J.N. Breetvelt a.k.a. OpaJaap
|
7 |
* Author URI: http://wppa.opajaap.nl/
|
8 |
* Plugin URI: http://wordpress.org/extend/plugins/wp-photo-album-plus/
|
24 |
|
25 |
/* WPPA GLOBALS */
|
26 |
global $wppa_revno; $wppa_revno = '7508'; // WPPA db version
|
27 |
+
global $wppa_api_version; $wppa_api_version = '7.5.08.006'; // WPPA software version
|
28 |
|
29 |
/* Init page js data */
|
30 |
global $wppa_js_page_data; $wppa_js_page_data = '';
|