Commit 9550b51c authored by hbcui1984's avatar hbcui1984

解决web view版选项卡在iOS平台关闭再打开后,没有进入最后一次选项卡的问题

parent 0dbd43c9
...@@ -3801,21 +3801,23 @@ window.mui = mui; ...@@ -3801,21 +3801,23 @@ window.mui = mui;
if (window.plus) { if (window.plus) {
var wobj = $.currentWebview; var wobj = $.currentWebview;
var parent = wobj.parent(); var parent = wobj.parent();
if (parent) {
wobj = parent;
}
wobj.canBack(function(e) { wobj.canBack(function(e) {
//by chb 暂时注释,在碰到类似popover之类的锚点的时候,需多次点击才能返回; //by chb 暂时注释,在碰到类似popover之类的锚点的时候,需多次点击才能返回;
// if (e.canBack) {//webview history back // if (e.canBack) {//webview history back
// window.history.back(); // window.history.back();
// } else {//webview close or hide // } else {//webview close or hide
//TODO 会不会存在多层嵌套?如果存在需要递归找到最顶层 //TODO 会不会存在多层嵌套?如果存在需要递归找到最顶层
if (parent) {
wobj = parent;
}
var opener = wobj.opener(); var opener = wobj.opener();
if (opener) { if (opener) {
var openerParent = opener.parent(); //by chb 暂不自动处理老页面的隐藏;
if (openerParent) { // var openerParent = opener.parent();
opener = openerParent; // if (openerParent) {
} // opener = openerParent;
// }
if (wobj.preload) { if (wobj.preload) {
wobj.hide("auto"); wobj.hide("auto");
} else { } else {
......
This diff is collapsed.
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</style> </style>
<header class="mui-bar mui-bar-nav"> <header class="mui-bar mui-bar-nav">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a> <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
<h1 class="mui-title">Tab with segmented control</h1> <h1 class="mui-title">按钮式选项卡</h1>
</header> </header>
<div class="mui-content"> <div class="mui-content">
<div id="segmentedControl" class="mui-segmented-control"> <div id="segmentedControl" class="mui-segmented-control">
...@@ -67,12 +67,6 @@ ...@@ -67,12 +67,6 @@
<li class="mui-table-view-cell"> <li class="mui-table-view-cell">
第一个选项卡子项-3 第一个选项卡子项-3
</li> </li>
<li class="mui-table-view-cell">
第一个选项卡子项-4
</li>
<li class="mui-table-view-cell">
第一个选项卡子项-5
</li>
</ul> </ul>
</div> </div>
<div id="item2mobile" class="mui-control-content"> <div id="item2mobile" class="mui-control-content">
...@@ -86,12 +80,6 @@ ...@@ -86,12 +80,6 @@
<li class="mui-table-view-cell"> <li class="mui-table-view-cell">
第二个选项卡子项-3 第二个选项卡子项-3
</li> </li>
<li class="mui-table-view-cell">
第二个选项卡子项-4
</li>
<li class="mui-table-view-cell">
第二个选项卡子项-5
</li>
</ul> </ul>
</div> </div>
<div id="item3mobile" class="mui-control-content"> <div id="item3mobile" class="mui-control-content">
...@@ -105,12 +93,6 @@ ...@@ -105,12 +93,6 @@
<li class="mui-table-view-cell"> <li class="mui-table-view-cell">
第三个选项卡子项-3 第三个选项卡子项-3
</li> </li>
<li class="mui-table-view-cell">
第三个选项卡子项-4
</li>
<li class="mui-table-view-cell">
第三个选项卡子项-5
</li>
</ul> </ul>
</div> </div>
</div> </div>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</style> </style>
<header class="mui-bar mui-bar-nav"> <header class="mui-bar mui-bar-nav">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a> <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
<h1 class="mui-title">Tab with viewPagerIndicator</h1> <h1 class="mui-title">可拖动式选项卡</h1>
</header> </header>
<div class="mui-content"> <div class="mui-content">
<div id="slider" class="mui-slider"> <div id="slider" class="mui-slider">
......
This diff is collapsed.
...@@ -534,21 +534,34 @@ ...@@ -534,21 +534,34 @@
} }
}); });
//监听展开事件 //监听展开事件,预加载二级列表的前几个;
$('#demos').on('expand', '.mui-collapse', function(e) { $('#demos').on('expand', '.mui-collapse', function(e) {
count = 0; count = 0;
$('.mui-table-view a', this).each(function() { $('.mui-table-view a', this).each(function() {
var id = this.getAttribute('href'); var id = url = this.getAttribute('href');
if (~id.indexOf('.html') && !~$.data.preloads.indexOf(id)) { //如果没在缓存,则创建预加载 if (~id.indexOf('.html') && !~$.data.preloads.indexOf(id)) { //如果没在缓存,则创建预加载
var url = this.href; //单独处理侧滑导航的index
//延迟100ms处理,避免影响操作流畅 if(~id.indexOf('offcanvas-')){
setTimeout(function() { $.createWindow({
$.createWindow({ id: id,
id: id, url: url,
url: url, styles:{
preload: true zindex:9999
}); },
}, (count++) * 100); preload: true
});
}else{
$.createWindow({
id: id,
url: url,
preload: true
});
}
count++;
if(count>2){
return false;
}
} }
}); });
}); });
...@@ -586,15 +599,15 @@ ...@@ -586,15 +599,15 @@
id: id, id: id,
url: this.href, url: this.href,
styles:{ styles:{
zindex:9999, zindex:9999
}, },
preload: $.os.ios ? false : true //TODO 暂时屏蔽IOS的预加载 preload: true
}); });
}else{ }else{
$.openWindow({ $.openWindow({
id: id, id: id,
url: this.href, url: this.href,
preload: $.os.ios ? false : true //TODO 暂时屏蔽IOS的预加载 preload:true
}); });
} }
} else { } else {
......
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