mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-21 20:56:09 +03:00
Code Issues Projects Releases Wiki Activity

Some issues solved

Browse Source
This commit is contained in:
Jose 2017-02-20 20:23:25 +01:00
parent d5b62aabcd
commit 70bdc8839e
7 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc.json
View File

@ -8,10 +8,6 @@
"off", "off",
4 4
], ],
//"linebreak-style": [
// "error",
// "unix"
//],
"quotes": [ "quotes": [
"off", "off",
"double" "double"

10
src/mousetracker.js
View File

@ -870,12 +870,12 @@
* @memberof OpenSeadragon.MouseTracker * @memberof OpenSeadragon.MouseTracker
*/ */
$.MouseTracker.resetAllMouseTrackers = function(){ $.MouseTracker.resetAllMouseTrackers = function(){
MOUSETRACKERS.forEach(function(mt){ for(var i = 0; i < MOUSETRACKERS.length; i++){
if (mt.isTracking()){ if (MOUSETRACKERS[i].isTracking()){
mt.setTracking(false); MOUSETRACKERS[i].setTracking(false);
mt.setTracking(true); MOUSETRACKERS[i].setTracking(true);
} }
}); }
}; };
/** /**

9
src/viewer.js
View File

@ -2530,7 +2530,6 @@ function onCanvasDblClick( event ) {
}); });
} }
// Modified to improve constrained panning
function onCanvasDrag( event ) { function onCanvasDrag( event ) {
var gestureSettings; var gestureSettings;
@ -2546,14 +2545,14 @@ function onCanvasDrag( event ) {
if( this.constrainDuringPan ){ if( this.constrainDuringPan ){
var delta = this.viewport.deltaPointsFromPixels( event.delta.negate() ); var delta = this.viewport.deltaPointsFromPixels( event.delta.negate() );
this["viewport"].centerSpringX.target.value += delta.x; this.viewport.centerSpringX.target.value += delta.x;
this["viewport"].centerSpringY.target.value += delta.y; this.viewport.centerSpringY.target.value += delta.y;
var bounds = this.viewport.getBounds(); var bounds = this.viewport.getBounds();
var constrainedBounds = this.viewport.getConstrainedBounds(); var constrainedBounds = this.viewport.getConstrainedBounds();
this["viewport"].centerSpringX.target.value -= delta.x; this.viewport.centerSpringX.target.value -= delta.x;
this["viewport"].centerSpringY.target.value -= delta.y; this.viewport.centerSpringY.target.value -= delta.y;
if (bounds.x != constrainedBounds.x) { if (bounds.x != constrainedBounds.x) {
event.delta.x = 0; event.delta.x = 0;

2
src/viewport.js
View File

@ -734,7 +734,7 @@ $.Viewport.prototype = {
/** /**
* Returns bounds taking constrains into account * Returns bounds taking constraints into account
* Added to improve constrained panning * Added to improve constrained panning
* @param {Boolean} immediately * @param {Boolean} immediately
* @return {OpenSeadragon.Viewport} Chainable. * @return {OpenSeadragon.Viewport} Chainable.

2
test/demo/constrainedpan.html
View File

@ -45,4 +45,4 @@
}); });
</script> </script>
</body> </body>
</html> </html>

5
test/demo/embed.html → test/demo/iframe-embed.html
View File

@ -1,8 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>CartoWall Climbing Topo</title> <title>Iframe example embed</title>
<script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script> <script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script>
@ -30,4 +29,4 @@
}); });
</script> </script>
</body> </body>
</html> </html>

7
test/demo/iframe.html → test/demo/iframe-host.html
View File

@ -1,8 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>CartoWall Climbing Topo</title> <title>Iframe example</title>
<script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script> <script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script>
@ -14,6 +13,6 @@
</head> </head>
<body> <body>
<iframe src="embed.html" frameborder="0" width="560" height="315" allowfullscreen></iframe> <iframe src="iframe-embed.html" frameborder="0" width="560" height="315" allowfullscreen></iframe>
</body> </body>
</html> </html>