编译至mui v1.7.0

dcloudio · May 19, 2015 · 2b1387f · 2b1387f
1 parent bfb1f58
commit 2b1387f
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 22 deletions.
diff --git a/dist/css/mui.css b/dist/css/mui.css
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v1.6.0 (https://github.com/dcloudio/mui)
+ * Mui v1.7.0 (https://github.com/dcloudio/mui)
  * =====================================================
  */
 

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
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v1.6.0 (https://github.com/dcloudio/mui)
+ * Mui v1.7.0 (https://github.com/dcloudio/mui)
  * =====================================================
  */
 /**
@@ -879,7 +879,7 @@ var mui = (function(document, undefined) {
 				var tagName = target.tagName;
 				if (event === 'tap' && (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT')) {
 					e.preventDefault();
-					e.detail && e.detail.gesture && e.detail.gesture.preventDefault()
+					e.detail && e.detail.gesture && e.detail.gesture.preventDefault();
 				}
 				$.each(handler.handlers, function(index, handler) {
 					$.each(handler, function(index, callback) {
@@ -918,6 +918,16 @@ var mui = (function(document, undefined) {
 			if (isAddEventListener) {
 				delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
 				element.addEventListener(event, delegateFns[mid(element)]);
+				if (event === 'tap') { //TODO 需要找个更好的解决方案
+					element.addEventListener('click', function(e) {
+						if (e.target) {
+							var tagName = e.target.tagName;
+							if (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT') {
+								e.preventDefault();
+							}
+						}
+					});
+				}
 			}
 		});
 	};
@@ -5914,7 +5924,7 @@ var mui = (function(document, undefined) {
 		var isExpand = false;
 		var classList = cell.classList;
 		var ul = cell.parentNode;
-		if (ul.classList.contains(CLASS_RADIO_VIEW)) {
+		if (ul && ul.classList.contains(CLASS_RADIO_VIEW)) {
 			if (classList.contains(CLASS_SELECTED)) {
 				return;
 			}

diff --git a/dist/js/mui.min.js b/dist/js/mui.min.js
diff --git a/examples/hello-mui/css/mui.css b/examples/hello-mui/css/mui.css
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v1.6.0 (https://github.com/dcloudio/mui)
+ * Mui v1.7.0 (https://github.com/dcloudio/mui)
  * =====================================================
  */
 

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
@@ -51,7 +51,7 @@ <h4>新手指南</h4>
 				</p>
 				<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
 				<h4>版本介绍</h4>
-				<p>当前版本为1.6.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
+				<p>当前版本为1.7.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>;

diff --git a/examples/hello-mui/js/mui.js b/examples/hello-mui/js/mui.js
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v1.6.0 (https://github.com/dcloudio/mui)
+ * Mui v1.7.0 (https://github.com/dcloudio/mui)
  * =====================================================
  */
 /**
@@ -879,7 +879,7 @@ var mui = (function(document, undefined) {
 				var tagName = target.tagName;
 				if (event === 'tap' && (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT')) {
 					e.preventDefault();
-					e.detail && e.detail.gesture && e.detail.gesture.preventDefault()
+					e.detail && e.detail.gesture && e.detail.gesture.preventDefault();
 				}
 				$.each(handler.handlers, function(index, handler) {
 					$.each(handler, function(index, callback) {
@@ -918,6 +918,16 @@ var mui = (function(document, undefined) {
 			if (isAddEventListener) {
 				delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
 				element.addEventListener(event, delegateFns[mid(element)]);
+				if (event === 'tap') { //TODO 需要找个更好的解决方案
+					element.addEventListener('click', function(e) {
+						if (e.target) {
+							var tagName = e.target.tagName;
+							if (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT') {
+								e.preventDefault();
+							}
+						}
+					});
+				}
 			}
 		});
 	};
@@ -5914,7 +5924,7 @@ var mui = (function(document, undefined) {
 		var isExpand = false;
 		var classList = cell.classList;
 		var ul = cell.parentNode;
-		if (ul.classList.contains(CLASS_RADIO_VIEW)) {
+		if (ul && ul.classList.contains(CLASS_RADIO_VIEW)) {
 			if (classList.contains(CLASS_SELECTED)) {
 				return;
 			}

diff --git a/examples/hello-mui/js/mui.locker.js b/examples/hello-mui/js/mui.locker.js
@@ -266,7 +266,7 @@
 	$.ready(function() {
 		setTimeout(function() {
 			$('.' + lockerClassName).locker();
-		}, 200);
+		}, 350);
 	});
 
 }(mui, document));
diff --git a/examples/hello-mui/js/mui.min.js b/examples/hello-mui/js/mui.min.js
diff --git a/js/mui.event.js b/js/mui.event.js
@@ -82,7 +82,7 @@
 				var tagName = target.tagName;
 				if (event === 'tap' && (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT')) {
 					e.preventDefault();
-					e.detail && e.detail.gesture && e.detail.gesture.preventDefault()
+					e.detail && e.detail.gesture && e.detail.gesture.preventDefault();
 				}
 				$.each(handler.handlers, function(index, handler) {
 					$.each(handler, function(index, callback) {
@@ -121,6 +121,16 @@
 			if (isAddEventListener) {
 				delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
 				element.addEventListener(event, delegateFns[mid(element)]);
+				if (event === 'tap') { //TODO 需要找个更好的解决方案
+					element.addEventListener('click', function(e) {
+						if (e.target) {
+							var tagName = e.target.tagName;
+							if (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT') {
+								e.preventDefault();
+							}
+						}
+					});
+				}
 			}
 		});
 	};

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mui",
   "description": "Build mobile apps with simple HTML, CSS, and JS components.",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "keywords": [
     "css",
     "fonts",