Merge pull request #131 from zhangxinxu/develop

fix captureLink=false data-ajax fail bug

Author: zhangxinxu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobilebone",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Bone main for mobile web APP with a sigle page mode.",
   "main": "src/mobilebone.js",
   "directories": {

src/mobilebone.js

@@ -43,7 +43,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '2.5.2';
+	Mobilebone.VERSION = '2.5.3';
 
 	/**
 	 * Whether catch attribute of href from element with tag 'a'
@@ -944,30 +944,30 @@
 		var eventName = "click", $ = root.$ || root.jQuery || root.Zepto;
 		if ($ && $.fn && $.fn.tap && ('ontouchstart' in window == true)) eventName = "tap"; 
 
-		if (this.captureLink == true) {
-			if ($ && $.fn && $.fn.on) {
-				// for some unknown 'tap' plugin
-				$(document).on(eventName, this.handleTapEvent);
-			} else {
-				document.addEventListener(eventName, this.handleTapEvent);	
-			}
-			if (eventName == "tap") {
-				// zepto tap event.preventDefault can't prevent default click-events
-				document.addEventListener("click", function(event) {
-					var target = event.target;
-					if (!target) return;
-					if (target.tagName.toLowerCase() != "a" && !(target = target.getParentElementByTag("a"))) {
-						return;
-					}
-					var ajax = target.getAttribute("data-ajax"), href = target.href;
-					// if not ajax request
-					if (target.getAttribute("data-rel") == "external" 
-						|| ajax == "false"
-						|| (href.replace("://", "").split("/")[0] !== location.href.replace("://", "").split("/")[0] && ajax != "true")
-					) return;
-					event.preventDefault();
-				});
-			}
+		if ($ && $.fn && $.fn.on) {
+			// for some unknown 'tap' plugin
+			$(document).on(eventName, this.handleTapEvent);
+		} else {
+			document.addEventListener(eventName, this.handleTapEvent);	
+		}
+		
+		if (eventName == "tap") {
+			// zepto tap event.preventDefault can't prevent default click-events
+			document.addEventListener("click", function(event) {
+				var target = event.target;
+				if (!target) return;
+				if (target.tagName.toLowerCase() != "a" && !(target = target.getParentElementByTag("a"))) {
+					return;
+				}
+				var ajax = target.getAttribute("data-ajax"), href = target.href;
+				// if not ajax request
+				if (target.getAttribute("data-rel") == "external" 
+					|| ajax == "false"
+					|| (href.replace("://", "").split("/")[0] !== location.href.replace("://", "").split("/")[0] && ajax != "true")
+					|| (this.captureLink == false && ajax != "true")
+				) return;
+				event.preventDefault();
+			});
 		}
 		// Important: 
 		// In ios7+, swipe the edge of page will navigate Safari
@@ -1010,7 +1010,6 @@
 		if ((!href || /a/i.test(target.tagName) == false) && (target = target.getParentElementByTag("a"))) {
 			href = target.href;
 		}
-
 		// the page that current touched or actived
 		var self_page = document.querySelector(".in." + Mobilebone.classPage);
 
@@ -1075,14 +1074,13 @@
 			event.preventDefault();
 			return;
 		}
-
 		if (/^javascript/.test(href)) {
 			if (back == false) return;	
 		} else {
 			external = external || (href.replace("://", "").split("/")[0] !== location.href.replace("://", "").split("/")[0]);
 			if ((external == true || capture == false) && target.getAttribute("data-ajax") != "true") return;
 		}
-	
+		
 		// judge that if it's a ajax request
 		if (/^#/.test(target.getAttribute("href")) == true) {
 			// hash slide

test/ajax-html/b.html

@@ -8,6 +8,7 @@
 <div class="page out" data-onpagefirstinto="page_b_first">
 	<ul>
         <li><a href="c.html">此为b页面，点击加载c页面</a></li>
+        <li><a id="link" href="http://www.zhangxinxu.com/sp/char.html">跳转测试，点击新页面</a></li>
     </ul>
 </div>
 </body>

test/ajax-html/index.html

@@ -23,7 +23,7 @@
         <li><a href="ajax-without-page.html" data-title="纯a标签元素返回页面">点击加载-返回不含page, 自动创建page</a></li>
     </ul>
     <ul>
-    	<li><a href="root-reload.php?id=1">根地址不缓存1</a></li>
+    	<li><a href="root-reload.php?id=1" data-ajax="true">根地址不缓存1</a></li>
         <li><a href="root-reload.php?id=2">根地址不缓存2</a></li>
         <li><a href="root-reload.php?id=3">根地址不缓存3</a></li>
         <li><a href="root-reload.php?id=4">根地址不缓存4</a></li>
@@ -43,8 +43,8 @@
 <script src="../../src/mobilebone.js"></script>
 <script src="../../src/mobilebone.js"></script>
 <!-- 厂子的frozenjs兼容测试 -->
-<!--<script src="../base-slide/zepto.js"></script>
-<script src="../base-slide/frozen.js"></script>-->
+<script src="../base-slide/zepto.js"></script>
+<script src="../base-slide/frozen.js"></script>
 <script>
 var optionsTest = function(elein, eleout, options) {
 	// ajax过场回调options参数测试
@@ -67,13 +67,23 @@
 };
 
 var page_b_first = function() {
-	console.log("first?");
+	// console.log("first?");
+	$("#link").on("tap", function() {
+		location.href = this.href;
+	});
 };
 var page_root_first = function() {
 	// console.log("root?");
 };
 
 Mobilebone.evalScript = true;
+
+// 此为captureLink测试
+// Mobilebone.captureLink = false;
+
+/*$("a").tap(function() {
+	console.log("taped");	
+});*/
 </script>
 </body>
 </html>

test/ajax-html/root-reload.php

@@ -8,7 +8,7 @@
 <div class="page out" data-callback="root_reload" data-onpagefirstinto="page_root_first">
 	<p>document.getElementById("idShow").innerHTML是：<strong id="idShow">&nbsp;</strong>，应该结果是<strong id="idShould"><?php echo $_GET['id']; ?></strong>.</p>
 	<ul>
-        <li><a href="#pageHome" id="scriptTest" data-rel="back">返回</a></li>
+        <li><a href="#pageHome" id="scriptTest" data-rel="back" data-ajax="true">返回</a></li>
     </ul>
     <script>
 	document.getElementById("scriptTest").style.backgroundColor = "#" + (Math.random() + "").slice(-6);