mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-07 18:39:23 +03:00
Code Issues Projects Releases Wiki Activity

Checkpoint. Some more cleanup and simplification

Browse Source
This commit is contained in:
houseofyin 2013-03-31 10:42:35 -04:00
parent 1e8acf5466
commit 05cad2046f
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/navigator.js
View File

@ -9,8 +9,6 @@ QUnit.config.autostart = false;
module("navigator", { module("navigator", {
setup:function () { setup:function () {
//This is longer than is ideal so the tests will pass cleanly under Safari
QUnit.config.testTimeout = 20000;
resetDom(); resetDom();
resetTestVariables(); resetTestVariables();
} }
@ -118,13 +116,6 @@ QUnit.config.autostart = false;
assessNumericValueWithSomeVariance(expectedBounds.y, displayRegion.position().top, 2, status + ' Top synchronization'); assessNumericValueWithSomeVariance(expectedBounds.y, displayRegion.position().top, 2, status + ' Top synchronization');
}; };
var filterToDetectThatDisplayRegionHasBeenDrawn = function () {
var self = $(this);
return self.width() > 0 &&
self.height() > 0 &&
(typeof self.position() !== 'undefined');
};
var waitUntilFilterSatisfied = function () { var waitUntilFilterSatisfied = function () {
return function () { return function () {
return function (selector, filterfunction, handler, recursiveCall, count) { return function (selector, filterfunction, handler, recursiveCall, count) {
@ -160,18 +151,19 @@ QUnit.config.autostart = false;
{ {
displayRegion = $(".displayregion"); displayRegion = $(".displayregion");
} }
var propertyAchieved = false; var viewerAndNavigatorDisplayReady = false;
if (typeof count !== "number") { if (typeof count !== "number") {
count = 0; count = 0;
lastDisplayRegionLeft = null; lastDisplayRegionLeft = null;
lastDisplayWidth = null; lastDisplayWidth = null;
} }
if (viewer.drawer !== null) {
try try
{ {
currentDisplayRegionLeft = displayRegion.position().left; currentDisplayRegionLeft = displayRegion.position().left;
currentDisplayWidth = displayRegion.width(); currentDisplayWidth = displayRegion.width();
propertyAchieved = equalsWithSomeVariance(lastDisplayRegionLeft, currentDisplayRegionLeft,.0001) && viewerAndNavigatorDisplayReady = viewer.drawer !== null &&
currentDisplayWidth > 0 &&
equalsWithSomeVariance(lastDisplayRegionLeft, currentDisplayRegionLeft,.0001) &&
equalsWithSomeVariance(lastDisplayWidth,currentDisplayWidth,.0001) && equalsWithSomeVariance(lastDisplayWidth,currentDisplayWidth,.0001) &&
equalsWithSomeVariance(viewer.viewport.getBounds(true).x,viewer.viewport.getBounds().x,.0001) && equalsWithSomeVariance(viewer.viewport.getBounds(true).x,viewer.viewport.getBounds().x,.0001) &&
equalsWithSomeVariance(viewer.viewport.getBounds(true).width,viewer.viewport.getBounds().width,.0001); equalsWithSomeVariance(viewer.viewport.getBounds(true).width,viewer.viewport.getBounds().width,.0001);
@ -180,8 +172,7 @@ QUnit.config.autostart = false;
{ {
//Ignore. Subsequent code will try again shortly //Ignore. Subsequent code will try again shortly
} }
} if (( !viewerAndNavigatorDisplayReady) && count < 40) {
if ((viewer.drawer === null || !propertyAchieved) && count < 40) { //|| viewer.drawer.needsUpdate()
count++; count++;
setTimeout(function () {waitForViewer(handler, count, currentDisplayRegionLeft, currentDisplayWidth);}, 100) setTimeout(function () {waitForViewer(handler, count, currentDisplayRegionLeft, currentDisplayWidth);}, 100)
} }
@ -274,13 +265,9 @@ QUnit.config.autostart = false;
waitForViewer(assessAfterZoomOnViewer); waitForViewer(assessAfterZoomOnViewer);
}; };
var proceedOnceTheIntialImagesAreLoaded = function () {
waitUntilFilterSatisfied(testProperties.displayRegionLocator, filterToDetectThatDisplayRegionHasBeenDrawn, captureInitialStateAfterOpenAndThenAct);
};
var openHandler = function () { var openHandler = function () {
viewer.removeHandler('open', openHandler); viewer.removeHandler('open', openHandler);
waitForViewer(proceedOnceTheIntialImagesAreLoaded); waitForViewer(captureInitialStateAfterOpenAndThenAct);
}; };
viewer.addHandler('open', openHandler); viewer.addHandler('open', openHandler);