更新至0.5.8版本

dcloudio · Sep 29, 2014 · 94baca7 · 94baca7
1 parent bd5c71f
commit 94baca7
Show file tree

Hide file tree

Showing 29 changed files with 2,284 additions and 1,464 deletions.
diff --git a/dist/css/mui.css b/dist/css/mui.css
diff --git a/dist/css/mui.min.css b/dist/css/mui.min.css
diff --git a/dist/js/mui.js b/dist/js/mui.js
diff --git a/dist/js/mui.min.js b/dist/js/mui.min.js
diff --git a/dist/js/mui.tpl.js b/dist/js/mui.tpl.js
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v0.5.7 (https://github.com/dcloudio/mui)
+ * Mui v0.5.8 (https://github.com/dcloudio/mui)
  * =====================================================
  */
 /*!
@@ -3604,13 +3604,16 @@ Handlebars.registerPartial("tableviewcell", Handlebars.template({"1":function(de
 						var element = null;
 						while (!!(element = div.firstElementChild)) {
 							this.parentNode.insertBefore(element, this);
+							if (oldPlugin) {
+								if (name === 'slider' && element.querySelector('.mui-slider-group')) {
+									$.ready(function() {
+										oldPluginApi = oldPlugin.call($(element), opts);
+									});
+								}
+							}
 						}
 						this.parentNode.removeChild(this);
-						if (oldPlugin) {
-							$.ready(function() {
-								oldPluginApi = oldPlugin.call($(element), opts);
-							});
-						}
+
 					}
 				});
 				if (opts.output === false) {

diff --git a/dist/js/mui.tpl.min.js b/dist/js/mui.tpl.min.js
diff --git a/examples/hello-mui/css/mui.min.css b/examples/hello-mui/css/mui.min.css
diff --git a/examples/hello-mui/examples/info.html b/examples/hello-mui/examples/info.html
@@ -45,7 +45,7 @@ <h4>新手指南</h4>
 		</p>
 		<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
 		<h4>版本介绍</h4>
-		<p>当前版本为0.5.6，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
+		<p>当前版本为0.5.8，可到<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>;

diff --git a/examples/hello-mui/examples/inputs.html b/examples/hello-mui/examples/inputs.html
@@ -28,19 +28,19 @@
 	<h1 class="mui-title">输入框（Input）</h1>
 </header>
 <div class="mui-content">
-		
+
 	<div class="mui-content-padded" style="margin: 5px;">
 		<h5>默认搜索框：</h5>
 		<div class="mui-input-row mui-search">
 			<input type="search" class="mui-input-clear" placeholder="">
 		</div>
 		<h5>语音输入搜索框：</h5>
 		<div class="mui-input-row mui-search">
-			<input type="search" class="mui-input-speech mui-input-clear" placeholder="带语音识别的搜索框">
+			<input type="search" class="mui-input-speech mui-input-clear" placeholder="带语音输入的搜索框">
 		</div>
 		<form class="mui-input-group">
 			<div class="mui-input-row">
-                <label>Input</label>
+				<label>Input</label>
 				<input type="text" placeholder="普通输入框">
 			</div>
 			<div class="mui-input-row">
@@ -52,18 +52,20 @@ <h5>语音输入搜索框：</h5>
 				<label>Input</label>
 				<input type="text" class="mui-input-speech mui-input-clear" placeholder="语音输入">
 			</div>
-
+			<div class="mui-button-row">
+				<button class="mui-btn mui-btn-primary" onclick="return false;">确认</button>&nbsp;&nbsp;
+				<button class="mui-btn mui-btn-danger" onclick="return false;">取消</button>
+			</div>
 		</form>
-
 		<div class="mui-input-row" style="margin: 10px 5px;">
-				<textarea rows="5" placeholder="多行文本框"></textarea>
+			<textarea rows="5" placeholder="多行文本框"></textarea>
 		</div>
 	</div>
 </div>
 
 
 <style type="text/css">
-	h5{
+	h5 {
 		margin: 5px 7px;
 	}
 </style>

diff --git a/examples/hello-mui/examples/oa-grid.html b/examples/hello-mui/examples/oa-grid.html
@@ -69,17 +69,17 @@ <h1 class="mui-title">自适应9宫图</h1>
 		</li>
 		<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-3">
 			<a href="#">
-				<span class="mui-icon mui-icon-sms"><span class="mui-badge">5</span></span>
+				<span class="mui-icon mui-icon-email"><span class="mui-badge">5</span></span>
 				<div class="mui-media-body">
 					Email
 				</div>
 			</a>
 		</li>
 		<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-3">
 			<a href="#">
-				<span class="mui-icon mui-icon-calendar"></span>
+				<span class="mui-icon mui-icon-contact"></span>
 				<div class="mui-media-body">
-					Calendar
+					Contact
 				</div>
 			</a>
 		</li>
@@ -93,7 +93,7 @@ <h1 class="mui-title">自适应9宫图</h1>
 		</li>
 		<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-3">
 			<a href="#">
-				<span class="mui-icon mui-icon-category"></span>
+				<span class="mui-icon mui-icon-list"></span>
 				<div class="mui-media-body">
 					Sort
 				</div>
@@ -125,7 +125,7 @@ <h1 class="mui-title">自适应9宫图</h1>
 		</li>
 		<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-col-sm-3">
 			<a href="#">
-				<span class="mui-icon mui-icon-cog"></span>
+				<span class="mui-icon mui-icon-gear"></span>
 				<div class="mui-media-body">
 					Setting
 				</div>

diff --git a/examples/hello-mui/examples/offcanvas-left-plus-main.html b/examples/hello-mui/examples/offcanvas-left-plus-main.html
@@ -135,6 +135,9 @@ <h1 class="mui-title">off canvas（侧滑导航）</h1>
 				width: '70%',
 				zindex: 9998
 			},
+			show:{
+				aniShow:'none'
+			},
 			waiting:{
 				autoShow:false
 			}

diff --git a/examples/hello-mui/examples/offcanvas-right-plus-main.html b/examples/hello-mui/examples/offcanvas-right-plus-main.html
@@ -128,10 +128,13 @@ <h1 class="mui-title">off canvas（侧滑导航）</h1>
 			id: 'offcanvas-plus-menu',
 			url: 'offcanvas-plus-menu.html',
 			styles: {
-				left: '30%',
+				left: left,
 				width:'70%',
 				zindex: 9998
 			},
+			show:{
+				aniShow:'none'
+			},
 			waiting:{
 				autoShow:false
 			}

diff --git a/examples/hello-mui/examples/popovers-with-cross-webviews-popover.html b/examples/hello-mui/examples/popovers-with-cross-webviews-popover.html
@@ -81,18 +81,20 @@
 </div>
 <script>
 	mui.init({
-		back : function() {
-			var webview = plus.webview.currentWebview();
-			var parent = webview.parent();
-			if (parent) {
-				parent.hide('auto');
-				return false;
+			back: function() {
+				var webview = plus.webview.currentWebview();
+				var parent = webview.parent();
+				if (parent) {
+					parent.hide('auto');
+					return false;
+				}
 			}
-		}
-	})
-	document.addEventListener('plus:togglePopover', function() {
-		$('#popover').popover('toggle');
-	}); 
+		})
+		(function($) {
+			document.addEventListener('plus:togglePopover', function() {
+				$('#popover').popover('toggle');
+			});
+		})(mui);
 </script>
 </body>
 </html>
diff --git a/examples/hello-mui/examples/popovers-with-cross-webviews.html b/examples/hello-mui/examples/popovers-with-cross-webviews.html
@@ -31,16 +31,15 @@ <h1 class="mui-title">Popovers cross webviews</h1>
 <script>
 	mui.plusReady(function() {
 		var popover = plus.webview.create('popovers-with-cross-webviews-popover.html', null, {
-			top : '45px',
-			bottom : 0
+			top: '45px',
+			bottom: 0
 		});
 		plus.webview.currentWebview().append(popover);
 		document.getElementById('M_Popover_Trigger').addEventListener('tap', function() {
 			//mui hack plus event
-			$.fire(popover, 'plus:togglePopover');
+			mui.fire(popover, 'plus:togglePopover');
 		});
 	});
-
 </script>
 </body>
 </html>
diff --git a/examples/hello-mui/examples/popovers-with-js-call.html b/examples/hello-mui/examples/popovers-with-js-call.html
@@ -24,46 +24,58 @@
 	<body>
 
 <style>
-    .mui-popover{
-        top: 125px;
-    }
+	.mui-popover {
+		top: 125px;
+	}
 </style>
 <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">Popovers</h1>
+	<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+	<h1 class="mui-title">Popovers</h1>
 </header>
 <div class="mui-content">
-    <div class="mui-content-padded">
-        <a id="openPopover" class="mui-btn mui-btn-primary mui-btn-block">Open Popover</a>
-    </div>
-    <div id="popover" class="mui-popover">
-        <div class="mui-content-padded">
-            <a id="closePopover" class="mui-btn mui-btn-primary mui-btn-block">Close Popover</a>            
-        </div>
-        <ul class="mui-table-view">
-            <li class="mui-table-view-cell"><a href="#">Item1</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item2</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item3</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item4</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item5</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item6</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item7</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item8</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item9</a></li>
-            <li class="mui-table-view-cell"><a href="#">Item10</a></li>
-        </ul>
-    </div>
+	<div class="mui-content-padded">
+		<a id="openPopover" class="mui-btn mui-btn-primary mui-btn-block">Open Popover</a>
+	</div>
+	<div id="popover" class="mui-popover">
+		<div class="mui-content-padded">
+			<a id="closePopover" class="mui-btn mui-btn-primary mui-btn-block">Close Popover</a> 
+		</div>
+		<ul class="mui-table-view">
+			<li class="mui-table-view-cell"><a href="#">Item1</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item2</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item3</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item4</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item5</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item6</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item7</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item8</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item9</a>
+			</li>
+			<li class="mui-table-view-cell"><a href="#">Item10</a>
+			</li>
+		</ul>
+	</div>
 </div>
 <script>
-    document.getElementById('openPopover').addEventListener('tap', function() {
-        $('#popover').popover('show', {left: 100, right: 200});
-        //$('#popover').popover('toggle');//也可以直接调用toggle。该方法自动识别是显示还是隐藏
-    });
-    document.getElementById('closePopover').addEventListener('tap', function() {
-        $('#popover').popover('hide');
-        //$('#popover').popover('toggle');//也可以直接调用toggle。该方法自动识别是显示还是隐藏
-    });
-
+	document.getElementById('openPopover').addEventListener('tap', function() {
+		mui('#popover').popover('show', {
+			left: 100,
+			right: 200
+		});
+		//$('#popover').popover('toggle');//也可以直接调用toggle。该方法自动识别是显示还是隐藏
+	});
+	document.getElementById('closePopover').addEventListener('tap', function() {
+		mui('#popover').popover('hide');
+		//$('#popover').popover('toggle');//也可以直接调用toggle。该方法自动识别是显示还是隐藏
+	});
 </script>
 
 </body>