WP Photo Album Plus - Version 7.5.08.004

Version Description

= 7.5.08 =

This version addresses various bug fixes and feature requests.

Release Info

Developer	opajaap
Plugin	WP Photo Album Plus
Version	7.5.08.004
Comparing to
See all releases

Code changes from version 7.5.08.003 to 7.5.08.004

Files changed (7) hide show

js/wppa-all.js +1 -1
js/wppa-zoom.js +32 -24
js/wppa-zoom.min.js +1 -1
wppa-non-admin.php +6 -0
wppa-picture.php +25 -21
wppa-upload.php +2 -2
wppa.php +2 -2

js/wppa-all.js CHANGED Viewed

	@@ -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(a){var p=jQuery,t=wppaZoomData[a];if(!t.initialized){if(t.isLightbox&&p("#wppa-ovl-spin").show(),!t.image.complete)return wppaConsoleLog("Loading image "+a),void setTimeout(function(){wppaDoZoomPan(a)},200);wppaConsoleLog("Loading image "+a+" complete"),t.~~manualControl~~=!1,t.deltaX=0,t.deltaY=0,t.deltaFactor=1,t.run=1,t.busy=!1,t.~~abort=!1,t.~~div=p("#wppa-pan-div-"+t.itemId),t.canvas=document.getElementById("wppa-pan-canvas-"+t.itemId),t.left=p("#wppa-pctl-left-"+t.itemId),t.right=p("#wppa-pctl-right-"+t.itemId),t.up=p("#wppa-pctl-up-"+t.itemId),t.down=p("#wppa-pctl-down-"+t.itemId),t.zoomin=p("#wppa-pctl-zoomin-"+t.itemId),t.zoomout=p("#wppa-pctl-zoomout-"+t.itemId),t.prev=p("#wppa-pctl-prev-"+t.itemId),t.next=p("#wppa-pctl-next-"+t.itemId),t.canvasWidth=t.width,t.canvasHeight=t.height,t.savedCanvasX=0,t.savedCanvasY=0,t.fromHeight=t.image.height,t.fromWidth=t.image.width,t.imageRatio=t.image.width/t.image.height,t.fromX=0,t.fromY=0,t.centerX=t.fromX+t.fromWidth/2,t.centerY=t.fromY+t.fromHeight/2,t.ctx=null,t.buttondown=!1,t.enableManual=!0,t.ctrlbarUpdate=!0,wppaIsMobile?(t.right.on("touchstart",function(t){n(a)}),t.right.on("touchend",function(t){u(a)}),t.left.on("touchstart",function(t){e(a)}),t.left.on("touchend",function(t){u(a)}),t.up.on("touchstart",function(t){i(a)}),t.up.on("touchend",function(t){u(a)}),t.down.on("touchstart",function(t){r(a)}),t.down.on("touchend",function(t){u(a)}),t.zoomin.on("touchstart",function(t){s(a)}),t.zoomin.on("touchend",function(t){u(a)}),t.zoomout.on("touchstart",function(t){c(a)}),t.zoomout.on("touchend",function(t){u(a)}),t.canvas.addEventListener("touchstart",function(t){d(a,t)})):(t.canvas.addEventListener("mousedown",function(t){d(a,t)}),t.canvas.addEventListener("mousemove",function(t){!function(t,o){var n=wppaZoomData[t];{var a,e,i;n.~~manualControl~~&&(a=n.canvas.width/n.fromWidth,e=(n.savedCanvasX-o.offsetX)/a+n.fromX,i=(n.savedCanvasY-o.offsetY)/a+n.fromY,0<e&&0<i&&e+n.fromWidth<n.image.width&&i+n.fromHeight<n.image.height&&h(t,{fromX:e,fromY:i,savedCanvasX:o.offsetX,savedCanvasY:o.offsetY}))}}(a,t)}),t.canvas.addEventListener("mouseup",function(t){h(a,{run:1,~~manualControl~~:!1})}),t.canvas.addEventListener("mouseleave",function(t){h(a,{run:0})}),t.canvas.addEventListener("mouseenter",function(t){var o;o=a,wppaZoomData[o].~~manualControl~~&&(h(o,{run:2}),m(o))}),document.getElementById("wppa-pan-canvas-"+t.itemId).addEventListener("wheel",function(t){var o,n;o=a,(n=t).preventDefault(),n.stopPropagation(),h(o,{run:1,deltaFactor:1+n.deltaYwppaZoomData[o].zoomsensitivity/(wppaIsChrome?1e4:1e3),~~manualControl~~:!1}),m(o),setTimeout(function(){h(o,{deltaFactor:1})},25)}),t.right.on("mousedown",function(t){n(a)}),t.right.on("mouseup",function(t){u(a)}),t.left.on("mousedown",function(t){e(a)}),t.left.on("mouseup",function(t){u(a)}),t.up.on("mousedown",function(t){i(a)}),t.up.on("mouseup",function(t){u(a)}),t.down.on("mousedown",function(t){r(a)}),t.down.on("mouseup",function(t){u(a)}),t.zoomin.on("mousedown",function(t){s(a)}),t.zoomin.on("mouseup",function(t){u(a)}),t.zoomout.on("mousedown",function(t){c(a)}),t.zoomout.on("mouseup",function(t){u(a)})),t.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){h(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){h(0,{abort:!0})}),t.prev&&(t.prev.on("click",function(t){p("#wppa-ovl-spin").show(),wppaOvlShowPrev()}),t.next.on("click",function(t){p("#wppa-ovl-spin").show(),wppaOvlShowNext()}))),p(window).on("DOMContentLoaded load resize orientationchange",function(t){o(a)}),o(a),t.initialized=!0,wppaZoomData[a]=t,p("#wppa-ovl-spin").hide()}function m(t){wppaDebugCounter++;var o,n,a,e,i,r=wppaZoomData[t];~~if(~~wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter+" run="+r.run+" abort="+r.abort),r.isLightbox?wppaOvlOpen\|\|(r.abort=!0):wppaOvlOpen&&(r.run=0,~~r.manualControl=!~~1),r.abort~~)return r.~~ctx=null~~,void(r.prevctx=null~~);0!=r.run&&(r.busy\|\|(r.busy=!0,r.~~manualControl~~\|\|(r.fromX+=r.deltaX,r.fromY+=r.deltaY,o=r.fromHeight/r.deltaFactor,n=r.fromWidth/r.deltaFactor,50<o&&1!=r.deltaFactor&&(wppaIsFs()\|\|o<=r.image.height)&&(r.fromX-=(n-r.fromWidth)/2,r.fromY-=(o-r.fromHeight)/2,r.fromWidth=n,r.fromHeight=o)),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)),a=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"),a>r.imageRatio&&o>r.image.height&&wppaIsFs()\|\|a<=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.~~manualControl~~\|\|r.buttondown)&&setTimeout(function(){m(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),wppaZoomData[t]=r))}function o(t){var o,n,a,e,i,r,s,c,u,d=wppaZoomData[t];d.isLightbox?(p("#wppa-overlay-ic").css("display",""),e=(n=!wppaIsFs())?(a=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(a=screen.width,screen.height),s=0,u=(c=8)+(d.controls?d.icsize+10:0)+10,n?(c+=2d.borderWidth,u+=2d.borderWidth):c=40,o=n?e-u>(a-c)/d.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<d.imageRatio),n&&o&&(s=(e-(r=(i=a-c)/d.imageRatio)-u)/2+20),n&&!o&&(r=(i=d.imageRatio(e-(d.controls?d.icsize:0)-48))/d.imageRatio,s=20),!n&&o&&(i=(r=screen.height)*d.imageRatio,s=0),n\|\|o\|\|(r=(i=screen.width)/d.imageRatio,s=(screen.height-r)/2),p("#wppa-ovl-pan-container").css({marginTop:s}),p("#wppa-overlay-ic").css({marginTop:0}),d.canvasWidth=i,d.canvasHeight=r,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:d.backgroundColor,padding:d.padding,borderRadius:d.borderRadius,borderWidth:d.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}),o?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(a-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(a-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}))):(d.canvasWidth=p(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,wppaZoomData[t]=d,m(t)}function n(t){h(t,{run:2,deltaX:3,buttondown:!0,~~manualControl~~:!1}),m(t)}function e(t){h(t,{run:2,deltaX:-3,buttondown:!0,~~manualControl~~:!1}),m(t)}function i(t){h(t,{run:2,deltaY:-3,buttondown:!0,~~manualControl~~:!1}),m(t)}function r(t){h(t,{run:2,deltaY:3,buttondown:!0,~~manualControl~~:!1}),m(t)}function s(t){h(t,{run:2,deltaFactor:1.005,buttondown:!0,~~manualControl~~:!1}),m(t)}function c(t){h(t,{run:2,deltaFactor:.995,buttondown:!0,~~manualControl~~:!1}),m(t)}function u(t){h(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function d(t,o){var n=wppaZoomData[t],a=f(o).X,e=f(o).Y;wppaIsFs()&&n.isLightbox&&(a<n.fsMaskLeft\|\|a>n.fsMaskRight\|\|e<n.fsMaskTop\|\|e>n.fsMaskBottom)?jQuery("#wppa-overlay-bg").trigger("click"):n.enableManual&&(h(t,{~~manualControl~~:!0,savedCanvasX:o.offsetX,savedCanvasY:o.offsetY,run:2}),m(t))}function h(t,o){for(var n in o)wppaZoomData[t][n]=o[n]}function f(t){var o,n;return n=wppaIsMobile?(o=t.touches[0].screenX,t.touches[0].screenY):(o=t.screenX,t.screenY),{X:o,Y:n}}}


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 p=jQuery,t=wppaZoomData[o];if(!t.initialized&&!t.abort){if(t.isLightbox&&p("#wppa-ovl-spin").show(),!t.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),t.manual=!1,t.deltaX=0,t.deltaY=0,t.deltaFactor=1,t.run=1,t.busy=!1,t.div=p("#wppa-pan-div-"+t.itemId),t.canvas=document.getElementById("wppa-pan-canvas-"+t.itemId),t.left=p("#wppa-pctl-left-"+t.itemId),t.right=p("#wppa-pctl-right-"+t.itemId),t.up=p("#wppa-pctl-up-"+t.itemId),t.down=p("#wppa-pctl-down-"+t.itemId),t.zoomin=p("#wppa-pctl-zoomin-"+t.itemId),t.zoomout=p("#wppa-pctl-zoomout-"+t.itemId),t.prev=p("#wppa-pctl-prev-"+t.itemId),t.next=p("#wppa-pctl-next-"+t.itemId),t.exit=p("#wppa-exit-btn-2"),t.canvasWidth=t.width,t.canvasHeight=t.height,t.savedCanvasX=0,t.savedCanvasY=0,t.fromHeight=t.image.height,t.fromWidth=t.image.width,t.imageRatio=t.image.width/t.image.height,t.fromX=0,t.fromY=0,t.centerX=t.fromX+t.fromWidth/2,t.centerY=t.fromY+t.fromHeight/2,t.ctx=null,t.buttondown=!1,t.enableManual=!0,t.ctrlbarUpdate=!0,wppaIsMobile?(t.right.on("touchstart",function(t){n(o)}),t.right.on("touchend",function(t){d(o)}),t.left.on("touchstart",function(t){e(o)}),t.left.on("touchend",function(t){d(o)}),t.up.on("touchstart",function(t){i(o)}),t.up.on("touchend",function(t){d(o)}),t.down.on("touchstart",function(t){r(o)}),t.down.on("touchend",function(t){d(o)}),t.zoomin.on("touchstart",function(t){s(o)}),t.zoomin.on("touchend",function(t){d(o)}),t.zoomout.on("touchstart",function(t){c(o)}),t.zoomout.on("touchend",function(t){d(o)}),t.canvas.addEventListener("touchstart",function(t){u(o,t)})):(t.canvas.addEventListener("mousedown",function(t){u(o,t)}),t.canvas.addEventListener("mousemove",function(t){!function(t,a){var n=wppaZoomData[t];{var o,e,i;n.manual&&(o=n.canvas.width/n.fromWidth,e=(n.savedCanvasX-a.offsetX)/o+n.fromX,i=(n.savedCanvasY-a.offsetY)/o+n.fromY,0<e&&0<i&&e+n.fromWidth<n.image.width&&i+n.fromHeight<n.image.height&&h(t,{fromX:e,fromY:i,savedCanvasX:a.offsetX,savedCanvasY:a.offsetY}))}}(o,t)}),t.canvas.addEventListener("mouseup",function(t){h(o,{run:1,manual:!1})}),t.canvas.addEventListener("mouseleave",function(t){h(o,{run:0})}),t.canvas.addEventListener("mouseenter",function(t){var a;a=o,wppaZoomData[a].manual&&(h(a,{run:2}),m(a))}),document.getElementById("wppa-pan-canvas-"+t.itemId).addEventListener("wheel",function(t){var a,n;a=o,(n=t).preventDefault(),n.stopPropagation(),h(a,{run:1,deltaFactor:1+n.deltaYwppaZoomData[a].zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),m(a),setTimeout(function(){h(a,{deltaFactor:1})},25)}),t.right.on("mousedown",function(t){n(o)}),t.right.on("mouseup",function(t){d(o)}),t.left.on("mousedown",function(t){e(o)}),t.left.on("mouseup",function(t){d(o)}),t.up.on("mousedown",function(t){i(o)}),t.up.on("mouseup",function(t){d(o)}),t.down.on("mousedown",function(t){r(o)}),t.down.on("mouseup",function(t){d(o)}),t.zoomin.on("mousedown",function(t){s(o)}),t.zoomin.on("mouseup",function(t){d(o)}),t.zoomout.on("mousedown",function(t){c(o)}),t.zoomout.on("mouseup",function(t){d(o)})),t.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){h(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){h(0,{abort:!0})}),t.prev&&(t.prev.on("click",function(t){p("#wppa-ovl-spin").show(),h(0,{abort:!0}),wppaOvlShowPrev()}),t.next.on("click",function(t){p("#wppa-ovl-spin").show(),h(0,{abort:!0}),wppaOvlShowNext()})),t.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),h(0,{abort:!0}),wppaOvlHide()})),p(window).on("DOMContentLoaded load resize orientationchange",function(t){a(o)}),a(o),t.initialized=!0,wppaZoomData[o]=t,p("#wppa-ovl-spin").hide()}function m(t){wppaDebugCounter++;var a,n,o,e,i,r=wppaZoomData[t];wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter+" run="+r.run+" abort="+r.abort),r.isLightbox?wppaOvlOpen\|\|h(0,{abort:!0}):wppaOvlOpen&&h(t,{run:0,manual:!1}),r.abort?h(t,{ctx:null}):0!=r.run&&(r.busy\|\|(r.busy=!0,r.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(){m(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),wppaZoomData[t]=r))}function a(t){var a,n,o,e,i,r,s,c,d,u=wppaZoomData[t];u.isLightbox?(p("#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,d=(c=8)+(u.controls?u.icsize+10:0)+10,n?(c+=2u.borderWidth,d+=2u.borderWidth):c=40,a=n?e-d>(o-c)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(s=(e-(r=(i=o-c)/u.imageRatio)-d)/2+20),n&&!a&&(r=(i=u.imageRatio(e-(u.controls?u.icsize:0)-48))/u.imageRatio,s=20),!n&&a&&(i=(r=screen.height)*u.imageRatio,s=0),n\|\|a\|\|(r=(i=screen.width)/u.imageRatio,s=(screen.height-r)/2),p("#wppa-ovl-pan-container").css({marginTop:s}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=r,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:u.backgroundColor,padding:u.padding,borderRadius:u.borderRadius,borderWidth:u.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}),a?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(o-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(o-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}))):(u.canvasWidth=p(u.div).parent().width(),u.canvasHeight=u.canvasWidth/u.imageRatio,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight),u.run=2,u.ctrlbarUpdate=!0,wppaZoomData[t]=u,m(t)}function n(t){h(t,{run:2,deltaX:3,buttondown:!0,manual:!1}),m(t)}function e(t){h(t,{run:2,deltaX:-3,buttondown:!0,manual:!1}),m(t)}function i(t){h(t,{run:2,deltaY:-3,buttondown:!0,manual:!1}),m(t)}function r(t){h(t,{run:2,deltaY:3,buttondown:!0,manual:!1}),m(t)}function s(t){h(t,{run:2,deltaFactor:1.005,buttondown:!0,manual:!1}),m(t)}function c(t){h(t,{run:2,deltaFactor:.995,buttondown:!0,manual:!1}),m(t)}function d(t){h(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function u(t,a){var n=wppaZoomData[t],o=f(a).X,e=f(a).Y;if(wppaIsFs()&&n.isLightbox&&(o<n.fsMaskLeft\|\|o>n.fsMaskRight\|\|e<n.fsMaskTop\|\|e>n.fsMaskBottom))return h(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(h(t,{manual:!0,savedCanvasX:a.offsetX,savedCanvasY:a.offsetY,run:2}),m(t))}function h(t,a){for(var n in a)wppaZoomData[t][n]=a[n]}function f(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}}}

js/wppa-zoom.js CHANGED Viewed

	@@ -12,6 +12,7 @@ function wppaDoZoomPan(mocc) {
12
13	// Been here before with same parms?
14	if ( data.initialized ) return;

15
16	// If lightbox, show spinner
17	if ( data.isLightbox ) {
	@@ -27,13 +28,12 @@ function wppaDoZoomPan(mocc) {
27	wppaConsoleLog('Loading image ' + mocc + ' complete');
28
29	// Find additional data
30	- data.~~manualControl~~ = false;
31	data.deltaX = 0;
32	data.deltaY = 0;
33	data.deltaFactor = 1.0;
34	data.run = 1;
35	data.busy = false;
36	- data.abort = false;
37	data.div = $( "#wppa-pan-div-" + data.itemId );
38	data.canvas = document.getElementById( "wppa-pan-canvas-" + data.itemId );
39	data.left = $( "#wppa-pctl-left-" + data.itemId );
	@@ -44,6 +44,7 @@ function wppaDoZoomPan(mocc) {
44	data.zoomout = $( "#wppa-pctl-zoomout-" + data.itemId );
45	data.prev = $( "#wppa-pctl-prev-" + data.itemId );
46	data.next = $( "#wppa-pctl-next-" + data.itemId );

47	data.canvasWidth = data.width;
48	data.canvasHeight = data.height;
49	data.savedCanvasX = 0;
	@@ -109,6 +110,7 @@ function wppaDoZoomPan(mocc) {
109	data.prev.on("click", panPrev);
110	data.next.on("click", panNext);
111	}

112	}
113
114	// Install Resize handler
	@@ -139,23 +141,20 @@ function wppaDoZoomPan(mocc) {
139
140	wppaConsoleLog('Render zoom '+mocc+' '+wppaDebugCounter+' run='+data.run+' abort='+data.abort);
141
142	-
143	if ( data.isLightbox ) {
144
145	if ( ! wppaOvlOpen ) {
146	- ~~data.~~abort=true;
147	}
148	}
149	else {
150	if ( wppaOvlOpen ) {
151	- ~~data.~~run = 0;
152	- data.manualControl = false;
153	}
154	}
155
156	if ( data.abort ) {
157	- ~~data.~~ctx = null;
158	- data.prevctx = null;
159	return;
160	}
161
	@@ -163,8 +162,8 @@ function wppaDoZoomPan(mocc) {
163	if (data.busy) return;
164	data.busy = true;
165
166	- // ~~manualControl~~ is true when a drag on the canvas is being performed
167	- if( ! data.~~manualControl~~ ) {
168
169	// Panning
170	data.fromX += data.deltaX;
	@@ -237,7 +236,7 @@ function wppaDoZoomPan(mocc) {
237
238	// Re-render if needed
239	if (data.run>0) {
240	- if (data.~~manualControl~~){
241	setTimeout(function(){render(mocc)},5);
242	}
243	else if (data.buttondown){
	@@ -409,19 +408,27 @@ function wppaDoZoomPan(mocc) {
409	// Previous in lightbox
410	function panPrev(e) {
411
412	- // update(0,{abort:true});
413	$("#wppa-ovl-spin").show();

414	wppaOvlShowPrev();
415	}
416
417	// Next in lightbox
418	function panNext(e) {
419
420	- // update(0,{abort:true});
421	$("#wppa-ovl-spin").show();

422	wppaOvlShowNext();
423	}
424








425	// Horizontal movement right by button
426	function rightDown(mocc, e){
427
	@@ -429,7 +436,7 @@ function wppaDoZoomPan(mocc) {
429	run :2,
430	deltaX :3,
431	buttondown :true,
432	- ~~manualControl~~ :false
433	});
434	render(mocc);
435	}
	@@ -441,7 +448,7 @@ function wppaDoZoomPan(mocc) {
441	run :2,
442	deltaX :-3,
443	buttondown :true,
444	- ~~manualControl~~ :false
445	});
446	render(mocc);
447	}
	@@ -453,7 +460,7 @@ function wppaDoZoomPan(mocc) {
453	run :2,
454	deltaY :-3,
455	buttondown :true,
456	- ~~manualControl~~ :false
457	});
458	render(mocc);
459	}
	@@ -465,7 +472,7 @@ function wppaDoZoomPan(mocc) {
465	run :2,
466	deltaY :3,
467	buttondown :true,
468	- ~~manualControl~~ :false
469	});
470	render(mocc);
471	}
	@@ -477,7 +484,7 @@ function wppaDoZoomPan(mocc) {
477	run :2,
478	deltaFactor :1.005,
479	buttondown :true,
480	- ~~manualControl~~ :false
481	});
482	render(mocc);
483	}
	@@ -489,7 +496,7 @@ function wppaDoZoomPan(mocc) {
489	run :2,
490	deltaFactor :0.995,
491	buttondown :true,
492	- ~~manualControl~~ :false
493	});
494	render(mocc);
495	}
	@@ -502,7 +509,7 @@ function wppaDoZoomPan(mocc) {
502	update(mocc, {
503	run : 1,
504	deltaFactor : 1 + e.deltaY * wppaZoomData[mocc].zoomsensitivity / ( wppaIsChrome ? 10000 : 1000 ),
505	- ~~manualControl~~ : false
506	});
507	render(mocc);
508	setTimeout(function(){update(mocc, {deltaFactor:1})}, 25);
	@@ -532,6 +539,7 @@ function wppaDoZoomPan(mocc) {
532	// If fs and outside image, transfer to wppa-overlay-bg
533	if ( wppaIsFs() && data.isLightbox ) {
534	if ( X < data.fsMaskLeft \|\| X > data.fsMaskRight \|\| Y < data.fsMaskTop \|\| Y > data.fsMaskBottom ) {

535	jQuery( '#wppa-overlay-bg' ).trigger( 'click' );
536	return;
537	}
	@@ -540,7 +548,7 @@ function wppaDoZoomPan(mocc) {
540	if ( data.enableManual ) {
541
542	update(mocc, {
543	- ~~manualControl~~ :true,
544	savedCanvasX :e.offsetX,
545	savedCanvasY :e.offsetY,
546	run :2,
	@@ -554,7 +562,7 @@ function wppaDoZoomPan(mocc) {
554
555	var data = wppaZoomData[mocc];
556
557	- if ( data.~~manualControl~~ ){
558	var factor = data.canvas.width / data.fromWidth;
559	var x = ( data.savedCanvasX - e.offsetX ) / factor + data.fromX;
560	var y = ( data.savedCanvasY - e.offsetY ) / factor + data.fromY;
	@@ -575,7 +583,7 @@ function wppaDoZoomPan(mocc) {
575
576	update(mocc, {
577	run :1,
578	- ~~manualControl~~ :false
579	});
580	}
581
	@@ -590,7 +598,7 @@ function wppaDoZoomPan(mocc) {
590
591	var data = wppaZoomData[mocc];
592
593	- if ( data.~~manualControl~~ ) {
594	update(mocc, {run:2});
595	render(mocc);
596	}


12
13	// Been here before with same parms?
14	if ( data.initialized ) return;
15	+ if ( data.abort ) return;
16
17	// If lightbox, show spinner
18	if ( data.isLightbox ) {

28	wppaConsoleLog('Loading image ' + mocc + ' complete');
29
30	// Find additional data
31	+ data.manual = false;
32	data.deltaX = 0;
33	data.deltaY = 0;
34	data.deltaFactor = 1.0;
35	data.run = 1;
36	data.busy = false;

37	data.div = $( "#wppa-pan-div-" + data.itemId );
38	data.canvas = document.getElementById( "wppa-pan-canvas-" + data.itemId );
39	data.left = $( "#wppa-pctl-left-" + data.itemId );

44	data.zoomout = $( "#wppa-pctl-zoomout-" + data.itemId );
45	data.prev = $( "#wppa-pctl-prev-" + data.itemId );
46	data.next = $( "#wppa-pctl-next-" + data.itemId );
47	+ data.exit = $( "#wppa-exit-btn-2" );
48	data.canvasWidth = data.width;
49	data.canvasHeight = data.height;
50	data.savedCanvasX = 0;

110	data.prev.on("click", panPrev);
111	data.next.on("click", panNext);
112	}
113	+ data.exit.on("click", panExit);
114	}
115
116	// Install Resize handler

141
142	wppaConsoleLog('Render zoom '+mocc+' '+wppaDebugCounter+' run='+data.run+' abort='+data.abort);
143

144	if ( data.isLightbox ) {
145
146	if ( ! wppaOvlOpen ) {
147	+ update(0,{abort:true});
148	}
149	}
150	else {
151	if ( wppaOvlOpen ) {
152	+ update(mocc,{run:0,manual:false});

153	}
154	}
155
156	if ( data.abort ) {
157	+ update(mocc,{ctx:null});

158	return;
159	}
160

162	if (data.busy) return;
163	data.busy = true;
164
165	+ // manual is true when a drag on the canvas is being performed
166	+ if( ! data.manual ) {
167
168	// Panning
169	data.fromX += data.deltaX;

236
237	// Re-render if needed
238	if (data.run>0) {
239	+ if (data.manual){
240	setTimeout(function(){render(mocc)},5);
241	}
242	else if (data.buttondown){

408	// Previous in lightbox
409	function panPrev(e) {
410

411	$("#wppa-ovl-spin").show();
412	+ update(0,{abort:true});
413	wppaOvlShowPrev();
414	}
415
416	// Next in lightbox
417	function panNext(e) {
418

419	$("#wppa-ovl-spin").show();
420	+ update(0,{abort:true});
421	wppaOvlShowNext();
422	}
423
424	+ // Exit lightbox
425	+ function panExit(e) {
426	+
427	+ $("#wppa-ovl-spin").hide();
428	+ update(0,{abort:true});
429	+ wppaOvlHide();
430	+ }
431	+
432	// Horizontal movement right by button
433	function rightDown(mocc, e){
434

436	run :2,
437	deltaX :3,
438	buttondown :true,
439	+ manual :false
440	});
441	render(mocc);
442	}

448	run :2,
449	deltaX :-3,
450	buttondown :true,
451	+ manual :false
452	});
453	render(mocc);
454	}

460	run :2,
461	deltaY :-3,
462	buttondown :true,
463	+ manual :false
464	});
465	render(mocc);
466	}

472	run :2,
473	deltaY :3,
474	buttondown :true,
475	+ manual :false
476	});
477	render(mocc);
478	}

484	run :2,
485	deltaFactor :1.005,
486	buttondown :true,
487	+ manual :false
488	});
489	render(mocc);
490	}

496	run :2,
497	deltaFactor :0.995,
498	buttondown :true,
499	+ manual :false
500	});
501	render(mocc);
502	}

509	update(mocc, {
510	run : 1,
511	deltaFactor : 1 + e.deltaY * wppaZoomData[mocc].zoomsensitivity / ( wppaIsChrome ? 10000 : 1000 ),
512	+ manual : false
513	});
514	render(mocc);
515	setTimeout(function(){update(mocc, {deltaFactor:1})}, 25);

539	// If fs and outside image, transfer to wppa-overlay-bg
540	if ( wppaIsFs() && data.isLightbox ) {
541	if ( X < data.fsMaskLeft \|\| X > data.fsMaskRight \|\| Y < data.fsMaskTop \|\| Y > data.fsMaskBottom ) {
542	+ update(0,{abort:true})
543	jQuery( '#wppa-overlay-bg' ).trigger( 'click' );
544	return;
545	}

548	if ( data.enableManual ) {
549
550	update(mocc, {
551	+ manual :true,
552	savedCanvasX :e.offsetX,
553	savedCanvasY :e.offsetY,
554	run :2,

562
563	var data = wppaZoomData[mocc];
564
565	+ if ( data.manual ){
566	var factor = data.canvas.width / data.fromWidth;
567	var x = ( data.savedCanvasX - e.offsetX ) / factor + data.fromX;
568	var y = ( data.savedCanvasY - e.offsetY ) / factor + data.fromY;

583
584	update(mocc, {
585	run :1,
586	+ manual :false
587	});
588	}
589

598
599	var data = wppaZoomData[mocc];
600
601	+ if ( data.manual ) {
602	update(mocc, {run:2});
603	render(mocc);
604	}

js/wppa-zoom.min.js CHANGED Viewed

@@ -1 +1 @@

- function wppaDoZoomPan(a){var p=jQuery,t=wppaZoomData[a];if(!t.initialized){if(t.isLightbox&&p("#wppa-ovl-spin").show(),!t.image.complete)return wppaConsoleLog("Loading image "+a),void setTimeout(function(){wppaDoZoomPan(a)},200);wppaConsoleLog("Loading image "+a+" complete"),t.~~manualControl~~=!1,t.deltaX=0,t.deltaY=0,t.deltaFactor=1,t.run=1,t.busy=!1,t.~~abort=!1,t.~~div=p("#wppa-pan-div-"+t.itemId),t.canvas=document.getElementById("wppa-pan-canvas-"+t.itemId),t.left=p("#wppa-pctl-left-"+t.itemId),t.right=p("#wppa-pctl-right-"+t.itemId),t.up=p("#wppa-pctl-up-"+t.itemId),t.down=p("#wppa-pctl-down-"+t.itemId),t.zoomin=p("#wppa-pctl-zoomin-"+t.itemId),t.zoomout=p("#wppa-pctl-zoomout-"+t.itemId),t.prev=p("#wppa-pctl-prev-"+t.itemId),t.next=p("#wppa-pctl-next-"+t.itemId),t.canvasWidth=t.width,t.canvasHeight=t.height,t.savedCanvasX=0,t.savedCanvasY=0,t.fromHeight=t.image.height,t.fromWidth=t.image.width,t.imageRatio=t.image.width/t.image.height,t.fromX=0,t.fromY=0,t.centerX=t.fromX+t.fromWidth/2,t.centerY=t.fromY+t.fromHeight/2,t.ctx=null,t.buttondown=!1,t.enableManual=!0,t.ctrlbarUpdate=!0,wppaIsMobile?(t.right.on("touchstart",function(t){n(a)}),t.right.on("touchend",function(t){u(a)}),t.left.on("touchstart",function(t){e(a)}),t.left.on("touchend",function(t){u(a)}),t.up.on("touchstart",function(t){i(a)}),t.up.on("touchend",function(t){u(a)}),t.down.on("touchstart",function(t){r(a)}),t.down.on("touchend",function(t){u(a)}),t.zoomin.on("touchstart",function(t){s(a)}),t.zoomin.on("touchend",function(t){u(a)}),t.zoomout.on("touchstart",function(t){c(a)}),t.zoomout.on("touchend",function(t){u(a)}),t.canvas.addEventListener("touchstart",function(t){d(a,t)})):(t.canvas.addEventListener("mousedown",function(t){d(a,t)}),t.canvas.addEventListener("mousemove",function(t){!function(t,o){var n=wppaZoomData[t];{var a,e,i;n.~~manualControl~~&&(a=n.canvas.width/n.fromWidth,e=(n.savedCanvasX-o.offsetX)/a+n.fromX,i=(n.savedCanvasY-o.offsetY)/a+n.fromY,0<e&&0<i&&e+n.fromWidth<n.image.width&&i+n.fromHeight<n.image.height&&h(t,{fromX:e,fromY:i,savedCanvasX:o.offsetX,savedCanvasY:o.offsetY}))}}(a,t)}),t.canvas.addEventListener("mouseup",function(t){h(a,{run:1,~~manualControl~~:!1})}),t.canvas.addEventListener("mouseleave",function(t){h(a,{run:0})}),t.canvas.addEventListener("mouseenter",function(t){var o;o=a,wppaZoomData[o].~~manualControl~~&&(h(o,{run:2}),m(o))}),document.getElementById("wppa-pan-canvas-"+t.itemId).addEventListener("wheel",function(t){var o,n;o=a,(n=t).preventDefault(),n.stopPropagation(),h(o,{run:1,deltaFactor:1+n.deltaY*wppaZoomData[o].zoomsensitivity/(wppaIsChrome?1e4:1e3),~~manualControl~~:!1}),m(o),setTimeout(function(){h(o,{deltaFactor:1})},25)}),t.right.on("mousedown",function(t){n(a)}),t.right.on("mouseup",function(t){u(a)}),t.left.on("mousedown",function(t){e(a)}),t.left.on("mouseup",function(t){u(a)}),t.up.on("mousedown",function(t){i(a)}),t.up.on("mouseup",function(t){u(a)}),t.down.on("mousedown",function(t){r(a)}),t.down.on("mouseup",function(t){u(a)}),t.zoomin.on("mousedown",function(t){s(a)}),t.zoomin.on("mouseup",function(t){u(a)}),t.zoomout.on("mousedown",function(t){c(a)}),t.zoomout.on("mouseup",function(t){u(a)})),t.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){h(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){h(0,{abort:!0})}),t.prev&&(t.prev.on("click",function(t){p("#wppa-ovl-spin").show(),wppaOvlShowPrev()}),t.next.on("click",function(t){p("#wppa-ovl-spin").show(),wppaOvlShowNext()}))),p(window).on("DOMContentLoaded load resize orientationchange",function(t){o(a)}),o(a),t.initialized=!0,wppaZoomData[a]=t,p("#wppa-ovl-spin").hide()}function m(t){wppaDebugCounter++;var o,n,a,e,i,r=wppaZoomData[t];~~if(~~wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter+" run="+r.run+" abort="+r.abort),r.isLightbox?wppaOvlOpen||(r.abort=!0):wppaOvlOpen&&(r.run=0,~~r.manualControl=!~~1),r.abort~~)return r.~~ctx=null~~,void(r.prevctx=null~~);0!=r.run&&(r.busy||(r.busy=!0,r.~~manualControl~~||(r.fromX+=r.deltaX,r.fromY+=r.deltaY,o=r.fromHeight/r.deltaFactor,n=r.fromWidth/r.deltaFactor,50<o&&1!=r.deltaFactor&&(wppaIsFs()||o<=r.image.height)&&(r.fromX-=(n-r.fromWidth)/2,r.fromY-=(o-r.fromHeight)/2,r.fromWidth=n,r.fromHeight=o)),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)),a=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"),a>r.imageRatio&&o>r.image.height&&wppaIsFs()||a<=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.~~manualControl~~||r.buttondown)&&setTimeout(function(){m(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),wppaZoomData[t]=r))}function o(t){var o,n,a,e,i,r,s,c,u,d=wppaZoomData[t];d.isLightbox?(p("#wppa-overlay-ic").css("display",""),e=(n=!wppaIsFs())?(a=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(a=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,o=n?e-u>(a-c)/d.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<d.imageRatio),n&&o&&(s=(e-(r=(i=a-c)/d.imageRatio)-u)/2+20),n&&!o&&(r=(i=d.imageRatio*(e-(d.controls?d.icsize:0)-48))/d.imageRatio,s=20),!n&&o&&(i=(r=screen.height)*d.imageRatio,s=0),n||o||(r=(i=screen.width)/d.imageRatio,s=(screen.height-r)/2),p("#wppa-ovl-pan-container").css({marginTop:s}),p("#wppa-overlay-ic").css({marginTop:0}),d.canvasWidth=i,d.canvasHeight=r,d.canvas.width=d.canvasWidth,d.canvas.height=d.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:d.backgroundColor,padding:d.padding,borderRadius:d.borderRadius,borderWidth:d.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}),o?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(a-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(a-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+d.itemId).css({marginLeft:0}))):(d.canvasWidth=p(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,wppaZoomData[t]=d,m(t)}function n(t){h(t,{run:2,deltaX:3,buttondown:!0,~~manualControl~~:!1}),m(t)}function e(t){h(t,{run:2,deltaX:-3,buttondown:!0,~~manualControl~~:!1}),m(t)}function i(t){h(t,{run:2,deltaY:-3,buttondown:!0,~~manualControl~~:!1}),m(t)}function r(t){h(t,{run:2,deltaY:3,buttondown:!0,~~manualControl~~:!1}),m(t)}function s(t){h(t,{run:2,deltaFactor:1.005,buttondown:!0,~~manualControl~~:!1}),m(t)}function c(t){h(t,{run:2,deltaFactor:.995,buttondown:!0,~~manualControl~~:!1}),m(t)}function u(t){h(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function d(t,o){var n=wppaZoomData[t],a=f(o).X,e=f(o).Y;wppaIsFs()&&n.isLightbox&&(a<n.fsMaskLeft||a>n.fsMaskRight||e<n.fsMaskTop||e>n.fsMaskBottom)?jQuery("#wppa-overlay-bg").trigger("click"):n.enableManual&&(h(t,{~~manualControl~~:!0,savedCanvasX:o.offsetX,savedCanvasY:o.offsetY,run:2}),m(t))}function h(t,o){for(var n in o)wppaZoomData[t][n]=o[n]}function f(t){var o,n;return n=wppaIsMobile?(o=t.touches[0].screenX,t.touches[0].screenY):(o=t.screenX,t.screenY),{X:o,Y:n}}}

+ function wppaDoZoomPan(o){var p=jQuery,t=wppaZoomData[o];if(!t.initialized&&!t.abort){if(t.isLightbox&&p("#wppa-ovl-spin").show(),!t.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),t.manual=!1,t.deltaX=0,t.deltaY=0,t.deltaFactor=1,t.run=1,t.busy=!1,t.div=p("#wppa-pan-div-"+t.itemId),t.canvas=document.getElementById("wppa-pan-canvas-"+t.itemId),t.left=p("#wppa-pctl-left-"+t.itemId),t.right=p("#wppa-pctl-right-"+t.itemId),t.up=p("#wppa-pctl-up-"+t.itemId),t.down=p("#wppa-pctl-down-"+t.itemId),t.zoomin=p("#wppa-pctl-zoomin-"+t.itemId),t.zoomout=p("#wppa-pctl-zoomout-"+t.itemId),t.prev=p("#wppa-pctl-prev-"+t.itemId),t.next=p("#wppa-pctl-next-"+t.itemId),t.exit=p("#wppa-exit-btn-2"),t.canvasWidth=t.width,t.canvasHeight=t.height,t.savedCanvasX=0,t.savedCanvasY=0,t.fromHeight=t.image.height,t.fromWidth=t.image.width,t.imageRatio=t.image.width/t.image.height,t.fromX=0,t.fromY=0,t.centerX=t.fromX+t.fromWidth/2,t.centerY=t.fromY+t.fromHeight/2,t.ctx=null,t.buttondown=!1,t.enableManual=!0,t.ctrlbarUpdate=!0,wppaIsMobile?(t.right.on("touchstart",function(t){n(o)}),t.right.on("touchend",function(t){d(o)}),t.left.on("touchstart",function(t){e(o)}),t.left.on("touchend",function(t){d(o)}),t.up.on("touchstart",function(t){i(o)}),t.up.on("touchend",function(t){d(o)}),t.down.on("touchstart",function(t){r(o)}),t.down.on("touchend",function(t){d(o)}),t.zoomin.on("touchstart",function(t){s(o)}),t.zoomin.on("touchend",function(t){d(o)}),t.zoomout.on("touchstart",function(t){c(o)}),t.zoomout.on("touchend",function(t){d(o)}),t.canvas.addEventListener("touchstart",function(t){u(o,t)})):(t.canvas.addEventListener("mousedown",function(t){u(o,t)}),t.canvas.addEventListener("mousemove",function(t){!function(t,a){var n=wppaZoomData[t];{var o,e,i;n.manual&&(o=n.canvas.width/n.fromWidth,e=(n.savedCanvasX-a.offsetX)/o+n.fromX,i=(n.savedCanvasY-a.offsetY)/o+n.fromY,0<e&&0<i&&e+n.fromWidth<n.image.width&&i+n.fromHeight<n.image.height&&h(t,{fromX:e,fromY:i,savedCanvasX:a.offsetX,savedCanvasY:a.offsetY}))}}(o,t)}),t.canvas.addEventListener("mouseup",function(t){h(o,{run:1,manual:!1})}),t.canvas.addEventListener("mouseleave",function(t){h(o,{run:0})}),t.canvas.addEventListener("mouseenter",function(t){var a;a=o,wppaZoomData[a].manual&&(h(a,{run:2}),m(a))}),document.getElementById("wppa-pan-canvas-"+t.itemId).addEventListener("wheel",function(t){var a,n;a=o,(n=t).preventDefault(),n.stopPropagation(),h(a,{run:1,deltaFactor:1+n.deltaY*wppaZoomData[a].zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1}),m(a),setTimeout(function(){h(a,{deltaFactor:1})},25)}),t.right.on("mousedown",function(t){n(o)}),t.right.on("mouseup",function(t){d(o)}),t.left.on("mousedown",function(t){e(o)}),t.left.on("mouseup",function(t){d(o)}),t.up.on("mousedown",function(t){i(o)}),t.up.on("mouseup",function(t){d(o)}),t.down.on("mousedown",function(t){r(o)}),t.down.on("mouseup",function(t){d(o)}),t.zoomin.on("mousedown",function(t){s(o)}),t.zoomin.on("mouseup",function(t){d(o)}),t.zoomout.on("mousedown",function(t){c(o)}),t.zoomout.on("mouseup",function(t){d(o)})),t.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){h(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){h(0,{abort:!0})}),t.prev&&(t.prev.on("click",function(t){p("#wppa-ovl-spin").show(),h(0,{abort:!0}),wppaOvlShowPrev()}),t.next.on("click",function(t){p("#wppa-ovl-spin").show(),h(0,{abort:!0}),wppaOvlShowNext()})),t.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),h(0,{abort:!0}),wppaOvlHide()})),p(window).on("DOMContentLoaded load resize orientationchange",function(t){a(o)}),a(o),t.initialized=!0,wppaZoomData[o]=t,p("#wppa-ovl-spin").hide()}function m(t){wppaDebugCounter++;var a,n,o,e,i,r=wppaZoomData[t];wppaConsoleLog("Render zoom "+t+" "+wppaDebugCounter+" run="+r.run+" abort="+r.abort),r.isLightbox?wppaOvlOpen||h(0,{abort:!0}):wppaOvlOpen&&h(t,{run:0,manual:!1}),r.abort?h(t,{ctx:null}):0!=r.run&&(r.busy||(r.busy=!0,r.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(){m(t)},5),r.run<2&&r.run--,r.initializing&&(r.initializing=!1,r.run--),r.ctrlbarUpdate&&(wppaAdjustControlbar(),r.ctrlbarUpdate=!1),wppaZoomData[t]=r))}function a(t){var a,n,o,e,i,r,s,c,d,u=wppaZoomData[t];u.isLightbox?(p("#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,d=(c=8)+(u.controls?u.icsize+10:0)+10,n?(c+=2*u.borderWidth,d+=2*u.borderWidth):c=40,a=n?e-d>(o-c)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(s=(e-(r=(i=o-c)/u.imageRatio)-d)/2+20),n&&!a&&(r=(i=u.imageRatio*(e-(u.controls?u.icsize:0)-48))/u.imageRatio,s=20),!n&&a&&(i=(r=screen.height)*u.imageRatio,s=0),n||a||(r=(i=screen.width)/u.imageRatio,s=(screen.height-r)/2),p("#wppa-ovl-pan-container").css({marginTop:s}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=r,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight,n?(p("#wppa-ovl-pan-container").css({backgroundColor:u.backgroundColor,padding:u.padding,borderRadius:u.borderRadius,borderWidth:u.borderWidth,width:i,marginLeft:0}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}),a?p("#wppa-overlay-ic").css({left:4}):p("#wppa-overlay-ic").css({left:(o-i)/2})):(p("#wppa-overlay-ic").css({marginLeft:0}),p("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:0,borderWidth:0,width:i,left:(o-i)/2,position:"fixed"}),p("#wppa-pctl-div-"+u.itemId).css({marginLeft:0}))):(u.canvasWidth=p(u.div).parent().width(),u.canvasHeight=u.canvasWidth/u.imageRatio,u.canvas.width=u.canvasWidth,u.canvas.height=u.canvasHeight),u.run=2,u.ctrlbarUpdate=!0,wppaZoomData[t]=u,m(t)}function n(t){h(t,{run:2,deltaX:3,buttondown:!0,manual:!1}),m(t)}function e(t){h(t,{run:2,deltaX:-3,buttondown:!0,manual:!1}),m(t)}function i(t){h(t,{run:2,deltaY:-3,buttondown:!0,manual:!1}),m(t)}function r(t){h(t,{run:2,deltaY:3,buttondown:!0,manual:!1}),m(t)}function s(t){h(t,{run:2,deltaFactor:1.005,buttondown:!0,manual:!1}),m(t)}function c(t){h(t,{run:2,deltaFactor:.995,buttondown:!0,manual:!1}),m(t)}function d(t){h(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1,run:1})}function u(t,a){var n=wppaZoomData[t],o=f(a).X,e=f(a).Y;if(wppaIsFs()&&n.isLightbox&&(o<n.fsMaskLeft||o>n.fsMaskRight||e<n.fsMaskTop||e>n.fsMaskBottom))return h(0,{abort:!0}),void jQuery("#wppa-overlay-bg").trigger("click");n.enableManual&&(h(t,{manual:!0,savedCanvasX:a.offsetX,savedCanvasY:a.offsetY,run:2}),m(t))}function h(t,a){for(var n in a)wppaZoomData[t][n]=a[n]}function f(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}}}

wppa-non-admin.php CHANGED Viewed

	@@ -478,6 +478,12 @@ global $wppa_session;
478	style="position:fixed;right:0;top:50%;width:100px;z-index:200011;visibility:hidden;"
479	class="wppa-preload"
480	title="Preload next image"






481	/>';
482
483	// The Spinner image


478	style="position:fixed;right:0;top:50%;width:100px;z-index:200011;visibility:hidden;"
479	class="wppa-preload"
480	title="Preload next image"
481	+ />
482	+ <img
483	+ id="wppa-pre-curr"
484	+ style="position:fixed;left:0;top:0;z-index:200011;visibility:hidden;"
485	+ class="wppa-preload-curr"
486	+ title="Preload current image"
487	/>';
488
489	// The Spinner image

wppa-picture.php CHANGED Viewed

	@@ -1821,7 +1821,7 @@ function wppa_get_zoom_pan_html( $args ) {
1821	class="wppa-pan-prevnext"
1822	style="margin:0 2px 0 0;float:left;display:inline-block;"
1823	title="' . esc_attr( __( 'Previous image', 'wp-photo-album-plus' ) ) . '"
1824	- ~~onclick="wppaOvlShowPrev()"~~
1825	>' .
1826	wppa_get_svghtml( 'Prev-Button', $iconsize, $lightbox ) .
1827	'</span>' .
	@@ -1898,11 +1898,11 @@ function wppa_get_zoom_pan_html( $args ) {
1898	if ( $lightbox ) {
1899	$result .=
1900	'<span
1901	- id="wppa-pctl-next-' . $~~mocc~~ . '"
1902	class="wppa-pan-prevnext"
1903	style="margin:0 0 0 2px;float:right;display:inline-block;"
1904	title="' . esc_attr( __( 'Next image', 'wp-photo-album-plus' ) ) . '"
1905	- ~~onclick="wppaOvlShowNext()"~~
1906	>' .
1907	wppa_get_svghtml( 'Next-Button', $iconsize, $lightbox ) .
1908	'</span>' .
	@@ -1911,7 +1911,7 @@ function wppa_get_zoom_pan_html( $args ) {
1911	class=""
1912	style="margin:0 2px;float:right;display:inline-block;"
1913	title="' . esc_attr( __( 'Exit', 'wp-photo-album-plus' ) ) . '"
1914	- ~~onclick="wppaOvlHide()"~~
1915	>' .
1916	wppa_get_svghtml( 'Exit-2', $iconsize, $lightbox ) .
1917	'</span>';
	@@ -1956,25 +1956,29 @@ function wppa_get_zoom_pan_html( $args ) {
1956	'<script>' .
1957
1958	// Create image object and add the image url to it
1959	- ~~'var~~ ~~image~~ ~~= new Image();~~
1960	- image~~.src~~ = "' . ~~$url .~~ '";' .



1961
1962	'var data =
1963	- { mocc:' . $mocc . ',
1964	- id:' . $id . ',
1965	- itemId:"' . $itemid . '",
1966	- isLightbox:' . ( $lightbox ? 'true' : 'false' ) . ',
1967	- image:image,
1968	- ~~zoomsensitivity~~:~~' . $zoomsensitivity . '~~,
1969	- ~~borderWidth~~:' . ~~wppa_opt(~~ ~~'ovl_border_width' )~~ . ',
1970	- ~~controls~~:' . ( ~~$controls ?~~ '~~true~~' ~~: 'false'~~ ) . ',
1971	- ~~height~~:' . $~~height~~ . ',
1972	- ~~width~~:' . $~~width~~ . ',
1973	- ~~initialized~~:~~false~~,
1974	- ~~icsize~~:~~' . ( $lightbox ? wppa_opt( 'nav_icon_size_lightbox' ) : wppa_opt( 'nav_icon_size_panorama' ) ) . '~~,
1975	- ~~backgroundColor:\~~'' . wppa_opt( '~~ovl_theme~~' ) . '\',
1976	- ~~borderRadius:~~' . wppa_opt( '~~ovl_border_radius~~' ) . ',
1977	- ~~padding~~:' . wppa_opt( '~~ovl_border_width~~' ) . '

1978	};
1979	wppaZoomData[' . $mocc . '] = data;' .
1980


1821	class="wppa-pan-prevnext"
1822	style="margin:0 2px 0 0;float:left;display:inline-block;"
1823	title="' . esc_attr( __( 'Previous image', 'wp-photo-album-plus' ) ) . '"
1824	+
1825	>' .
1826	wppa_get_svghtml( 'Prev-Button', $iconsize, $lightbox ) .
1827	'</span>' .

1898	if ( $lightbox ) {
1899	$result .=
1900	'<span
1901	+ id="wppa-pctl-next-' . $itemid . '"
1902	class="wppa-pan-prevnext"
1903	style="margin:0 0 0 2px;float:right;display:inline-block;"
1904	title="' . esc_attr( __( 'Next image', 'wp-photo-album-plus' ) ) . '"
1905	+
1906	>' .
1907	wppa_get_svghtml( 'Next-Button', $iconsize, $lightbox ) .
1908	'</span>' .

1911	class=""
1912	style="margin:0 2px;float:right;display:inline-block;"
1913	title="' . esc_attr( __( 'Exit', 'wp-photo-album-plus' ) ) . '"
1914	+
1915	>' .
1916	wppa_get_svghtml( 'Exit-2', $iconsize, $lightbox ) .
1917	'</span>';

1956	'<script>' .
1957
1958	// Create image object and add the image url to it
1959	+ ( $lightbox ?
1960	+ 'var image = document.getElementById(\'wppa-pre-curr\');' :
1961	+ 'var image = new Image();'
1962	+ ) .
1963	+ 'image.src = "' . $url . '";' .
1964
1965	'var data =
1966	+ { mocc :' . $mocc . ',
1967	+ id :' . $id . ',
1968	+ itemId :"' . $itemid . '",
1969	+ isLightbox :' . ( $lightbox ? 'true' : 'false' ) . ',
1970	+ image :image,
1971	+ abort :false,
1972	+ zoomsensitivity :' . $zoomsensitivity . ',
1973	+ borderWidth :' . wppa_opt( 'ovl_border_width' ) . ',
1974	+ controls :' . ( $controls ? 'true' : 'false' ) . ',
1975	+ height :' . $height . ',
1976	+ width :' . $width . ',
1977	+ initialized :false,
1978	+ icsize :' . ( $lightbox ? wppa_opt( 'nav_icon_size_lightbox' ) : wppa_opt( 'nav_icon_size_panorama' ) ) . ',
1979	+ backgroundColor :\'' . wppa_opt( 'ovl_theme' ) . '\',
1980	+ borderRadius :' . wppa_opt( 'ovl_border_radius' ) . ',
1981	+ padding :' . wppa_opt( 'ovl_border_width' ) . '
1982	};
1983	wppaZoomData[' . $mocc . '] = data;' .
1984

wppa-upload.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Package: wp-photo-album-plus
4	*
5	* Contains all the upload pages and functions
6	- * Version 7.5.01
7	*
8	*/
9
	@@ -16,7 +16,7 @@ global $wppa_revno;
16	global $upload_album;
17
18	// Maybe it helps...
19	- set_time_limit( 0 );
20
21	// Who am I?
22	$user = wppa_get_user();


3	* Package: wp-photo-album-plus
4	*
5	* Contains all the upload pages and functions
6	+ * Version 7.5.08
7	*
8	*/
9

16	global $upload_album;
17
18	// Maybe it helps...
19	+ @ set_time_limit( 0 );
20
21	// Who am I?
22	$user = wppa_get_user();

wppa.php CHANGED Viewed

	@@ -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.~~003~~
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.~~003~~'; // WPPA software version
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.004
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.004'; // WPPA software version
28
29	/* Init page js data */
30	global $wppa_js_page_data; $wppa_js_page_data = '';