WP Photo Album Plus - Version 7.6.01.006

Version Description

= 7.6.01 =

  • This version addresses various bug fixes and feature requests.
  • Compatible with wp 5.6
Download this release

Release Info

Developer opajaap
Plugin Icon wp plugin WP Photo Album Plus
Version 7.6.01.006
Comparing to
See all releases

Code changes from version 7.6.01.005 to 7.6.01.006

Files changed (10) hide show
  1. changelog.txt +1 -0
  2. js/wppa-all.js +1 -1
  3. js/wppa-spheric.js +0 -1
  4. js/wppa-spheric.min.js +1 -1
  5. wppa-defaults.php +1 -0
  6. wppa-photo-files.php +20 -7
  7. wppa-picture.php +1 -0
  8. wppa-settings-autosave.php +10 -0
  9. wppa-wrappers.php +2 -1
  10. wppa.php +2 -2
changelog.txt CHANGED
@@ -16,6 +16,7 @@ In case of album only, the links are only shown to users who have album admin ri
16
  * You can now also enter filenames and photonames in the green search field on the Album Admin page.
17
  * Thumbnails of panorama images now always use the thumbnail file rather than a possible CDN file for display.
18
  * Creating thumbnails for 360 spheric panoramas now always use the original, i.e. not the possibly formatted source file.
 
19
 
20
  = 7.5.10 =
21
 
16
  * You can now also enter filenames and photonames in the green search field on the Album Admin page.
17
  * Thumbnails of panorama images now always use the thumbnail file rather than a possible CDN file for display.
18
  * Creating thumbnails for 360 spheric panoramas now always use the original, i.e. not the possibly formatted source file.
19
+ * New setting: Table IV-H4: Initial zoom spheric panorama.
20
 
21
  = 7.5.10 =
22
 
js/wppa-all.js CHANGED
@@ -15,4 +15,4 @@ var wppaJsTouchVersion="7.5.03",wppaTriggerElementID=null,wppaFingerCount=0,wppa
15
  // wppa-zoom
