Merge pull request #146 from zhangxinxu/develop

zhangxinxu · zhangxinxu · commit 9674a6141de8 · 2015-05-08T21:39:17.000+08:00
svg title  fix
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobilebone",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Bone main for mobile web APP with a sigle page mode.",
   "main": "src/mobilebone.js",
   "directories": {
diff --git a/src/mobilebone.js b/src/mobilebone.js
@@ -46,7 +46,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '2.5.5';
+	Mobilebone.VERSION = '2.5.6';
 	
 	/**
 	 * Whether catch attribute of href from element with tag 'a'
@@ -625,18 +625,20 @@
 		}
 		
 		var create_title = create.getElementsByTagName("title")[0];
+		
 		// get the page element
 		if (!(create_page = create.querySelector("." + classPage))) {
+			// if there no .page, create as create_page
 			create.className = classPage + " out";
-			if (typeof page_title == "string") create.setAttribute("data-title", page_title);
 			create_page = create;
-		} else {
-			if (create_title) {
-				create_page.setAttribute("data-title", create_title.innerText);
-			} else if (typeof page_title == "string") {
-				create_page.setAttribute("data-title", page_title);
-			}
 		}
+		// set and store title
+		if (typeof page_title == "string") {
+			create_page.setAttribute("data-title", page_title);
+		} else if (create_title && create_title.innerText) { // the judge behind '&&' for issues #144 
+			create_page.setAttribute("data-title", create_title.innerText);
+		}
+		
 		// insert create page as a last-child
 		(container || document.body).appendChild(create_page);
 		
@@ -881,7 +883,7 @@
 	Mobilebone.submit = function(form) {
 		if (!form || typeof form.action != "string") return; 
 		var ajax = form.getAttribute("data-ajax");
-		if (ajax == "false" || (this.captureForm == false && ajax != "true")) return;
+		if (ajax == "false" || (Mobilebone.captureForm == false && ajax != "true")) return;
 		
 		form.addEventListener("submit", function(event) {
 			// prevent detect
@@ -970,17 +972,11 @@
 		}
 		
 		// Initialization link-catch events.
-		var eventName = "click", $ = root.$ || root.jQuery || root.Zepto;
-		if ($ && $.fn && $.fn.tap && ('ontouchstart' in window == true)) eventName = "tap"; 
-	
-		if ($ && $.fn && $.fn.on) {
+		var $ = root.$ || root.jQuery || root.Zepto;
+		if ($ && $.fn && $.fn.tap && ('ontouchstart' in window == true)) {
 			// for some unknown 'tap' plugin
-			$(document).on(eventName, this.handleTapEvent);
-		} else {
-			document.addEventListener(eventName, this.handleTapEvent);	
-		}
-		
-		if (eventName == "tap") {
+			$(document).tap(this.handleTapEvent);
+			
 			// zepto tap event.preventDefault can't prevent default click-events
 			document.addEventListener("click", function(event) {
 				var target = event.target;
@@ -993,11 +989,14 @@
 				if (target.getAttribute("data-rel") == "external" 
 					|| ajax == "false"
 					|| (href.replace("://", "").split("/")[0] !== location.href.replace("://", "").split("/")[0] && ajax != "true")
-					|| (this.captureLink == false && ajax != "true")
+					|| (Mobilebone.captureLink == false && ajax != "true")
 				) return;
 				event.preventDefault();
 			});
+		} else {
+			document.addEventListener("click", this.handleTapEvent);	
 		}
+
 		// Important: 
 		// In ios7+, swipe the edge of page will navigate Safari
 		// that will trigger 'popstate' events and the page will transition twice
diff --git a/test/ajax-html/ajax-without-page.html b/test/ajax-html/ajax-without-page.html
@@ -5,6 +5,20 @@
 </head>
 
 <body>-->
+<!--<title>普通标题，应该显示</title>-->
 <a href="#pageHome" data-rel="back">返回(请求返回内容就是个a标签)</a>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0"
+	 width="200" height="200" viewBox="0 0 200 200">
+	 <title>SVG标题-应该不显示</title>
+<g>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M191,14H7c-4.418,0-8,3.582-8,8v156c0,4.418,3.582,8,8,8h184c4.418,0,8-3.582,8-8
+		V22C199,17.582,195.418,14,191,14z M191,178H7v-3.032l37.486-34.723l22.306,20.81l65.297-70.1L191,148.898V178z M191,139.513
+		l-58.87-57.519l-65.612,69.67l-22.1-20.902L7,165.384V22h184V139.513z"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M57.5,94c14.36,0,26-11.641,26-26c0-14.36-11.64-26-26-26
+		c-14.359,0-26,11.641-26,26C31.5,82.359,43.141,94,57.5,94z M57.5,50c9.942,0,18.001,8.059,18.001,18c0,9.941-8.059,18-18.001,18
+		c-9.941,0-18-8.059-18-18C39.5,58.059,47.559,50,57.5,50z"/>
+</g>
+</svg>
+
 <!--</body>
 </html>-->
diff --git a/test/ajax-html/index.html b/test/ajax-html/index.html
@@ -20,7 +20,8 @@
         <li><a href="ajax-page.html?a=1&b=" class="follow" data-reload data-formdata="c=1&d=1" data-mask="true">点击加载(data-formdata测试)-跟随loading</a></li>
     </ul>
     <ul>
-        <li><a href="ajax-without-page.html" data-title="纯a标签元素返回页面">点击加载-返回不含page, 自动创建page</a></li>
+        <li><a href="ajax-without-page.html" data-title="纯a标签元素返回页面" data-reload>点击加载-返回不含page, 自动创建page</a></li>
+        <li><a href="ajax-without-page.html" data-reload>svg中title测试</a></li>
     </ul>
     <ul>
     	<li><a href="root-reload.php?id=1" data-ajax="true">根地址不缓存1</a></li>
@@ -46,6 +47,9 @@
 <!--<script src="../base-slide/zepto.js"></script>
 <script src="../base-slide/frozen.js"></script>-->
 <script>
+// store title
+document.getElementById("pageHome").setAttribute("data-title", document.title);
+
 var optionsTest = function(elein, eleout, options) {
 	// ajax过场回调options参数测试
 	// console.log("点击的元素是：" + (options.target && options.target.outerHTML));
diff --git a/test/complex/js/wechat.js b/test/complex/js/wechat.js
@@ -13,7 +13,7 @@ Mobilebone.onpagefirstinto = function(pageinto) {
 	var weChatScroll = new IScroll(pageinto.querySelector(".content"), {
 		tap: true
 	});
-	/Android/i.test(navigator.userAgent) && pageinto.addEventListener('tap', Mobilebone.handleTapEvent, false);
+	// /Android/i.test(navigator.userAgent) && pageinto.addEventListener('tap', Mobilebone.handleTapEvent, false);
 };
 
 Mobilebone.callback = function(pageinto, pageout) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mobilebone",`
`3`		`- "version": "2.5.5",`
	`3`	`+ "version": "2.5.6",`
`4`	`4`	`"description": "Bone main for mobile web APP with a sigle page mode.",`
`5`	`5`	`"main": "src/mobilebone.js",`
`6`	`6`	`"directories": {`