mirror of
https://github.com/openseadragon/openseadragon.git
synced 2025-02-21 17:23:14 +03:00
Fix broken tests (bad logics in event handling).
This commit is contained in:
parent
cf2413e0c9
commit
3d6eb1b91c
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
tileExists: function ( level, x, y ) {
|
tileExists: function ( level, x, y ) {
|
||||||
return true;
|
return true;
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
var Loader = function(options) {
|
var Loader = function(options) {
|
||||||
@ -96,7 +96,9 @@
|
|||||||
OriginalLoader.prototype.addJob.apply(this, [options]);
|
OriginalLoader.prototype.addJob.apply(this, [options]);
|
||||||
} else {
|
} else {
|
||||||
//no ajax means we would wait for invalid image link to load, close - passed
|
//no ajax means we would wait for invalid image link to load, close - passed
|
||||||
|
setTimeout(() => {
|
||||||
viewer.close();
|
viewer.close();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -138,7 +140,9 @@
|
|||||||
//first AJAX firing is the image info getter, second is the first tile request: can exit
|
//first AJAX firing is the image info getter, second is the first tile request: can exit
|
||||||
ajaxCounter++;
|
ajaxCounter++;
|
||||||
if (ajaxCounter > 1) {
|
if (ajaxCounter > 1) {
|
||||||
|
setTimeout(() => {
|
||||||
viewer.close();
|
viewer.close();
|
||||||
|
});
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,33 +187,34 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
var failHandler = function (event) {
|
var failHandler = function (event) {
|
||||||
testPostData(event.postData, "event: 'open-failed'");
|
ASSERT.ok(false, 'Open-failed shoud not be called. We have custom function of fetching the data that succeeds.');
|
||||||
viewer.removeHandler('open-failed', failHandler);
|
|
||||||
viewer.close();
|
|
||||||
};
|
};
|
||||||
viewer.addHandler('open-failed', failHandler);
|
viewer.addHandler('open-failed', failHandler);
|
||||||
|
|
||||||
var readyHandler = function (event) {
|
var openHandlerCalled = false;
|
||||||
//relies on Tilesource contructor extending itself with options object
|
|
||||||
testPostData(event.postData, "event: 'ready'");
|
|
||||||
viewer.removeHandler('ready', readyHandler);
|
|
||||||
};
|
|
||||||
viewer.addHandler('ready', readyHandler);
|
|
||||||
|
|
||||||
|
|
||||||
var openHandler = function(event) {
|
var openHandler = function(event) {
|
||||||
viewer.removeHandler('open', openHandler);
|
viewer.removeHandler('open', openHandler);
|
||||||
ASSERT.ok(true, 'Open event was sent');
|
openHandlerCalled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
var readyHandler = function (event) {
|
||||||
|
testPostData(event.item.source.getTilePostData(0, 0, 0), "event: 'add-item'");
|
||||||
|
viewer.world.removeHandler('add-item', readyHandler);
|
||||||
viewer.addHandler('close', closeHandler);
|
viewer.addHandler('close', closeHandler);
|
||||||
viewer.world.draw();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var closeHandler = function(event) {
|
var closeHandler = function(event) {
|
||||||
|
ASSERT.ok(openHandlerCalled, 'Open event was sent.');
|
||||||
|
|
||||||
viewer.removeHandler('close', closeHandler);
|
viewer.removeHandler('close', closeHandler);
|
||||||
$('#example').empty();
|
$('#example').empty();
|
||||||
ASSERT.ok(true, 'Close event was sent');
|
ASSERT.ok(true, 'Close event was sent');
|
||||||
timeWatcher.done();
|
timeWatcher.done();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//make sure we call add-item before the system default 0 priority, it fires download on tiles and removes
|
||||||
|
// which calls internally viewer.close
|
||||||
|
viewer.world.addHandler('add-item', readyHandler, null, Infinity);
|
||||||
viewer.addHandler('open', openHandler);
|
viewer.addHandler('open', openHandler);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user