zhangxinxu
diff --git a/‎ReadMe.md
Lines changed: 6 additions & 6 deletions b/‎ReadMe.md
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/mobilebone.js
Lines changed: 11 additions & 12 deletions b/‎src/mobilebone.js
Lines changed: 11 additions & 12 deletions
diff --git a/‎test/ajax-json/index.html
Lines changed: 3 additions & 3 deletions b/‎test/ajax-json/index.html
Lines changed: 3 additions & 3 deletions
diff --git a/‎test/ajax-json/json-error.txt renamed to ‎test/ajax-json/json-error.html b/‎test/ajax-json/json-error.txt renamed to ‎test/ajax-json/json-error.html
diff --git a/‎test/ajax-json/json-success.txt renamed to ‎test/ajax-json/json-success.html b/‎test/ajax-json/json-success.txt renamed to ‎test/ajax-json/json-success.html
diff --git a/‎test/backbone/data.json renamed to ‎test/backbone/data.html b/‎test/backbone/data.json renamed to ‎test/backbone/data.html
diff --git a/‎test/backbone/find.template renamed to ‎test/backbone/find.html b/‎test/backbone/find.template renamed to ‎test/backbone/find.html
diff --git a/‎test/backbone/index.html
Lines changed: 2 additions & 2 deletions b/‎test/backbone/index.html
Lines changed: 2 additions & 2 deletions
@@ -4,9 +4,9 @@ Single Page Switching bone for mobile web APP, Hybird APP, Phonegap, ...
 
 Why need this?
 -----------------
-Better user experience for scene switching as native APP. 
-1. Phonegap that to native APP is a single index.html, We need the same switch effects as native.
-2. Hybird app, as you know, mixed web-app and native-app. So, it' better that they have some switching experience.
+Better user experience for scene switching as native APP. <br>
+1. Phonegap that to native APP is a single index.html, We need the same switch effects as native.<br>
+2. Hybird app, as you know, mixed web-app and native-app. So, it' better that they have some switching experience.<br>
 3. Even no refresh interaction is not something bad for mobile APP.
 
 How to use?
@@ -46,9 +46,9 @@ mobilebone.js
 
 为何需要？
 -------------
-类原生APP的过场体验，适用于这些场景：
-1. Phonegap等类似跨移动开发平台，其静态页面都是index.html, 单页面，因此，需要跟原生一样的过场体验。
-2. Hybird app开发，原生APP内嵌web APP, 为了两者体验一致，不至于交互太唐突，也需要无刷新过场效果。
+类原生APP的过场体验，适用于这些场景：<br>
+1. Phonegap等类似跨移动开发平台，其静态页面都是index.html, 单页面，因此，需要跟原生一样的过场体验。<br>
+2. Hybird app开发，原生APP内嵌web APP, 为了两者体验一致，不至于交互太唐突，也需要无刷新过场效果。<br>
 3. 就算是纯粹的移动web APP, 使用无刷新模式也不失为一种不错的选项策略。
 
 
 
@@ -224,7 +224,7 @@
 			}
 			if (supportHistory && this.pushStateEnabled && options.history !== false && url_push) {
 				// if only pageIn, use 'replaceState'
-				history[pageOut? "pushState": "replaceState"](null, document.title, url_push);
+				history[pageOut? "pushState": "replaceState"](null, document.title, url_push.replace(/^#/, "#&"));
 			}
 
 			// store page-id, just once
@@ -599,13 +599,14 @@
 
 	/**
 	 * Initialization. Load page according to location.hash. And bind link-catch events.
-	 *
 	**/
 	Mobilebone.init = function() {
-		var hash = location.hash, ele_in = hash && document.querySelector(hash);
-		if (hash == "") {
+		var hash = location.hash.replace("#&", "#"), ele_in = null;
+		if (hash == "" || hash == "#") {
 			this.transition(document.querySelector("." + this.classPage));
-		} else if (ele_in == null || ele_in.classList.contains(this.classPage) == false/* not page */) {
+		} else if ((ele_in = document.querySelector(hash)) && ele_in.classList.contains(this.classPage)) { // 'ele_in' must be a page element
+			this.transition(ele_in);	
+		} else {
 			// as a ajax
 			this.ajax({
 				url: hash.replace("#", ""),
@@ -615,20 +616,18 @@
 					Mobilebone.transition(ele_in);
 				}
 			});	
-		} else {
-			this.transition(ele_in);	
-		}	
+		}
 
-		var eventName = "click";
-		if (root.$ && root.$.fn && root.$.fn.tap) eventName = "tap"; 
+		// Initialization link-catch events.
+		var eventName = "click", $ = root.$ || root.jQuery || root.Zepto;
+		if ($ && $.fn && $.fn.tap) eventName = "tap"; 
 		if (this.captureLink == true) {
 			document.addEventListener(eventName, this.handleTapEvent);	
 		}
 	};
 
 	/**
 	 * If 'a' element has href, slide auto when tapping~
-	 *
 	**/
 	Mobilebone.handleTapEvent = function(event) {
 		// get target and href
@@ -749,7 +748,7 @@
 	**/
 	if (supportHistory) {
 		window.addEventListener("popstate", function() {
-			var hash = location.hash.replace("#", "");
+			var hash = location.hash.replace("#&", "").replace("#", "");
 			if (hash == "") return;
 
 			var page_in = store[hash] || document.querySelector(location.hash), page_out = document.querySelector(".in." + Mobilebone.classPage);
 
@@ -11,11 +11,11 @@
 <body>
 <div id="pageHome" class="page out" data-title="ajax请求JSON">
     <ul>
-        <li><a href="json-success.txt" data-dataType="json" data-ajax="true" data-error="requestError">点击加载JSON数据, github会挂</a></li>
+        <li><a href="json-success.html" data-dataType="json" data-ajax="true" data-error="requestError">点击加载JSON数据</a></li>
     </ul>
     <ul>
-        <li><a href="json-error.html" data-datatype="json" data-error="requestError">加载JSON失败，404, 可回调</a></li>
-        <li><a href="json-error.txt" data-datatype="json" data-error="requestError">加载JSON失败，解析错误</a></li>
+        <li><a href="json-error.txt" data-datatype="json" data-error="requestError">加载JSON失败，404, 可回调</a></li>
+        <li><a href="json-error.html" data-datatype="json" data-error="requestError">加载JSON失败，解析错误</a></li>
     </ul>
     <ul>
         <li><a href="../index.html" data-ajax="false">&laquo; 返回测试引导首页</a></li>
 
@@ -14,7 +14,7 @@
 <body>
 <div id="homePage" class="page out" data-title="backbone模板框架结合示例">
     <ul>
-        <li><a href="data.json" data-datatype="json">大列表展示</a></li>
+        <li><a href="data.html" data-datatype="json">大列表展示</a></li>
     </ul>
     <ul>
         <li><a href="../index.html" data-ajax="false">&laquo; 返回测试引导首页</a></li>
@@ -46,7 +46,7 @@
 
 	// 获得模板内容
 	var xhr = new XMLHttpRequest();
-	xhr.open("GET", key + ".template");
+	xhr.open("GET", key + ".html");
 	xhr.onload = function() {	
 		var FindView = Backbone.View.extend({
 			initialize: function() {