Skip to content

Commit

Permalink
clean IE code
Browse files Browse the repository at this point in the history
  • Loading branch information
jumperchen committed Dec 12, 2023
1 parent 1b13b21 commit c15c6ea
Show file tree
Hide file tree
Showing 27 changed files with 79 additions and 1,228 deletions.
2 changes: 0 additions & 2 deletions zk/src/main/resources/web/js/zk/anima.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,8 @@ export namespace anima_global {
* fixed a bug of the finished animation for IE
* refix for ZK-568: Open combobox then select last item. reopen combobox then you should see selected item without scroll
*/
var zkie = zk.ie;
// ZK_3789: refine ZK-3695, fire down onRestore after the wrapper was removed
zWatch.fireDown('onRestore', wgt);
if (zkie == 10) zk(self.jq[0]).redoCSS();
zUtl.fireShown(wgt);
} else {
self.jq.hide();
Expand Down
13 changes: 1 addition & 12 deletions zk/src/main/resources/web/js/zk/au.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1654,9 +1654,7 @@ export namespace au_global {
export function download(url: string): void {
if (url) {
var ifr: HTMLIFrameElement = jq('#zk_download')[0] as HTMLIFrameElement,
ie = zk.ie,
sbu = zk.skipBfUnload;
if (ie) zk.skipBfUnload = true;

if (!ifr) {
ifr = document.createElement('iframe');
Expand All @@ -1667,12 +1665,6 @@ export namespace au_global {
}

ifr.src = url; //It is OK to reuse the same iframe

// Workaround for IE11: wait a second (not perfect) for iframe loading
if (ie === 11)
setTimeout(function () {
zk.skipBfUnload = sbu;
}, 1000);
}
}
/**
Expand Down Expand Up @@ -2183,10 +2175,7 @@ export namespace au_global {
// so we have to do the same as that code in Window.js
setTimeout(function () {
zk.afterAnimate(function () {
if (zk.ie9_)
wgt.focus(100);
else
wgt.focus(0); //wgt.focus() failed in FF
wgt.focus(0); //wgt.focus() failed in FF
}, -1);
});
}
Expand Down
Loading

0 comments on commit c15c6ea

Please sign in to comment.