16
  function wppaDoZoomPan(o){var p=jQuery,e=g(o);if(!e.initialized&&!e.abort){if(e.isLightbox&&p("#wppa-ovl-spin").show(),!e.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),p(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.busy=!1,e.div=p("#wppa-pan-div-"+e.itemId),e.canvas=document.getElementById("wppa-pan-canvas-"+e.itemId),e.left=p("#wppa-pctl-left-"+e.itemId),e.right=p("#wppa-pctl-right-"+e.itemId),e.up=p("#wppa-pctl-up-"+e.itemId),e.down=p("#wppa-pctl-down-"+e.itemId),e.zoomin=p("#wppa-pctl-zoomin-"+e.itemId),e.zoomout=p("#wppa-pctl-zoomout-"+e.itemId),e.prev=p("#wppa-pctl-prev-"+e.itemId),e.next=p("#wppa-pctl-next-"+e.itemId),e.exit=p("#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,e.pause=!1,e.time=0,wppaIsMobile?(e.right.on("touchstart",function(t){n(o)}),e.right.on("touchend",function(t){h(o)}),e.left.on("touchstart",function(t){i(o)}),e.left.on("touchend",function(t){h(o)}),e.up.on("touchstart",function(t){s(o)}),e.up.on("touchend",function(t){h(o)}),e.down.on("touchstart",function(t){c(o)}),e.down.on("touchend",function(t){h(o)}),e.zoomin.on("touchstart",function(t){r(o)}),e.zoomin.on("touchend",function(t){h(o)}),e.zoomout.on("touchstart",function(t){u(o)}),e.zoomout.on("touchend",function(t){h(o)}),e.canvas.addEventListener("touchstart",function(t){f(o,t)}),e.canvas.addEventListener("touchmove",function(t){l(o,t)}),e.canvas.addEventListener("touchend",function(t){w(o)})):(e.canvas.addEventListener("mousedown",function(t){f(o,t)}),e.canvas.addEventListener("mousemove",function(t){l(o,t)}),e.canvas.addEventListener("mouseup",function(t){w(o)}),e.canvas.addEventListener("mouseleave",function(t){(e=g(o)).manual&&g(o,{pause:!0})}),e.canvas.addEventListener("mouseenter",function(t){var a;g(a=o,{pause:!1}).manual&&m(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,{deltaFactor:1+n.deltaY*e.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1,burrondown:!1}),m(a),setTimeout(function(){g(a,{deltaFactor:1})},25)}),e.right.on("mousedown",function(t){n(o)}),e.right.on("mouseup",function(t){h(o)}),e.left.on("mousedown",function(t){i(o)}),e.left.on("mouseup",function(t){h(o)}),e.up.on("mousedown",function(t){s(o)}),e.up.on("mouseup",function(t){h(o)}),e.down.on("mousedown",function(t){c(o)}),e.down.on("mouseup",function(t){h(o)}),e.zoomin.off("mousedown"),e.zoomin.on("mousedown",function(t){r(o)}),e.zoomin.off("mouseup"),e.zoomin.on("mouseup",function(t){h(o)}),e.zoomout.on("mousedown",function(t){u(o)}),e.zoomout.on("mouseup",function(t){h(o)})),e.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){g(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){g(0,{abort:!0})}),e.prev&&(e.prev.on("click",function(t){p("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowPrev()}),e.next.on("click",function(t){p("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowNext()})),e.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),g(0,{abort:!0}),wppaOvlHide()})),e.isLightbox?(p(window).off("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){wppaOvlOpen&&wppaOvlShow(wppaOvlIdx)},1e3)}),p(window).on("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){wppaOvlOpen&&wppaOvlShow(wppaOvlIdx)},1e3)})):(p(window).off("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){a(o)},25)}),p(window).on("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){a(o)},25)})),a(o),e.initialized=!0,g(o,e),p("#wppa-ovl-spin").hide()}function m(t){var a,n,o,e,i,s=g(t);s.canvas&&(L()<s.time+10?wppaConsoleLog("Skipped render "+t):(g(t,{time:L()}),wppaConsoleLog("Zoom render "+t),(s.isLightbox&&!wppaOvlOpen||!s.isLightbox&&wppaOvlOpen)&&(s=g(0,{abort:!0})),s.abort?g(t,{manual:!1,buttondown:!1,pause:!1,ctx:null}):s.busy||(wppaDebugCounter++,(s=g(t,{busy:!0})).manual||(s.fromX+=s.deltaX,s.fromY+=s.deltaY,a=s.fromHeight/s.deltaFactor,n=s.fromWidth/s.deltaFactor,50<a&&1!=s.deltaFactor&&(wppaIsFs()||a<=s.image.height)&&(s.fromX-=(n-s.fromWidth)/2,s.fromY-=(a-s.fromHeight)/2,s.fromWidth=n,s.fromHeight=a)),s.fromX=Math.max(0,Math.min(s.image.width-s.fromWidth,s.fromX)),s.fromY=Math.max(0,Math.min(s.image.height-s.fromHeight,s.fromY)),o=screen.width/screen.height,e=(1-s.image.width/s.fromWidth)*s.canvas.width/2,i=(1-s.image.height/s.fromHeight)*s.canvas.height/2,s.ctx=s.canvas.getContext("2d"),o>s.imageRatio&&a>s.image.height&&wppaIsFs()||o<=s.imageRatio&&n>s.image.width&&wppaIsFs()?(s.enableManual=!1,s.ctx.clearRect(0,0,s.canvas.width,s.canvas.height),s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,e,i,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"default"})):(s.enableManual=!0,s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,0,0,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"grab"})),wppaIsFs()?(s.fsMaskTop=i-(s.canvas.height-screen.height)/2,s.fsMaskLeft=e-(s.canvas.width-screen.width)/2,s.fsMaskBottom=screen.height-s.fsMaskTop,s.fsMaskRight=screen.width-s.fsMaskLeft):(s.fsMaskTop=0,s.fsMaskLeft=0,s.fsMaskBottom=0,s.fsMaskRight=0),s.ctrlbarUpdate&&(wppaAdjustControlbar(),s.ctrlbarUpdate=!1),s.busy=!1,g(t,s),s.pause||!s.manual&&!s.buttondown||setTimeout(function(){m(t)},10),s.pause&&g(t,{pause:!1}))))}function a(t){var a,n,o,e,i,s,c,r,d,u=g(t);u&&(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),c=0,d=(r=8)+(u.controls?u.icsize+10:0)+10,n?(r+=2*u.borderWidth,d+=2*u.borderWidth):r=40,a=n?e-d>(o-r)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(c=(e-(s=(i=o-r)/u.imageRatio)-d)/2+20),n&&!a&&(s=(i=u.imageRatio*(e-(u.controls?u.icsize:0)-48))/u.imageRatio,c=20),!n&&a&&(i=(s=screen.height)*u.imageRatio,c=0),n||a||(s=(i=screen.width)/u.imageRatio,c=(screen.height-s)/2),p("#wppa-ovl-pan-container").css({marginTop:c}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=s,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+"px",borderWidth:u.borderWidth+"px",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:"0px",borderWidth:"0px",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.ctrlbarUpdate=!0,g(t,u),setTimeout(function(){m(t)},250))}function n(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{deltaX:n*=1.5,buttondown:!0,manual:!1}),m(t)}function i(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{deltaX:-(n*=1.5),buttondown:!0,manual:!1}),m(t)}function s(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{deltaY:-(n*=1.5),buttondown:!0,manual:!1}),m(t)}function c(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{deltaY:n*=1.5,buttondown:!0,manual:!1}),m(t)}function r(t){g(t,{deltaFactor:1.005,buttondown:!0,manual:!1}),m(t)}function u(t){g(t,{deltaFactor:.995,buttondown:!0,manual:!1}),m(t)}function h(t){g(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1})}function f(t,a){var n=g(t),o=v(a).X,e=v(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=b(t,a).X,savedCanvasY:e=b(t,a).Y,buttondown:!1}),m(t))}function l(t,a){var n,o,e,i=g(t),s=b(t,a).X,c=b(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,o=(i.savedCanvasX-s)/n+i.fromX,e=(i.savedCanvasY-c)/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:s,savedCanvasY:c}))}function w(t){g(t,{manual:!1})}function g(t,a){if(!wppaZoomData[t])return!1;if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function v(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 b(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}}function L(){return d=new Date,d.getTime()}}
17
  // wppa-spheric
18
- function wppaDoSphericPan(a){var s=jQuery,w=v(a);function l(n){var t=v(n);!t.manCtrl&&g()<t.time+25||(v(n,{time:g()}),t.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=t.id||wppaGlobalOvlPanoramaId>t.uId)&&(abort=!0),t.abort||((t.butDown||t.manCtrl)&&t.autorun&&(t.autorun=!1,t.dX=0),0==t.dX&&0==t.dY&&0==t.dFov&&(t.pause=!0),t.butDown&&(t.pause=!1),t.fov+=t.dFov,t.fov=Math.max(20,Math.min(120,t.fov)),t.wppaCamera=new THREE.PerspectiveCamera(t.fov,t.aspect,1,1e3),t.wppaCamera.target=new THREE.Vector3(0,0,0),t.lon+=t.dX,t.lat+=t.dY,t.lat=Math.max(-85,Math.min(85,t.lat)),t.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.cos(THREE.Math.degToRad(t.lon)),t.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-t.lat)),t.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.sin(THREE.Math.degToRad(t.lon)),t.wppaCamera.lookAt(t.wppaCamera.target),t.wppaRenderer&&t.wppaRenderer.render(t.wppaScene,t.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),t.manCtrl,(t.autorun||!t.pause&&(t.manCtrl||t.butDown))&&t.wppaRenderer&&(t.timer=setTimeout(function(){l(n)},25)),v(n,t)))}function t(n){wppaConsoleLog("Resize mocc "+n);var t,o,a,e,i,p,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),a=(c=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),p=(i=8)+(w.controls?w.icsize+10:0)+30,c&&(i+=2*w.borderWidth,p+=2*w.borderWidth),t=(o-i)/2+p<a,e=c?t?(a-(u=(r=o-i)/2)-p)/2+20:(r=2*(u=a-p),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),t?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(o-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:"0px",width:r,left:(o-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),w.timer=setTimeout(function(){l(n)},250))}function o(n,t){t.preventDefault(),t.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:t.touches[0].clientX,sY:t.touches[0].clientY}):v(n,{sX:t.clientX,sY:t.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,t){t.preventDefault(),t.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-t.touches[0].clientX)+w.sLon,lat:.1*(t.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-t.clientX)+w.sLon,lat:.1*(t.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function i(n){v(n,{manCtrl:!1})}function p(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,t){if(!wppaSphericData[n])return!1;if(t)for(var o in t)wppaSphericData[n][o]=t[o];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}w.initialized||w.abort||(w.isLightbox&&s("#wppa-ovl-spin").show(),w.image.complete?(s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+a),w.left=s("#wppa-pctl-left-"+a),w.right=s("#wppa-pctl-right-"+a),w.up=s("#wppa-pctl-up-"+a),w.down=s("#wppa-pctl-down-"+a),w.zoomin=s("#wppa-pctl-zoomin-"+a),w.zoomout=s("#wppa-pctl-zoomout-"+a),w.prev=s("#wppa-pctl-prev-"+a),w.next=s("#wppa-pctl-next-"+a),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix4((new THREE.Matrix4).makeScale(-1,1,1)),w.texture=(new THREE.TextureLoader).load(w.url),w.wppaSphereMaterial=new THREE.MeshBasicMaterial({map:w.texture}),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(a)}),w.right.on("touchend",function(n){f(a)}),w.left.on("touchstart",function(n){c(a)}),w.left.on("touchend",function(n){f(a)}),w.up.on("touchstart",function(n){h(a)}),w.up.on("touchend",function(n){f(a)}),w.down.on("touchstart",function(n){m(a)}),w.down.on("touchend",function(n){f(a)}),w.zoomin.on("touchstart",function(n){p(a)}),w.zoomin.on("touchend",function(n){f(a)}),w.zoomout.on("touchstart",function(n){r(a)}),w.zoomout.on("touchend",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchstart",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchmove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchend",function(n){i(a)}))):(w.right.on("mousedown",function(n){u(a)}),w.right.on("mouseup",function(n){f(a)}),w.left.on("mousedown",function(n){c(a)}),w.left.on("mouseup",function(n){f(a)}),w.up.on("mousedown",function(n){h(a)}),w.up.on("mouseup",function(n){f(a)}),w.down.on("mousedown",function(n){m(a)}),w.down.on("mouseup",function(n){f(a)}),w.zoomin.off("mousedown"),w.zoomin.on("mousedown",function(n){p(a)}),w.zoomin.off("mouseup"),w.zoomin.on("mouseup",function(n){f(a)}),w.zoomout.on("mousedown",function(n){r(a)}),w.zoomout.on("mouseup",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas").on("mousedown",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mousemove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mouseup",function(n){i(a)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("wheel",function(n){var t,o;t=a,(o=n).preventDefault(),o.stopPropagation(),w=v(t),v(t,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-o.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(t),setTimeout(function(){v(t,{dFov:0})},25)}))),w.isLightbox&&w.prev&&s("body").on("quitimage",function(n){var t;t=a,wppaConsoleLog("Quit Image"),w=v(t,{abort:!0}),clearTimeout(w.timer)}),v(a,w),s(window).off("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),t(a)):setTimeout(function(){wppaDoSphericPan(a)},200))}
15
  // wppa-zoom
16
  function wppaDoZoomPan(o){var p=jQuery,e=g(o);if(!e.initialized&&!e.abort){if(e.isLightbox&&p("#wppa-ovl-spin").show(),!e.image.complete)return wppaConsoleLog("Loading image "+o),void setTimeout(function(){wppaDoZoomPan(o)},200);wppaConsoleLog("Loading image "+o+" complete"),p(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.busy=!1,e.div=p("#wppa-pan-div-"+e.itemId),e.canvas=document.getElementById("wppa-pan-canvas-"+e.itemId),e.left=p("#wppa-pctl-left-"+e.itemId),e.right=p("#wppa-pctl-right-"+e.itemId),e.up=p("#wppa-pctl-up-"+e.itemId),e.down=p("#wppa-pctl-down-"+e.itemId),e.zoomin=p("#wppa-pctl-zoomin-"+e.itemId),e.zoomout=p("#wppa-pctl-zoomout-"+e.itemId),e.prev=p("#wppa-pctl-prev-"+e.itemId),e.next=p("#wppa-pctl-next-"+e.itemId),e.exit=p("#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,e.pause=!1,e.time=0,wppaIsMobile?(e.right.on("touchstart",function(t){n(o)}),e.right.on("touchend",function(t){h(o)}),e.left.on("touchstart",function(t){i(o)}),e.left.on("touchend",function(t){h(o)}),e.up.on("touchstart",function(t){s(o)}),e.up.on("touchend",function(t){h(o)}),e.down.on("touchstart",function(t){c(o)}),e.down.on("touchend",function(t){h(o)}),e.zoomin.on("touchstart",function(t){r(o)}),e.zoomin.on("touchend",function(t){h(o)}),e.zoomout.on("touchstart",function(t){u(o)}),e.zoomout.on("touchend",function(t){h(o)}),e.canvas.addEventListener("touchstart",function(t){f(o,t)}),e.canvas.addEventListener("touchmove",function(t){l(o,t)}),e.canvas.addEventListener("touchend",function(t){w(o)})):(e.canvas.addEventListener("mousedown",function(t){f(o,t)}),e.canvas.addEventListener("mousemove",function(t){l(o,t)}),e.canvas.addEventListener("mouseup",function(t){w(o)}),e.canvas.addEventListener("mouseleave",function(t){(e=g(o)).manual&&g(o,{pause:!0})}),e.canvas.addEventListener("mouseenter",function(t){var a;g(a=o,{pause:!1}).manual&&m(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,{deltaFactor:1+n.deltaY*e.zoomsensitivity/(wppaIsChrome?1e4:1e3),manual:!1,burrondown:!1}),m(a),setTimeout(function(){g(a,{deltaFactor:1})},25)}),e.right.on("mousedown",function(t){n(o)}),e.right.on("mouseup",function(t){h(o)}),e.left.on("mousedown",function(t){i(o)}),e.left.on("mouseup",function(t){h(o)}),e.up.on("mousedown",function(t){s(o)}),e.up.on("mouseup",function(t){h(o)}),e.down.on("mousedown",function(t){c(o)}),e.down.on("mouseup",function(t){h(o)}),e.zoomin.off("mousedown"),e.zoomin.on("mousedown",function(t){r(o)}),e.zoomin.off("mouseup"),e.zoomin.on("mouseup",function(t){h(o)}),e.zoomout.on("mousedown",function(t){u(o)}),e.zoomout.on("mouseup",function(t){h(o)})),e.isLightbox&&(p(".wppa-fulls-btn").on("click",function(){g(0,{abort:!0})}),p(".wppa-exit-fulls-btn").on("click",function(){g(0,{abort:!0})}),e.prev&&(e.prev.on("click",function(t){p("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowPrev()}),e.next.on("click",function(t){p("#wppa-ovl-spin").show(),g(0,{abort:!0}),wppaOvlShowNext()})),e.exit.on("click",function(t){p("#wppa-ovl-spin").hide(),g(0,{abort:!0}),wppaOvlHide()})),e.isLightbox?(p(window).off("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){wppaOvlOpen&&wppaOvlShow(wppaOvlIdx)},1e3)}),p(window).on("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){wppaOvlOpen&&wppaOvlShow(wppaOvlIdx)},1e3)})):(p(window).off("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){a(o)},25)}),p(window).on("DOMContentLoaded load resize orientationchange",function(t){setTimeout(function(t){a(o)},25)})),a(o),e.initialized=!0,g(o,e),p("#wppa-ovl-spin").hide()}function m(t){var a,n,o,e,i,s=g(t);s.canvas&&(L()<s.time+10?wppaConsoleLog("Skipped render "+t):(g(t,{time:L()}),wppaConsoleLog("Zoom render "+t),(s.isLightbox&&!wppaOvlOpen||!s.isLightbox&&wppaOvlOpen)&&(s=g(0,{abort:!0})),s.abort?g(t,{manual:!1,buttondown:!1,pause:!1,ctx:null}):s.busy||(wppaDebugCounter++,(s=g(t,{busy:!0})).manual||(s.fromX+=s.deltaX,s.fromY+=s.deltaY,a=s.fromHeight/s.deltaFactor,n=s.fromWidth/s.deltaFactor,50<a&&1!=s.deltaFactor&&(wppaIsFs()||a<=s.image.height)&&(s.fromX-=(n-s.fromWidth)/2,s.fromY-=(a-s.fromHeight)/2,s.fromWidth=n,s.fromHeight=a)),s.fromX=Math.max(0,Math.min(s.image.width-s.fromWidth,s.fromX)),s.fromY=Math.max(0,Math.min(s.image.height-s.fromHeight,s.fromY)),o=screen.width/screen.height,e=(1-s.image.width/s.fromWidth)*s.canvas.width/2,i=(1-s.image.height/s.fromHeight)*s.canvas.height/2,s.ctx=s.canvas.getContext("2d"),o>s.imageRatio&&a>s.image.height&&wppaIsFs()||o<=s.imageRatio&&n>s.image.width&&wppaIsFs()?(s.enableManual=!1,s.ctx.clearRect(0,0,s.canvas.width,s.canvas.height),s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,e,i,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"default"})):(s.enableManual=!0,s.ctx.drawImage(s.image,s.fromX,s.fromY,s.fromWidth,s.fromHeight,0,0,s.canvas.width,s.canvas.height),jQuery(s.canvas).css({cursor:"grab"})),wppaIsFs()?(s.fsMaskTop=i-(s.canvas.height-screen.height)/2,s.fsMaskLeft=e-(s.canvas.width-screen.width)/2,s.fsMaskBottom=screen.height-s.fsMaskTop,s.fsMaskRight=screen.width-s.fsMaskLeft):(s.fsMaskTop=0,s.fsMaskLeft=0,s.fsMaskBottom=0,s.fsMaskRight=0),s.ctrlbarUpdate&&(wppaAdjustControlbar(),s.ctrlbarUpdate=!1),s.busy=!1,g(t,s),s.pause||!s.manual&&!s.buttondown||setTimeout(function(){m(t)},10),s.pause&&g(t,{pause:!1}))))}function a(t){var a,n,o,e,i,s,c,r,d,u=g(t);u&&(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),c=0,d=(r=8)+(u.controls?u.icsize+10:0)+10,n?(r+=2*u.borderWidth,d+=2*u.borderWidth):r=40,a=n?e-d>(o-r)/u.imageRatio:(screenRatio=screen.width/screen.height,screenRatio<u.imageRatio),n&&a&&(c=(e-(s=(i=o-r)/u.imageRatio)-d)/2+20),n&&!a&&(s=(i=u.imageRatio*(e-(u.controls?u.icsize:0)-48))/u.imageRatio,c=20),!n&&a&&(i=(s=screen.height)*u.imageRatio,c=0),n||a||(s=(i=screen.width)/u.imageRatio,c=(screen.height-s)/2),p("#wppa-ovl-pan-container").css({marginTop:c}),p("#wppa-overlay-ic").css({marginTop:0}),u.canvasWidth=i,u.canvasHeight=s,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+"px",borderWidth:u.borderWidth+"px",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:"0px",borderWidth:"0px",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.ctrlbarUpdate=!0,g(t,u),setTimeout(function(){m(t)},250))}function n(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{deltaX:n*=1.5,buttondown:!0,manual:!1}),m(t)}function i(t){var a=g(t),n=a.image.naturalWidth/a.canvas.width;n<1.5&&(n=1.5),g(t,{deltaX:-(n*=1.5),buttondown:!0,manual:!1}),m(t)}function s(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{deltaY:-(n*=1.5),buttondown:!0,manual:!1}),m(t)}function c(t){var a=g(t),n=a.image.naturalHeight/a.canvas.height;n<1.5&&(n=1.5),g(t,{deltaY:n*=1.5,buttondown:!0,manual:!1}),m(t)}function r(t){g(t,{deltaFactor:1.005,buttondown:!0,manual:!1}),m(t)}function u(t){g(t,{deltaFactor:.995,buttondown:!0,manual:!1}),m(t)}function h(t){g(t,{deltaX:0,deltaY:0,deltaFactor:1,buttondown:!1})}function f(t,a){var n=g(t),o=v(a).X,e=v(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=b(t,a).X,savedCanvasY:e=b(t,a).Y,buttondown:!1}),m(t))}function l(t,a){var n,o,e,i=g(t),s=b(t,a).X,c=b(t,a).Y;i.manual&&(n=i.canvas.width/i.fromWidth,o=(i.savedCanvasX-s)/n+i.fromX,e=(i.savedCanvasY-c)/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:s,savedCanvasY:c}))}function w(t){g(t,{manual:!1})}function g(t,a){if(!wppaZoomData[t])return!1;if(a)for(var n in a)wppaZoomData[t][n]=a[n];return wppaZoomData[t]}function v(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 b(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}}function L(){return d=new Date,d.getTime()}}
17
  // wppa-spheric
18
+ function wppaDoSphericPan(a){var s=jQuery,w=v(a);function l(n){var t=v(n);!t.manCtrl&&g()<t.time+25||(v(n,{time:g()}),t.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=t.id||wppaGlobalOvlPanoramaId>t.uId)&&(abort=!0),t.abort||((t.butDown||t.manCtrl)&&t.autorun&&(t.autorun=!1,t.dX=0),0==t.dX&&0==t.dY&&0==t.dFov&&(t.pause=!0),t.butDown&&(t.pause=!1),t.fov+=t.dFov,t.fov=Math.max(20,Math.min(120,t.fov)),t.wppaCamera=new THREE.PerspectiveCamera(t.fov,t.aspect,1,1e3),t.wppaCamera.target=new THREE.Vector3(0,0,0),t.lon+=t.dX,t.lat+=t.dY,t.lat=Math.max(-85,Math.min(85,t.lat)),t.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.cos(THREE.Math.degToRad(t.lon)),t.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-t.lat)),t.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.sin(THREE.Math.degToRad(t.lon)),t.wppaCamera.lookAt(t.wppaCamera.target),t.wppaRenderer&&t.wppaRenderer.render(t.wppaScene,t.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),t.manCtrl,(t.autorun||!t.pause&&(t.manCtrl||t.butDown))&&t.wppaRenderer&&(t.timer=setTimeout(function(){l(n)},25)),v(n,t)))}function t(n){wppaConsoleLog("Resize mocc "+n);var t,o,a,e,i,p,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),a=(c=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),p=(i=8)+(w.controls?w.icsize+10:0)+30,c&&(i+=2*w.borderWidth,p+=2*w.borderWidth),t=(o-i)/2+p<a,e=c?t?(a-(u=(r=o-i)/2)-p)/2+20:(r=2*(u=a-p),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),t?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(o-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:"0px",width:r,left:(o-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),w.timer=setTimeout(function(){l(n)},250))}function o(n,t){t.preventDefault(),t.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:t.touches[0].clientX,sY:t.touches[0].clientY}):v(n,{sX:t.clientX,sY:t.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,t){t.preventDefault(),t.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-t.touches[0].clientX)+w.sLon,lat:.1*(t.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-t.clientX)+w.sLon,lat:.1*(t.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function i(n){v(n,{manCtrl:!1})}function p(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,t){if(!wppaSphericData[n])return!1;if(t)for(var o in t)wppaSphericData[n][o]=t[o];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}w.initialized||w.abort||(w.isLightbox&&s("#wppa-ovl-spin").show(),w.image.complete?(s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+a),w.left=s("#wppa-pctl-left-"+a),w.right=s("#wppa-pctl-right-"+a),w.up=s("#wppa-pctl-up-"+a),w.down=s("#wppa-pctl-down-"+a),w.zoomin=s("#wppa-pctl-zoomin-"+a),w.zoomout=s("#wppa-pctl-zoomout-"+a),w.prev=s("#wppa-pctl-prev-"+a),w.next=s("#wppa-pctl-next-"+a),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix4((new THREE.Matrix4).makeScale(-1,1,1)),w.texture=(new THREE.TextureLoader).load(w.url),w.wppaSphereMaterial=new THREE.MeshBasicMaterial({map:w.texture}),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(a)}),w.right.on("touchend",function(n){f(a)}),w.left.on("touchstart",function(n){c(a)}),w.left.on("touchend",function(n){f(a)}),w.up.on("touchstart",function(n){h(a)}),w.up.on("touchend",function(n){f(a)}),w.down.on("touchstart",function(n){m(a)}),w.down.on("touchend",function(n){f(a)}),w.zoomin.on("touchstart",function(n){p(a)}),w.zoomin.on("touchend",function(n){f(a)}),w.zoomout.on("touchstart",function(n){r(a)}),w.zoomout.on("touchend",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchstart",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchmove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchend",function(n){i(a)}))):(w.right.on("mousedown",function(n){u(a)}),w.right.on("mouseup",function(n){f(a)}),w.left.on("mousedown",function(n){c(a)}),w.left.on("mouseup",function(n){f(a)}),w.up.on("mousedown",function(n){h(a)}),w.up.on("mouseup",function(n){f(a)}),w.down.on("mousedown",function(n){m(a)}),w.down.on("mouseup",function(n){f(a)}),w.zoomin.off("mousedown"),w.zoomin.on("mousedown",function(n){p(a)}),w.zoomin.off("mouseup"),w.zoomin.on("mouseup",function(n){f(a)}),w.zoomout.on("mousedown",function(n){r(a)}),w.zoomout.on("mouseup",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas").on("mousedown",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mousemove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mouseup",function(n){i(a)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("wheel",function(n){var t,o;t=a,(o=n).preventDefault(),o.stopPropagation(),w=v(t),v(t,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-o.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(t),setTimeout(function(){v(t,{dFov:0})},25)}))),w.isLightbox&&w.prev&&s("body").on("quitimage",function(n){var t;t=a,wppaConsoleLog("Quit Image"),w=v(t,{abort:!0}),clearTimeout(w.timer)}),v(a,w),s(window).off("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),t(a)):setTimeout(function(){wppaDoSphericPan(a)},200))}
js/wppa-spheric.js CHANGED
@@ -41,7 +41,6 @@ function wppaDoSphericPan(mocc) {
41
  data.lon = 180;
42
  data.lat = 0;
43
  data.dFov = 0;
44
- data.fov = 75;
45
  data.abort = false;
46
  data.aspect = 2;
47
  data.div = $("#wppa-pan-div-"+mocc );
41
  data.lon = 180;
42
  data.lat = 0;
43
  data.dFov = 0;
 
44
  data.abort = false;
45
  data.aspect = 2;
46
  data.div = $("#wppa-pan-div-"+mocc );
js/wppa-spheric.min.js CHANGED
@@ -1 +1 @@
1
- function wppaDoSphericPan(a){var s=jQuery,w=v(a);function l(n){var t=v(n);!t.manCtrl&&g()<t.time+25||(v(n,{time:g()}),t.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=t.id||wppaGlobalOvlPanoramaId>t.uId)&&(abort=!0),t.abort||((t.butDown||t.manCtrl)&&t.autorun&&(t.autorun=!1,t.dX=0),0==t.dX&&0==t.dY&&0==t.dFov&&(t.pause=!0),t.butDown&&(t.pause=!1),t.fov+=t.dFov,t.fov=Math.max(20,Math.min(120,t.fov)),t.wppaCamera=new THREE.PerspectiveCamera(t.fov,t.aspect,1,1e3),t.wppaCamera.target=new THREE.Vector3(0,0,0),t.lon+=t.dX,t.lat+=t.dY,t.lat=Math.max(-85,Math.min(85,t.lat)),t.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.cos(THREE.Math.degToRad(t.lon)),t.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-t.lat)),t.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.sin(THREE.Math.degToRad(t.lon)),t.wppaCamera.lookAt(t.wppaCamera.target),t.wppaRenderer&&t.wppaRenderer.render(t.wppaScene,t.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),t.manCtrl,(t.autorun||!t.pause&&(t.manCtrl||t.butDown))&&t.wppaRenderer&&(t.timer=setTimeout(function(){l(n)},25)),v(n,t)))}function t(n){wppaConsoleLog("Resize mocc "+n);var t,o,a,e,i,p,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),a=(c=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),p=(i=8)+(w.controls?w.icsize+10:0)+30,c&&(i+=2*w.borderWidth,p+=2*w.borderWidth),t=(o-i)/2+p<a,e=c?t?(a-(u=(r=o-i)/2)-p)/2+20:(r=2*(u=a-p),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),t?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(o-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:"0px",width:r,left:(o-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),w.timer=setTimeout(function(){l(n)},250))}function o(n,t){t.preventDefault(),t.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:t.touches[0].clientX,sY:t.touches[0].clientY}):v(n,{sX:t.clientX,sY:t.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,t){t.preventDefault(),t.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-t.touches[0].clientX)+w.sLon,lat:.1*(t.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-t.clientX)+w.sLon,lat:.1*(t.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function i(n){v(n,{manCtrl:!1})}function p(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,t){if(!wppaSphericData[n])return!1;if(t)for(var o in t)wppaSphericData[n][o]=t[o];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}w.initialized||w.abort||(w.isLightbox&&s("#wppa-ovl-spin").show(),w.image.complete?(s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.fov=75,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+a),w.left=s("#wppa-pctl-left-"+a),w.right=s("#wppa-pctl-right-"+a),w.up=s("#wppa-pctl-up-"+a),w.down=s("#wppa-pctl-down-"+a),w.zoomin=s("#wppa-pctl-zoomin-"+a),w.zoomout=s("#wppa-pctl-zoomout-"+a),w.prev=s("#wppa-pctl-prev-"+a),w.next=s("#wppa-pctl-next-"+a),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix4((new THREE.Matrix4).makeScale(-1,1,1)),w.texture=(new THREE.TextureLoader).load(w.url),w.wppaSphereMaterial=new THREE.MeshBasicMaterial({map:w.texture}),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(a)}),w.right.on("touchend",function(n){f(a)}),w.left.on("touchstart",function(n){c(a)}),w.left.on("touchend",function(n){f(a)}),w.up.on("touchstart",function(n){h(a)}),w.up.on("touchend",function(n){f(a)}),w.down.on("touchstart",function(n){m(a)}),w.down.on("touchend",function(n){f(a)}),w.zoomin.on("touchstart",function(n){p(a)}),w.zoomin.on("touchend",function(n){f(a)}),w.zoomout.on("touchstart",function(n){r(a)}),w.zoomout.on("touchend",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchstart",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchmove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchend",function(n){i(a)}))):(w.right.on("mousedown",function(n){u(a)}),w.right.on("mouseup",function(n){f(a)}),w.left.on("mousedown",function(n){c(a)}),w.left.on("mouseup",function(n){f(a)}),w.up.on("mousedown",function(n){h(a)}),w.up.on("mouseup",function(n){f(a)}),w.down.on("mousedown",function(n){m(a)}),w.down.on("mouseup",function(n){f(a)}),w.zoomin.off("mousedown"),w.zoomin.on("mousedown",function(n){p(a)}),w.zoomin.off("mouseup"),w.zoomin.on("mouseup",function(n){f(a)}),w.zoomout.on("mousedown",function(n){r(a)}),w.zoomout.on("mouseup",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas").on("mousedown",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mousemove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mouseup",function(n){i(a)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("wheel",function(n){var t,o;t=a,(o=n).preventDefault(),o.stopPropagation(),w=v(t),v(t,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-o.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(t),setTimeout(function(){v(t,{dFov:0})},25)}))),w.isLightbox&&w.prev&&s("body").on("quitimage",function(n){var t;t=a,wppaConsoleLog("Quit Image"),w=v(t,{abort:!0}),clearTimeout(w.timer)}),v(a,w),s(window).off("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),t(a)):setTimeout(function(){wppaDoSphericPan(a)},200))}
1
+ function wppaDoSphericPan(a){var s=jQuery,w=v(a);function l(n){var t=v(n);!t.manCtrl&&g()<t.time+25||(v(n,{time:g()}),t.isLightbox&&(!wppaOvlOpen||wppaOvlActivePanorama!=t.id||wppaGlobalOvlPanoramaId>t.uId)&&(abort=!0),t.abort||((t.butDown||t.manCtrl)&&t.autorun&&(t.autorun=!1,t.dX=0),0==t.dX&&0==t.dY&&0==t.dFov&&(t.pause=!0),t.butDown&&(t.pause=!1),t.fov+=t.dFov,t.fov=Math.max(20,Math.min(120,t.fov)),t.wppaCamera=new THREE.PerspectiveCamera(t.fov,t.aspect,1,1e3),t.wppaCamera.target=new THREE.Vector3(0,0,0),t.lon+=t.dX,t.lat+=t.dY,t.lat=Math.max(-85,Math.min(85,t.lat)),t.wppaCamera.target.x=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.cos(THREE.Math.degToRad(t.lon)),t.wppaCamera.target.y=500*Math.cos(THREE.Math.degToRad(90-t.lat)),t.wppaCamera.target.z=500*Math.sin(THREE.Math.degToRad(90-t.lat))*Math.sin(THREE.Math.degToRad(t.lon)),t.wppaCamera.lookAt(t.wppaCamera.target),t.wppaRenderer&&t.wppaRenderer.render(t.wppaScene,t.wppaCamera),wppaAdjustControlbar(),s("#wppa-ovl-spin").hide(),t.manCtrl,(t.autorun||!t.pause&&(t.manCtrl||t.butDown))&&t.wppaRenderer&&(t.timer=setTimeout(function(){l(n)},25)),v(n,t)))}function t(n){wppaConsoleLog("Resize mocc "+n);var t,o,a,e,i,p,r,u,c=!wppaIsFs();(w=v(n))&&(w.isLightbox?(s("#wppa-overlay-ic").css("display",""),s("#wppa-overlay-ic").css("width",""),a=(c=!wppaIsFs())?(o=window.innerWidth?window.innerWidth:screen.width,window.innerHeight?window.innerHeight:screen.height):(o=screen.width,screen.height),p=(i=8)+(w.controls?w.icsize+10:0)+30,c&&(i+=2*w.borderWidth,p+=2*w.borderWidth),t=(o-i)/2+p<a,e=c?t?(a-(u=(r=o-i)/2)-p)/2+20:(r=2*(u=a-p),20):(r=screen.width,u=screen.height,0),w.aspect=r/u,s("#wppa-ovl-pan-container").css({top:e}),s("#wppa-overlay-ic").css({top:0}),c?(s("#wppa-ovl-pan-container").css({backgroundColor:w.backgroundColor,padding:w.padding+"px",borderRadius:w.borderRadius+"px",width:r,marginLeft:0}),s("#wppa-pctl-div-"+n).css({marginLeft:0}),t?s("#wppa-overlay-ic").css({left:4}):s("#wppa-overlay-ic").css({left:(o-r)/2,marginLeft:0})):(s("#wppa-overlay-ic").css({marginLeft:0}),s("#wppa-ovl-pan-container").css({backgroundColor:"transparent",padding:0,borderRadius:"0px",width:r,left:(o-r)/2}),s("#wppa-pctl-div-"+n).css({marginLeft:0}))):u=(r=s(w.div).parent().width())*w.height/w.width,w.wppaRenderer.setSize(r,u),w.width=r,w.height=u,v(n,w),w.timer=setTimeout(function(){l(n)},250))}function o(n,t){t.preventDefault(),t.stopPropagation(),w=v(n,{manCtrl:!0,butDown:!1,autorun:!1,dX:0}),wppaIsMobile?v(n,{sX:t.touches[0].clientX,sY:t.touches[0].clientY}):v(n,{sX:t.clientX,sY:t.clientY}),v(n,{sLon:w.lon,sLat:w.lat}),l(n)}function e(n,t){t.preventDefault(),t.stopPropagation(),(w=v(n)).manCtrl&&(wppaIsMobile?v(n,{lon:.1*(w.sX-t.touches[0].clientX)+w.sLon,lat:.1*(t.touches[0].clientY-w.sY)+w.sLat,pause:!1}):v(n,{lon:.1*(w.sX-t.clientX)+w.sLon,lat:.1*(t.clientY-w.sY)+w.sLat,pause:!1}),l(n))}function i(n){v(n,{manCtrl:!1})}function p(n){w=v(n),v(n,{dFov:-.4*w.mFakt,butDown:!0}),l(n)}function r(n){w=v(n),v(n,{dFov:.4*w.mFakt,butDown:!0}),l(n)}function u(n){w=v(n),v(n,{dX:.2*w.mFakt,butDown:!0}),l(n)}function c(n){w=v(n),v(n,{dX:-.2*w.mFakt,butDown:!0}),l(n)}function h(n){w=v(n),v(n,{dY:.2*w.mFakt,butDown:!0}),l(n)}function m(n){w=v(n),v(n,{dY:-.2*w.mFakt,butDown:!0}),l(n)}function f(n){w=v(n),v(n,{dX:0,dY:0,dFov:0,butDown:!1})}function v(n,t){if(!wppaSphericData[n])return!1;if(t)for(var o in t)wppaSphericData[n][o]=t[o];return wppaSphericData[n]}function g(){return d=new Date,d.getTime()}w.initialized||w.abort||(w.isLightbox&&s("#wppa-ovl-spin").show(),w.image.complete?(s(image).css({width:image.naturalWidth,height:image.naturalHeight,maxWidth:image.naturalWidth,maxHeight:image.naturalHeight}),w.manCtrl=!1,w.butDown=!1,w.lon=180,w.lat=0,w.dFov=0,w.abort=!1,w.aspect=2,w.div=s("#wppa-pan-div-"+a),w.left=s("#wppa-pctl-left-"+a),w.right=s("#wppa-pctl-right-"+a),w.up=s("#wppa-pctl-up-"+a),w.down=s("#wppa-pctl-down-"+a),w.zoomin=s("#wppa-pctl-zoomin-"+a),w.zoomout=s("#wppa-pctl-zoomout-"+a),w.prev=s("#wppa-pctl-prev-"+a),w.next=s("#wppa-pctl-next-"+a),w.pause=!1,w.mFakt=wppaIsMobile?"2":"1",w.time=0,w.isLightbox&&(wppaGlobalOvlPanoramaId++,w.uId=wppaGlobalOvlPanoramaId),s(w.div).html(""),w.wppaRenderer=new THREE.WebGLRenderer,w.wppaRenderer.setSize(w.width,w.height),s(w.div).append(w.wppaRenderer.domElement),w.wppaScene=new THREE.Scene,w.wppaSphere=new THREE.SphereGeometry(100,100,40),w.wppaSphere.applyMatrix4((new THREE.Matrix4).makeScale(-1,1,1)),w.texture=(new THREE.TextureLoader).load(w.url),w.wppaSphereMaterial=new THREE.MeshBasicMaterial({map:w.texture}),w.wppaSphereMesh=new THREE.Mesh(w.wppaSphere,w.wppaSphereMaterial),w.wppaScene.add(w.wppaSphereMesh),wppaIsMobile?(w.right.on("touchstart",function(n){u(a)}),w.right.on("touchend",function(n){f(a)}),w.left.on("touchstart",function(n){c(a)}),w.left.on("touchend",function(n){f(a)}),w.up.on("touchstart",function(n){h(a)}),w.up.on("touchend",function(n){f(a)}),w.down.on("touchstart",function(n){m(a)}),w.down.on("touchend",function(n){f(a)}),w.zoomin.on("touchstart",function(n){p(a)}),w.zoomin.on("touchend",function(n){f(a)}),w.zoomout.on("touchstart",function(n){r(a)}),w.zoomout.on("touchend",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchstart",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchmove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("touchend",function(n){i(a)}))):(w.right.on("mousedown",function(n){u(a)}),w.right.on("mouseup",function(n){f(a)}),w.left.on("mousedown",function(n){c(a)}),w.left.on("mouseup",function(n){f(a)}),w.up.on("mousedown",function(n){h(a)}),w.up.on("mouseup",function(n){f(a)}),w.down.on("mousedown",function(n){m(a)}),w.down.on("mouseup",function(n){f(a)}),w.zoomin.off("mousedown"),w.zoomin.on("mousedown",function(n){p(a)}),w.zoomin.off("mouseup"),w.zoomin.on("mouseup",function(n){f(a)}),w.zoomout.on("mousedown",function(n){r(a)}),w.zoomout.on("mouseup",function(n){f(a)}),w.enableManual&&(s("#wppa-pan-div-"+a+" canvas").on("mousedown",function(n){o(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mousemove",function(n){e(a,n)}),s("#wppa-pan-div-"+a+" canvas").on("mouseup",function(n){i(a)}),s("#wppa-pan-div-"+a+" canvas")[0].addEventListener("wheel",function(n){var t,o;t=a,(o=n).preventDefault(),o.stopPropagation(),w=v(t),v(t,{manCtrl:!1,butDown:!1,autorun:!1,dX:0,dFov:-o.deltaY*w.zoomsensitivity/(wppaIsChrome?60:6)}),l(t),setTimeout(function(){v(t,{dFov:0})},25)}))),w.isLightbox&&w.prev&&s("body").on("quitimage",function(n){var t;t=a,wppaConsoleLog("Quit Image"),w=v(t,{abort:!0}),clearTimeout(w.timer)}),v(a,w),s(window).off("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),s(window).on("DOMContentLoaded load resize orientationchange",function(){setTimeout(function(n){t(a)},25)}),t(a)):setTimeout(function(){wppaDoSphericPan(a)},200))}
wppa-defaults.php CHANGED
@@ -667,6 +667,7 @@ horizrailenabled:false,";
667
  'wppa_panorama_autorun' => 'none',
668
  'wppa_panorama_autorun_speed' => '3',
669
  'wppa_panorama_wheel_sensitivity' => '3',
 
670
 
671
  // Table V: Fonts
672
  'wppa_fontfamily_title' => '',
667
  'wppa_panorama_autorun' => 'none',
668
  'wppa_panorama_autorun_speed' => '3',
669
  'wppa_panorama_wheel_sensitivity' => '3',
670
+ 'wppa_panorama_fov' => '75',
671
 
672
  // Table V: Fonts
673
  'wppa_fontfamily_title' => '',
wppa-photo-files.php CHANGED
@@ -478,6 +478,14 @@ function wppa_create_thumbnail( $id, $use_source = true ) {
478
  // Get output path
479
  $thumbpath = wppa_get_thumb_path( $id );
480
 
 
 
 
 
 
 
 
 
481
  // Source size
482
  $src_size_w = $img_attr[0];
483
  $src_size_h = $img_attr[1];
@@ -540,7 +548,6 @@ function wppa_create_thumbnail( $id, $use_source = true ) {
540
  if ( ! $done && wppa_can_magick() && $type == 'none' ) {
541
 
542
  $cmd = 'convert ' . $file . ' -thumbnail ' . $perc . '% ' . $thumbpath;
543
- wppa_log( 'fso', 'Magick command = ' . $cmd );
544
  $iret = wppa_image_magick( $cmd );
545
  if ( $iret ) {
546
  wppa_log( 'fso', 'Magick command could not create ' . $thumbpath );
@@ -723,6 +730,14 @@ function wppa_create_thumbnail( $id, $use_source = true ) {
723
 
724
  // Invalidate cache
725
  wppa_cache_thumb( 'invalidate', $id );
 
 
 
 
 
 
 
 
726
  return true;
727
  }
728
 
@@ -767,14 +782,12 @@ function wppa_image_magick( $command ) {
767
  $logcom = str_replace( ABSPATH, '...', $logcom );
768
  $logcom = str_replace( wppa_opt( 'image_magick' ), '...', $logcom );
769
 
770
- if ( $err ) {
771
- $key = $err ? 'Err' : 'Dbg';
772
- wppa_log( $key, 'Exec ' . $logcom . ' returned ' . $err );
773
- foreach( $out as $line ) {
774
- wppa_log( 'OBS', $line );
775
- }
776
  }
777
 
 
778
  return $err;
779
  }
780
 
478
  // Get output path
479
  $thumbpath = wppa_get_thumb_path( $id );
480
 
481
+ // If already existing, save the filetime
482
+ if ( wppa_is_file( $thumbpath ) ) {
483
+ $thumbtime = wppa_filetime( $thumbpath );
484
+ }
485
+ else {
486
+ $thumbtime = 0;
487
+ }
488
+
489
  // Source size
490
  $src_size_w = $img_attr[0];
491
  $src_size_h = $img_attr[1];
548
  if ( ! $done && wppa_can_magick() && $type == 'none' ) {
549
 
550
  $cmd = 'convert ' . $file . ' -thumbnail ' . $perc . '% ' . $thumbpath;
 
551
  $iret = wppa_image_magick( $cmd );
552
  if ( $iret ) {
553
  wppa_log( 'fso', 'Magick command could not create ' . $thumbpath );
730
 
731
  // Invalidate cache
732
  wppa_cache_thumb( 'invalidate', $id );
733
+
734
+ // If existing file not updated, return false
735
+ if ( wppa_is_file( $thumbpath ) ) {
736
+ $newtime = wppa_filetime( $thumbpath );
737
+ }
738
+ if ( $newtime == $thumbtime ) {
739
+ return false;
740
+ }
741
  return true;
742
  }
743
 
782
  $logcom = str_replace( ABSPATH, '...', $logcom );
783
  $logcom = str_replace( wppa_opt( 'image_magick' ), '...', $logcom );
784
 
785
+ wppa_log( 'Fso', 'Exec ' . $logcom . ' return status: ' . $err . ', last output line: ' . $run );
786
+ foreach( $out as $line ) {
787
+ wppa_log( 'OBS', $line );
 
 
 
788
  }
789
 
790
+ if ( $err == '46' ) $err = '0';
791
  return $err;
792
  }
793
 
wppa-picture.php CHANGED
@@ -637,6 +637,7 @@ function wppa_get_spheric_pan_html( $args ) {
637
  autorun :' . $run . ',
638
  dX :' . $dX . ',
639
  dY :0,
 
640
  zoomsensitivity :' . $zoomsensitivity . ',
641
  borderWidth :' . wppa_opt( 'ovl_border_width' ) . ',
642
  controls :' . ( $controls ? 'true' : 'false' ) . ',
637
  autorun :' . $run . ',
638
  dX :' . $dX . ',
639
  dY :0,
640
+ fov :' . wppa_opt( 'panorama_fov' ) . ',
641
  zoomsensitivity :' . $zoomsensitivity . ',
642
  borderWidth :' . wppa_opt( 'ovl_border_width' ) . ',
643
  controls :' . ( $controls ? 'true' : 'false' ) . ',
wppa-settings-autosave.php CHANGED
@@ -5785,6 +5785,16 @@ global $wppa_supported_camara_brands;
5785
  $tags = '';
5786
  wppa_setting( $slug, '3.2', $name, $desc, $html, $help, $clas, $tags );
5787
 
 
 
 
 
 
 
 
 
 
 
5788
  }
5789
  ?>
5790
  </tbody>
5785
  $tags = '';
5786
  wppa_setting( $slug, '3.2', $name, $desc, $html, $help, $clas, $tags );
5787
 
5788
+ $name = __( 'Initial zoom spheric panorama', 'wp-photo-album-plus' );
5789
+ $desc = __( 'Select initial viewing angle for spheric panoramas', 'wp-photo-album-plus' );
5790
+ $help = '';
5791
+ $slug = 'wppa_panorama_fov';
5792
+ $opts = array( '45&deg;', '50&deg;', '55&deg;', '60&deg;', '65&deg;', '70&deg;', '75&deg;', '80&deg;', '85&deg;', '90&deg;' );
5793
+ $vals = array( '45', '50', '55', '60', '65', '70', '75', '80', '85', '90' );
5794
+ $html = wppa_select($slug, $opts, $vals);
5795
+ $clas = '';
5796
+ $tags = '';
5797
+ wppa_setting( $slug, '4', $name, $desc, $html, $help, $clas, $tags );
5798
  }
5799
  ?>
5800
  </tbody>
wppa-wrappers.php CHANGED
@@ -5,7 +5,7 @@
5
  * Contains wrappers for standard php functions
6
  * For security and bug reasons
7
  *
8
- * Version 7.4.03
9
  *
10
  */
11
 
@@ -717,6 +717,7 @@ function wppa_shortpath( $path ) {
717
 
718
  function wppa_filetime( $path, $log = true ) {
719
 
 
720
  if ( ! wppa_is_path_safe( $path ) ) {
721
  if ( $log ) wppa_log( 'Err', 'Unsafe path detected in wppa_filetime(): ' . wppa_shortpath( $path ), true );
722
  return false;
5
  * Contains wrappers for standard php functions
6
  * For security and bug reasons
7
  *
8
+ * Version 7.6.01
9
  *
10
  */
11
 
717
 
718
  function wppa_filetime( $path, $log = true ) {
719
 
720
+ clearstatcache();
721
  if ( ! wppa_is_path_safe( $path ) ) {
722
  if ( $log ) wppa_log( 'Err', 'Unsafe path detected in wppa_filetime(): ' . wppa_shortpath( $path ), true );
723
  return false;
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.6.01.005
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 = '7601'; // WPPA db version
27
- global $wppa_api_version; $wppa_api_version = '7.6.01.005'; // 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.6.01.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 = '7601'; // WPPA db version
27
+ global $wppa_api_version; $wppa_api_version = '7.6.01.006'; // WPPA software version
28
 
29
  /* Init page js data */
30
  global $wppa_js_page_data; $wppa_js_page_data = '';