Skip to content

M
mui
Commit cdf6402f authored by hbcui1984's avatar hbcui1984
Browse files
Options

升级编译后版本为0.5.6

parent 8be70283
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 360 additions and 180 deletions
dist/css/mui.css
View file @ cdf6402f
/*!
* =====================================================
* Mui v0.5.5 (https://github.com/dcloudio/mui)
* Mui v0.5.6 (https://github.com/dcloudio/mui)
* =====================================================
*/
......@@ -1492,13 +1492,13 @@ input[type="submit"]:active, input[type="submit"].mui-active,
}
.mui-table-view-cell.mui-collapse > .mui-navigate-right:after, .mui-table-view-cell.mui-collapse > .mui-push-right:after {
content: '\e662';
content: '\e581';
}
.mui-table-view-cell.mui-collapse.mui-active .mui-table-view {
display: block;
}
.mui-table-view-cell.mui-collapse.mui-active > .mui-navigate-right:after, .mui-table-view-cell.mui-collapse.mui-active > .mui-push-right:after {
content: '\e661';
content: '\e580';
}
.mui-table-view-cell.mui-collapse .mui-table-view {
display: none;
......@@ -1570,7 +1570,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
}
.mui-grid-view.mui-grid-9 .mui-media .mui-icon {
position: relative;
font-size: 3em;
font-size: 2.4em;
}
.mui-grid-view.mui-grid-9 .mui-media .mui-icon .mui-badge {
position: absolute;
......@@ -1826,28 +1826,24 @@ select {
color: #007aff;
}
.mui-radio input[type="radio"]:before {
content: "\e654";
.mui-radio input[type="radio"]:before, .mui-checkbox.mui-checkbox-cycle input[type="checkbox"]:before {
content: "\e411";
}
.mui-radio input[type="radio"]:checked:before {
content: "\e655";
content: "\e441";
}
.mui-checkbox input[type="checkbox"]:before {
content: "\e656";
content: "\e413";
}
.mui-checkbox input[type="checkbox"]:checked:before {
content: "\e657";
}
.mui-checkbox-cycle input[type="checkbox"]:before {
content: "\e910";
content: "\e443";
}
.mui-checkbox-cycle input[type="checkbox"]:checked:before {
content: "\e911";
content: "\e442";
}
.mui-select {
......@@ -1982,7 +1978,7 @@ select {
font-family: Muiicons;
font-size: 20px;
font-weight: normal;
content: '\e607';
content: '\e466';
}
.mui-search.mui-active:before {
left: 5px;
......@@ -2626,13 +2622,13 @@ select {
.mui-navigate-left:after,
.mui-push-left:after {
left: 15px;
content: '\e664';
content: '\e582';
}
.mui-navigate-right:after,
.mui-push-right:after {
right: 15px;
content: '\e663';
content: '\e583';
}
.mui-pull-top-pocket, .mui-pull-bottom-pocket {
......@@ -2723,7 +2719,7 @@ select {
font-style: normal;
font-weight: normal;
src: url("../fonts/muiicons.ttf") format("truetype");
src: url("../fonts/mui.ttf") format("truetype");
}
.mui-icon {
display: inline-block;
......@@ -2741,170 +2737,382 @@ select {
padding-left: .2em;
}
.mui-icon-spinner:before {
content: "\e600";
.mui-icon-contact:before {
content: "\e100";
}
.mui-icon-weibo:before {
content: "\e601";
.mui-icon-person:before {
content: "\e101";
}
.mui-icon-pin:before {
content: "\e602";
.mui-icon-personadd:before {
content: "\e102";
}
.mui-icon-contact-filled:before {
content: "\e130";
}
.mui-icon-person-filled:before {
content: "\e131";
}
.mui-icon-personadd-filled:before {
content: "\e132";
}
.mui-icon-phone:before {
content: "\e603";
content: "\e200";
}
.mui-icon-map:before {
content: "\e604";
.mui-icon-email:before {
content: "\e201";
}
.mui-icon-chatbubble:before {
content: "\e202";
}
.mui-icon-sms:before {
content: "\e605";
.mui-icon-chatboxes:before {
content: "\e203";
}
.mui-icon-phone-filled:before {
content: "\e230";
}
.mui-icon-email-filled:before {
content: "\e231";
}
.mui-icon-chatbubble-filled:before {
content: "\e232";
}
.mui-icon-chatboxes-filled:before {
content: "\e233";
}
.mui-icon-weibo:before {
content: "\e260";
}
.mui-icon-weixin:before {
content: "\e261";
}
.mui-icon-pengyouquan:before {
content: "\e262";
}
.mui-icon-chat:before {
content: "\e606";
content: "\e263";
}
.mui-icon-search:before {
content: "\e607";
.mui-icon-videocam:before {
content: "\e300";
}
.mui-icon-close:before {
content: "\e608";
.mui-icon-camera:before {
content: "\e301";
}
.mui-icon-mic:before {
content: "\e302";
}
.mui-icon-reply:before {
content: "\e609";
.mui-icon-location:before {
content: "\e303";
}
.mui-icon-mic-filled:before, .mui-icon-speech:before {
content: "\e332";
}
.mui-icon-location-filled:before {
content: "\e333";
}
.mui-icon-micoff:before {
content: "\e360";
}
.mui-icon-volumehigh:before {
content: "\e361";
}
.mui-icon-volumelow:before {
content: "\e362";
}
.mui-icon-image:before {
content: "\e363";
}
.mui-icon-map:before {
content: "\e364";
}
.mui-icon-compose:before {
content: "\e400";
}
.mui-icon-trash:before {
content: "\e610";
content: "\e401";
}
.mui-icon-edit:before {
content: "\e611";
.mui-icon-upload:before {
content: "\e402";
}
.mui-icon-home:before {
content: "\e612";
.mui-icon-download:before {
content: "\e403";
}
.mui-icon-close:before {
content: "\e404";
}
.mui-icon-redo:before {
content: "\e405";
}
.mui-icon-undo:before {
content: "\e406";
}
.mui-icon-refresh:before {
content: "\e407";
}
.mui-icon-star:before {
content: "\e408";
}
.mui-icon-plus:before {
content: "\e409";
}
.mui-icon-category:before {
content: "\e613";
.mui-icon-minus:before {
content: "\e410";
}
.mui-icon-calendar:before {
content: "\e614";
.mui-icon-circle:before {
content: "\e411";
}
.mui-icon-cog:before {
content: "\e615";
.mui-icon-checkmark:before {
content: "\e412";
}
.mui-icon-speech:before {
content: "\e616";
.mui-icon-checkbox:before {
content: "\e413";
}
.mui-icon-close-filled:before, .mui-icon-clear:before {
content: "\e434";
}
.mui-icon-refresh-filled:before {
content: "\e437";
}
.mui-icon-star-filled:before {
content: "\e438";
}
.mui-icon-plus-filled:before {
content: "\e439";
}
.mui-icon-minus-filled:before {
content: "\e440";
}
.mui-icon-circle-filled:before {
content: "\e441";
}
.mui-icon-checkmark-filled:before {
content: "\e442";
}
.mui-icon-checkbox-filled:before {
content: "\e443";
}
.mui-icon-closeempty:before {
content: "\e460";
}
.mui-icon-refreshempty:before {
content: "\e461";
}
.mui-icon-reload:before {
content: "\e462";
}
.mui-icon-starhalf:before {
content: "\e463";
}
.mui-icon-spinner:before {
content: "\e464";
}
.mui-icon-spinner-cycle:before {
content: "\e465";
}
.mui-icon-search:before {
content: "\e466";
}
.mui-icon-searchstrong:before {
content: "\e467";
}
.mui-icon-plusempty:before {
content: "\e468";
}
.mui-icon-forward:before {
content: "\e470";
}
.mui-icon-back:before, .mui-icon-left-nav:before {
content: "\e471";
}
.mui-icon-checkmarkempty:before {
content: "\e472";
}
.mui-icon-share:before {
content: "\e473";
}
.mui-icon-home:before {
content: "\e500";
}
.mui-icon-navigate:before {
content: "\e501";
}
.mui-icon-gear:before {
content: "\e502";
}
.mui-icon-paperplane:before {
content: "\e503";
}
.mui-icon-info:before {
content: "\e617";
content: "\e504";
}
.mui-icon-arrow-left:before {
content: "\e648";
.mui-icon-help:before {
content: "\e505";
}
.mui-icon-arrow-right:before {
content: "\e649";
.mui-icon-locked:before {
content: "\e506";
}
.mui-icon-up-nav:before {
content: "\e650";
.mui-icon-more:before {
content: "\e507";
}
.mui-icon-down-nav:before {
content: "\e651";
.mui-icon-flag:before {
content: "\e508";
}
.mui-icon-right-nav:before {
content: "\e652";
.mui-icon-home-filled:before {
content: "\e530";
}
.mui-icon-left-nav:before {
content: "\e653";
.mui-icon-gear-filled:before {
content: "\e532";
}
.mui-icon-radio:before {
content: "\e654";
.mui-icon-info-filled:before {
content: "\e534";
}
.mui-icon-radio-checked:before {
content: "\e655";
.mui-icon-help-filled:before {
content: "\e535";
}
.mui-icon-checkbox:before {
content: "\e656";
.mui-icon-more-filled:before {
content: "\e537";
}
.mui-icon-settings:before {
content: "\e560";
}
.mui-icon-settingsstrong:before {
content: "\e561";
}
.mui-icon-checkbox-checked:before {
content: "\e657";
.mui-icon-list:before {
content: "\e562";
}
.mui-icon-bars:before {
content: "\e658";
content: "\e563";
}
.mui-icon-plus:before {
content: "\e659";
.mui-icon-more-vertical:before {
content: "\e564";
}
.mui-icon-clear:before {
content: "\e660";
.mui-icon-loop:before {
content: "\e565";
}
.mui-icon-up:before {
content: "\e661";
.mui-icon-loopstrong:before {
content: "\e566";
}
.mui-icon-down:before {
content: "\e662";
.mui-icon-paperclip:before {
content: "\e567";
}
.mui-icon-right:before {
content: "\e663";
.mui-icon-arrowup:before {
content: "\e580";
}
.mui-icon-left:before {
content: "\e664";
.mui-icon-arrowdown:before {
content: "\e581";
}
.mui-icon-pulldown:before {
content: "\e665";
.mui-icon-arrowleft:before {
content: "\e582";
}
.mui-icon-phone-solid:before {
content: "\e702";
.mui-icon-arrowright:before {
content: "\e583";
}
.mui-icon-phone-filled:before {
content: "\e804";
.mui-icon-arrowthinup:before {
content: "\e584";
}
.mui-icon-close-cycle:before {
content: "\e908";
.mui-icon-arrowthindown:before {
content: "\e585";
}
.mui-icon-spinner-cycle:before {
content: "\e909";
.mui-icon-arrowthinleft:before {
content: "\e586";
}
.mui-icon-checkbox-cycle:before {
content: "\e910";
.mui-icon-arrowthinright:before {
content: "\e587";
}
.mui-icon-checkbox-checked-cycle:before {
content: "\e911";
.mui-icon-pulldown:before {
content: "\e588";
}
dist/css/mui.min.css
View file @ cdf6402f
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/mui.js
View file @ cdf6402f
/*!
* =====================================================
* Mui v0.5.5 (https://github.com/dcloudio/mui)
* Mui v0.5.6 (https://github.com/dcloudio/mui)
* =====================================================
*/
/**
......@@ -957,6 +957,7 @@ window.mui = mui;
//默认页面动画
var defaultShow = {
autoShow:true,
duration:$.os.ios?200:100,
aniShow: 'slide-in-right'
}
......@@ -976,7 +977,10 @@ window.mui = mui;
* @returns {Object}
*/
$.waitingOptions = function(options) {
return $.extend({}, options);
return $.extend({
autoShow:true,
title:''
}, options);
};
/**
* 窗口显示配置
......@@ -1090,91 +1094,62 @@ window.mui = mui;
}
options = options || {};
var params = options.params || {};
var webview,nShow;
var webview,nShow,nWaiting;
if ($.webviews[id]) { //已缓存
var webviewCache = $.webviews[id];
if (webviewCache.preload) { //预加载
webview = webviewCache.webview;
//需要处理用户手动关闭窗口的情况，此时webview应该是空的；
if(!webview||!webview.getURL()){
//再次新建一个webview；
options = $.extend(options, {
id: id,
url: url,
showAfterLoad: options.showAfterLoad === false ? false : true,
preload:true
});
webview = $.createWindow(options);
}
//每次show都需要传递动画参数；
//预加载的动画参数优先级：openWindow配置>preloadPages配置>mui默认配置；
nShow = webviewCache.show;
nShow = options.show?$.extend(nShow, options.show):nShow;
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview,'pagebeforeshow',false);
});
//TODO 预加载模式，暂不隐藏父窗口，bug太多
//TODO 最好不要让MUI处理这种东西，统一处理窗口隐藏
// setTimeout(function() {
// console.log('webview.isVisible()1::::' + webview.isVisible());
// if (webview.isVisible() === 'true') {//只有当前窗口显示的状态，才隐藏父窗口(解决在show动画过程中，执行后退导致的父窗口被关闭没有显示问题)
// console.log('webview.isVisible()2::::' + webview.isVisible());
// var wobj = plus.webview.currentWebview();
// var parent = wobj.parent();
// if (parent) {
// parent.hide();
// } else {
// wobj.hide();
// }
// }//哎。多增加点时间。否则会发现提前hide主窗口后，动画还没结束，导致看到了主屏幕
// }, webviewCache.show.duration + 1000);
webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
return this;
} else { //非预加载
//将当前传入的options覆盖之前缓存的
options = $.extend(webviewCache, $.extend(options, {
webview = webviewCache.webview;
//需要处理用户手动关闭窗口的情况，此时webview应该是空的；
if(!webview||!webview.getURL()){
//再次新建一个webview；
options = $.extend(options, {
id: id,
url: url,
showAfterLoad: options.showAfterLoad === false ? false : true
}));
preload:true
});
webview = $.createWindow(options);
}
//每次show都需要传递动画参数；
//预加载的动画参数优先级：openWindow配置>preloadPages配置>mui默认配置；
nShow = webviewCache.show;
nShow = options.show?$.extend(nShow, options.show):nShow;
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview,'pagebeforeshow',false);
});
webviewCache.afterShowMethodName && webview.evalJS(webviewCache.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
return webview;
} else { //新窗口
//显示waiting
var waitingConfig = $.waitingOptions(options.waiting);
if(waitingConfig.autoShow){
nWaiting = plus.nativeUI.showWaiting(waitingConfig.title, waitingConfig.options);
}
//创建页面
options = $.extend(options, {
id: id,
url: url,
showAfterLoad: options.showAfterLoad === false ? false : true
url: url
});
webview = $.createWindow(options);
}
if (options.showAfterLoad) {
var waitingConfig = $.waitingOptions(options.waiting);
var nWaiting = plus.nativeUI.showWaiting(waitingConfig.title || '', waitingConfig.options);
//显示
nShow = $.showOptions(options.show);
webview.addEventListener("loaded", function() {
nWaiting.close();
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview,'pagebeforeshow',false);
});
webview.showed = true;
options.afterShowMethodName && webview.evalJS(options.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
//TODO 最好不要让MUI处理这种东西，统一处理窗口隐藏
// setTimeout(function() {
// var wobj = plus.webview.currentWebview();
// var parent = wobj.parent();
// if (parent) {
// parent.hide();
// } else {
// wobj.hide();
// }
// }, nShow.duration);
}, false);
if(nShow.autoShow){
webview.addEventListener("loaded", function() {
//关闭等待框
if(nWaiting){
nWaiting.close();
}
//显示页面
webview.show(nShow.aniShow, nShow.duration, function() {
triggerPreload(webview);
trigger(webview,'pagebeforeshow',false);
});
webview.showed = true;
options.afterShowMethodName && webview.evalJS(options.afterShowMethodName + '(\'' + JSON.stringify(params) + '\')');
}, false);
}
}
return webview;
};
......@@ -1236,9 +1211,6 @@ window.mui = mui;
delete $.webviews[first];
}
} else {
//暂不支持存储配置，因为配置也占据预加载限额，需要细分；
//非预加载的webview存储窗口配置
// $.webviews[id] = options;
if (isCreate !== false) { //直接创建非预加载窗口
webview = plus.webview.create(options.url, id, $.windowOptions(options.styles));
if (options.subpages) {
......
dist/js/mui.min.js
View file @ cdf6402f
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