Commit 7dfc1fdc authored by hbcui1984's avatar hbcui1984

MUI框架不再监听首页的back按键

parent f34db8d8
/*! /*!
* ===================================================== * =====================================================
* Mui v0.5.3 (https://github.com/dcloudio/mui) * Mui v0.5.4 (https://github.com/dcloudio/mui)
* ===================================================== * =====================================================
*/ */
...@@ -933,19 +933,19 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -933,19 +933,19 @@ input[type="submit"]:active, input[type="submit"].mui-active,
.mui-btn-outlined.mui-btn-primary, .mui-btn-outlined.mui-btn-blue { .mui-btn-outlined.mui-btn-primary, .mui-btn-outlined.mui-btn-blue {
color: #007aff; color: #007aff;
} }
.mui-btn-outlined.mui-btn-success, .mui-btn-outlined.mui-btn-green { .mui-btn-outlined.mui-btn-positive, .mui-btn-outlined.mui-btn-success, .mui-btn-outlined.mui-btn-green {
color: #4cd964; color: #4cd964;
} }
.mui-btn-outlined.mui-btn-warning, .mui-btn-outlined.mui-btn-yellow { .mui-btn-outlined.mui-btn-warning, .mui-btn-outlined.mui-btn-yellow {
color: #f0ad4e; color: #f0ad4e;
} }
.mui-btn-outlined.mui-btn-danger, .mui-btn-outlined.mui-btn-red { .mui-btn-outlined.mui-btn-negative, .mui-btn-outlined.mui-btn-danger, .mui-btn-outlined.mui-btn-red {
color: #dd524d; color: #dd524d;
} }
.mui-btn-outlined.mui-btn-royal, .mui-btn-outlined.mui-btn-purple { .mui-btn-outlined.mui-btn-royal, .mui-btn-outlined.mui-btn-purple {
color: #8a6de9; color: #8a6de9;
} }
.mui-btn-outlined.mui-btn-primary:active, .mui-btn-outlined.mui-btn-blue:active, .mui-btn-outlined.mui-btn-success:active, .mui-btn-outlined.mui-btn-green:active, .mui-btn-outlined.mui-btn-warning:active, .mui-btn-outlined.mui-btn-yellow:active, .mui-btn-outlined.mui-btn-danger:active, .mui-btn-outlined.mui-btn-red:active, .mui-btn-outlined.mui-btn-royal:active, .mui-btn-outlined.mui-btn-purple:active { .mui-btn-outlined.mui-btn-primary:active, .mui-btn-outlined.mui-btn-blue:active, .mui-btn-outlined.mui-btn-positive:active, .mui-btn-outlined.mui-btn-success:active, .mui-btn-outlined.mui-btn-green:active, .mui-btn-outlined.mui-btn-warning:active, .mui-btn-outlined.mui-btn-yellow:active, .mui-btn-outlined.mui-btn-negative:active, .mui-btn-outlined.mui-btn-danger:active, .mui-btn-outlined.mui-btn-red:active, .mui-btn-outlined.mui-btn-royal:active, .mui-btn-outlined.mui-btn-purple:active {
color: #fff; color: #fff;
} }
...@@ -1229,6 +1229,7 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -1229,6 +1229,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
.mui-bar .mui-segmented-control { .mui-bar .mui-segmented-control {
top: 7px; top: 7px;
width: auto;
margin: 0 auto; margin: 0 auto;
} }
...@@ -1727,7 +1728,7 @@ select { ...@@ -1727,7 +1728,7 @@ select {
.mui-input-row label { .mui-input-row label {
float: left; float: left;
width: 35%; width: 35%;
padding: 8px 20px; padding: 8px 15px;
font-family: "Helvetica Neue", Helvetica, sans-serif; font-family: "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.1; line-height: 1.1;
} }
......
This diff is collapsed.
/*! /*!
* ===================================================== * =====================================================
* Mui v0.5.3 (https://github.com/dcloudio/mui) * Mui v0.5.4 (https://github.com/dcloudio/mui)
* ===================================================== * =====================================================
*/ */
/** /**
...@@ -1334,17 +1334,21 @@ window.mui = mui; ...@@ -1334,17 +1334,21 @@ window.mui = mui;
$.init.add(function() { $.init.add(function() {
var options = $.options; var options = $.options;
var pullRefreshOptions = options.pullRefresh || {}; var pullRefreshOptions = options.pullRefresh || {};
var container = pullRefreshOptions.container; //只要是android手机,必须使用原生的下拉刷新;
if (container) { if($.os.plus && $.os.android){
var $container = $(container); if(pullRefreshOptions.down){
if ($container.length === 1) { $.plus_pulldownRefresh(pullRefreshOptions.down);
if ($.options.optimize && $.os.plus && $.os.android) {//android and optimize }
$container.plus_pulldownRefresh(pullRefreshOptions.down); }else{
} else { var container = pullRefreshOptions.container;
if (container) {
var $container = $(container);
if ($container.length === 1) {
$container.pullRefresh(pullRefreshOptions); $container.pullRefresh(pullRefreshOptions);
} }
} }
} }
}); });
})(mui); })(mui);
/** /**
...@@ -1832,38 +1836,35 @@ window.mui = mui; ...@@ -1832,38 +1836,35 @@ window.mui = mui;
contentrefresh : '正在刷新...' contentrefresh : '正在刷新...'
} }
$.fn.plus_pulldownRefresh = function(options) { $.plus_pulldownRefresh = function(options) {
options = $.extend(pulldownOptions, options, true); options = $.extend(pulldownOptions, options, true);
this.each(function() { $.plusReady(function() {
var self = this; var self = document.body;
$.plusReady(function() { var id = self.getAttribute('data-pullrefresh-plus');
var id = self.getAttribute('data-pullrefresh-plus'); if (!id) {//避免重复初始化5+ pullrefresh
if (!id) {//避免重复初始化5+ pullrefresh id = ++$.uuid;
id = ++$.uuid; self.setAttribute('data-pullrefresh-plus', id);
self.setAttribute('data-pullrefresh-plus', id); var sw = $.currentWebview;
var sw = $.currentWebview; sw.setPullToRefresh({
sw.setPullToRefresh({ support : true,
support : true, height : options.height + 'px',
height : options.height + 'px', range : "200px",
range : "200px", contentdown : {
contentdown : { caption : options.contentdown
caption : options.contentdown },
}, contentover : {
contentover : { caption : options.contentover
caption : options.contentover },
}, contentrefresh : {
contentrefresh : { caption : options.contentrefresh
caption : options.contentrefresh }
} }, function() {
}, function() { options.callback && options.callback(function() {
options.callback && options.callback(function() { sw.endPullToRefresh();
sw.endPullToRefresh();
});
}); });
});
} }
});
}); });
}; };
})(mui); })(mui);
...@@ -3780,7 +3781,8 @@ window.mui = mui; ...@@ -3780,7 +3781,8 @@ window.mui = mui;
//opener.show(); //opener.show();
} else { } else {
//首页不存在opener的情况下,后退实际上应该是退出应用; //首页不存在opener的情况下,后退实际上应该是退出应用;
plus.runtime.quit(); //这个交给项目具体实现,框架暂不处理;
//plus.runtime.quit();
} }
} }
}); });
......
This diff is collapsed.
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