erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-12 03:45:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fixes the CI resource path for the iframe. Oops.

Browse source
This commit is contained in:
Joshua A. Horton 2018-02-09 13:08:35 +07:00
parent 270df7e8da
commit 1db5bbd7ef
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/unit_tests/CI.conf.js
View file

@ -167,7 +167,7 @@ module.exports = function(config) {
proxies: {
"/source/": "/base/release/unminified/web/",
"/resources/": "unit_tests/resources"
"/resources/": "/base/unit_tests/resources/"
},

5
web/unit_tests/cases/attachmentAPI.js
View file

@ -42,7 +42,7 @@ if(typeof(DynamicElements) == 'undefined') {
if(loadCallback) {
frame.addEventListener('load', function() {
// Give KMW's attachment events a chance to run first.
window.setTimeout(loadCallback, 50);
window.setTimeout(loadCallback, 100);
});
}
frame.setAttribute("src", "resources/html/iframe.html");
@ -122,13 +122,13 @@ Modernizr.on('touchevents', function(result) {
DynamicElements.assertAttached(ele, done);
});
// We still have weird collateral issues with IE and Edge if this is enabled.
it('<iframe>', function(done) {
var ID = DynamicElements.addIFrame(function() {
var ele = document.getElementById(ID);
var innerEle = ele.contentDocument.getElementById('iframe_input');
assert.isFalse(keyman.isAttached(ele));
assert.isNotNull(innerEle);
assert.isFalse(keyman.isAttached(innerEle));
window.setTimeout(function() {
@ -198,6 +198,7 @@ Modernizr.on('touchevents', function(result) {
var innerEle = ele.contentDocument.getElementById('iframe_input');
assert.isTrue(keyman.isAttached(ele));
assert.isNotNull(innerEle);
assert.isTrue(keyman.isAttached(innerEle));
keyman.detachFromControl(ele);