编译至mui v1.3.0

0cd7e464 · hbcui1984 · 1d948e1e · 0cd7e464 · 0cd7e464 · 0cd7e464
Commit 0cd7e464 authored Mar 16, 2015 by hbcui1984
9 changed files
--- a/dist/css/mui.css
+++ b/dist/css/mui.css
 /*!
 * =====================================================
- * Mui v1.2.0 (https://github.com/dcloudio/mui)
+ * Mui v1.3.0 (https://github.com/dcloudio/mui)
 * =====================================================
 */

@@ -609,7 +609,19 @@ p {
  transform: translate(0px, 0px) translateZ(0px);
 }

-.mui-plus-pullrefresh .mui-scroll-wrapper {
+.mui-plus-pullrefresh .mui-fullscreen .mui-scroll-wrapper .mui-scroll-wrapper, .mui-plus-pullrefresh .mui-fullscreen .mui-slider-group .mui-scroll-wrapper {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  overflow: hidden;
+}
+.mui-plus-pullrefresh .mui-fullscreen .mui-scroll-wrapper .mui-scroll, .mui-plus-pullrefresh .mui-fullscreen .mui-slider-group .mui-scroll {
+  position: absolute;
+  width: 100%;
+}
+.mui-plus-pullrefresh .mui-scroll-wrapper, .mui-plus-pullrefresh .mui-slider-group {
  position: static;
  top: auto;
  bottom: auto;
@@ -1194,13 +1206,6 @@ input[type="submit"]:active, input[type="submit"].mui-active,
  position: absolute;
 }

-.mui-focusin > .mui-bar-tab,
-.mui-focusin > .mui-bar-footer,
-.mui-focusin > .mui-bar-footer-secondary,
-.mui-focusin > .mui-bar-footer-secondary-tab {
-  position: static;
-}
-
 .mui-bar .mui-btn {
  position: relative;
  top: 7px;
@@ -2316,6 +2321,11 @@ select:focus {
  opacity: .8;
 }

+.mui-bar .mui-input-row.mui-search .mui-icon-speech {
+  top: -2px;
+  right: 10px;
+}
+
 .mui-search {
  position: relative;
 }
@@ -2950,6 +2960,9 @@ select:focus {
  -webkit-transition-property: background-color, border;
          transition-property: background-color, border;
 }
+.mui-switch.mui-disabled {
+  opacity: .3;
+}
 .mui-switch .mui-switch-handle {
  position: absolute;
  top: -1px;
@@ -3105,7 +3118,7 @@ select:focus {
  height: 40px;
 }
 .mui-pull-bottom-pocket .mui-pull-loading {
-  display: none;
+  visibility: hidden;
 }
 .mui-pull-bottom-pocket .mui-pull-loading.mui-in {
  display: inline-block;
@@ -3562,3 +3575,8 @@ select:focus {
 .mui-bar-tab ~ .mui-content .mui-slider.mui-fullscreen .mui-segmented-control ~ .mui-slider-group {
  bottom: 50px;
 }
+
+.mui-android.mui-android-4-0 input:focus,
+.mui-android.mui-android-4-0 textarea:focus {
+  -webkit-user-modify: inherit;
+}
--- a/dist/css/mui.min.css
+++ b/dist/css/mui.min.css
--- a/dist/js/mui.js
+++ b/dist/js/mui.js
--- a/dist/js/mui.min.js
+++ b/dist/js/mui.min.js
--- a/examples/hello-mui/css/mui.min.css
+++ b/examples/hello-mui/css/mui.min.css
--- a/examples/hello-mui/examples/ajax.html
+++ b/examples/hello-mui/examples/ajax.html
@@ -10,16 +10,17 @@

 		<link rel="stylesheet" href="../css/mui.min.css">
 		<style>
-			header.mui-bar{
+			header.mui-bar {
 				display: none;
 			}
-			.mui-bar-nav~.mui-content{
+			.mui-bar-nav~.mui-content {
 				padding: 0;
 			}
-			.mui-content-padded{
+			.mui-content-padded {
 				padding: 10px;
 			}
-			body,body .mui-content{
+			body,
+			body .mui-content {
 				background-color: #fff !important;
 			}
 			code {
@@ -36,9 +37,9 @@
 	<body>
 		<header class="mui-bar mui-bar-nav">
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-			<h1 class="mui-title">AJAX</h1>
+			<h1 class="mui-title">AJAX</h1>
 		</header>
-		<div class="mui-content" >
+		<div class="mui-content">
 			<div class="mui-content-padded" style="padding-bottom: 50px;">
 				<p style="text-indent: 22px;">
 					mui基于html5plus的<a href="http://www.dcloud.io/docs/api/zh_cn/xhr.shtml">XMLHttpRequest</a>，封装了常用的ajax函数，支持Get、Post请求方式， 支持返回json、xml、html、text、script数据类型；本示例使用<a href="http://www.oschina.net/question/82993_78609">RunJS</a>的Echo Ajax功能演示网络请求。
@@ -65,7 +66,7 @@
 					</div>
 				</div>
 				<h4 class="mui-content-padded">获得响应：</h4>
-				<code id="response" ></code>
+				<code id="response"></code>
 			</div>
 		</div>
 		<script src="../js/mui.min.js"></script>
@@ -86,6 +87,15 @@
 					}
 					respnoseEl.innerHTML = response;
 				};
+				//设置全局beforeSend
+				$.ajaxSettings.beforeSend = function(xhr, setting) {
+					//beforeSend演示,也可在$.ajax({beforeSend:function(){}})中设置单个Ajax的beforeSend
+					console.log('beforeSend:::' + JSON.stringify(setting));
+				};
+				//设置全局complete
+				$.ajaxSettings.complete = function(xhr, status) {
+					console.log('complete:::' + status);
+				}
 				var ajax = function() {
 					//利用RunJS的Echo Ajax功能测试
 					var url = 'http://runjs.cn/action/echo/';
@@ -98,7 +108,7 @@
 						name: "mui",
 						version: "pre-release",
 						author: "chb",
-						description:"最接近原生APP体验的高性能前端框架"
+						description: "最接近原生APP体验的高性能前端框架"
 					};
 					url = url + (dataType === 'html' ? 'text' : dataType);
 					respnoseEl.innerHTML = '正在请求中...';
@@ -130,4 +140,5 @@
 			})(mui);
 		</script>
 	</body>
+
 </html>
\ No newline at end of file
--- a/examples/hello-mui/examples/info.html
+++ b/examples/hello-mui/examples/info.html
@@ -51,7 +51,7 @@
 				</p>
 				<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
 				<h4>版本介绍</h4>
-				<p>当前版本为1.2.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
+				<p>当前版本为1.3.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
 				<h4>License</h4>
 				<p>
 					mui遵循MIT License，源码已提交至Github，<a href="https://github.com/dcloudio/mui">点击查看</a>;

--- a/examples/hello-mui/index.html
+++ b/examples/hello-mui/index.html
@@ -107,7 +107,6 @@
 			}
 				//点击左上角侧滑图标，打开侧滑菜单；
 			document.querySelector('.mui-icon-bars').addEventListener('tap', function(e) {
-				e.stopPropagation();
 				if (showMenu) {
 					closeMenu();
 				} else {

--- a/examples/hello-mui/js/mui.min.js
+++ b/examples/hello-mui/js/mui.min.js