Commit 39f2fc63 authored by hbcui1984's avatar hbcui1984

修改mui.openWindow执行逻辑,避免同一页面创建多个webview的问题;

parent a7378e36
...@@ -1674,6 +1674,17 @@ var mui = (function(document, undefined) { ...@@ -1674,6 +1674,17 @@ var mui = (function(document, undefined) {
webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')'); webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
return webview; return webview;
} else { //新窗口 } else { //新窗口
if (options.createNew !== true) {
webview = plus.webview.getWebviewById(id);
if (webview) {//如果已存在
nShow = $.showOptions(options.show);
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview, 'pagebeforeshow', false);
});
return webview;
}
}
//显示waiting //显示waiting
var waitingConfig = $.waitingOptions(options.waiting); var waitingConfig = $.waitingOptions(options.waiting);
if (waitingConfig.autoShow) { if (waitingConfig.autoShow) {
...@@ -1684,6 +1695,7 @@ var mui = (function(document, undefined) { ...@@ -1684,6 +1695,7 @@ var mui = (function(document, undefined) {
id: id, id: id,
url: url url: url
}); });
webview = $.createWindow(options); webview = $.createWindow(options);
//显示 //显示
nShow = $.showOptions(options.show); nShow = $.showOptions(options.show);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1674,6 +1674,17 @@ var mui = (function(document, undefined) { ...@@ -1674,6 +1674,17 @@ var mui = (function(document, undefined) {
webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')'); webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
return webview; return webview;
} else { //新窗口 } else { //新窗口
if (options.createNew !== true) {
webview = plus.webview.getWebviewById(id);
if (webview) {//如果已存在
nShow = $.showOptions(options.show);
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview, 'pagebeforeshow', false);
});
return webview;
}
}
//显示waiting //显示waiting
var waitingConfig = $.waitingOptions(options.waiting); var waitingConfig = $.waitingOptions(options.waiting);
if (waitingConfig.autoShow) { if (waitingConfig.autoShow) {
...@@ -1684,6 +1695,7 @@ var mui = (function(document, undefined) { ...@@ -1684,6 +1695,7 @@ var mui = (function(document, undefined) {
id: id, id: id,
url: url url: url
}); });
webview = $.createWindow(options); webview = $.createWindow(options);
//显示 //显示
nShow = $.showOptions(options.show); nShow = $.showOptions(options.show);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -179,6 +179,17 @@ ...@@ -179,6 +179,17 @@
webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')'); webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
return webview; return webview;
} else { //新窗口 } else { //新窗口
if (options.createNew !== true) {
webview = plus.webview.getWebviewById(id);
if (webview) {//如果已存在
nShow = $.showOptions(options.show);
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview, 'pagebeforeshow', false);
});
return webview;
}
}
//显示waiting //显示waiting
var waitingConfig = $.waitingOptions(options.waiting); var waitingConfig = $.waitingOptions(options.waiting);
if (waitingConfig.autoShow) { if (waitingConfig.autoShow) {
...@@ -189,6 +200,7 @@ ...@@ -189,6 +200,7 @@
id: id, id: id,
url: url url: url
}); });
webview = $.createWindow(options); webview = $.createWindow(options);
//显示 //显示
nShow = $.showOptions(options.show); nShow = $.showOptions(options.show);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment