Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clean IE code #3092

Merged
merged 2 commits into from
Dec 13, 2023
Merged

clean IE code #3092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8df538
clean IE code
jumperchen Dec 12, 2023
8353057
Merge branch 'master' into clean-ie-code
jumperchen Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions zk/src/main/resources/web/js/zk/anima.ts
View file
Open in desktop
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
View file
Open in desktop
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
Loading