no id page back

zhangxinxu · zhangxinxu · commit c103be8b1001 · 2014-12-18T23:01:09.000+08:00
if first page has no id, it can also go back.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobilebone",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "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
@@ -40,7 +40,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '2.0.1';
+	Mobilebone.VERSION = '2.0.2';
 	
 	/**
 	 * Whether catch attribute of href from element with tag 'a'
@@ -726,7 +726,8 @@
 		if (hasInited == true) return 'Don\'t repeat initialization!';	
 		var hash = location.hash.replace("#&", "#"), ele_in = null;
 		if (hash == "" || hash == "#") {
-			this.transition(document.querySelector("." + this.classPage));
+			store._initPage = document.querySelector("." + this.classPage);
+			this.transition(store._initPage);
 		} else if (isSimple.test(hash) == true && (ele_in = document.querySelector(hash)) && ele_in.classList.contains(this.classPage)) { // 'ele_in' must be a page element
 			this.transition(ele_in);	
 		} else {
@@ -908,10 +909,14 @@
 	 * page change when history change
 	**/
 	window.addEventListener("popstate", function() {
-		var hash = location.hash.replace("#&", "").replace("#", "");
-		if (hash == "") return;
-		
-		var page_in = store[hash];
+		var hash = location.hash.replace("#&", "").replace("#", ""), page_in = null;
+		if (hash == "") {
+			// if no hash, get init page as 'page_in'
+			page_in = store._initPage;
+			if (!page_in) return;			
+		} else {
+			page_in = store[hash];
+		}
 		
 		if (!page_in) {
 			if(isSimple.test(hash) == false) {
diff --git a/test/history/ajax-page.html b/test/history/ajax-page.html
@@ -5,6 +5,6 @@
 </head>
 
 <body>
-<div class="page out"><a href="#pageHome" data-rel="back">返回</a></div>
+<div class="page out"><a href="javascript:" data-rel="back">返回</a></div>
 </body>
 </html>
diff --git a/test/history/history.html b/test/history/history.html
@@ -9,7 +9,7 @@
 </head>
 
 <body>
-<div id="pageHome" class="page out">
+<div class="page out">
     <ul>
         <li><a href="#page1">浏览器返回测试-页面1</a></li>
         <li><a href="#page2">浏览器返回测试-页面2</a></li>
@@ -22,9 +22,9 @@
         <li><a href="../index.html" data-ajax="false">&laquo; 返回测试引导首页</a></li>
     </ul>
 </div>
-<div id="page1" class="page out"><a href="#pageHome" data-rel="back">&laquo;返回1</a></div>
-<div id="page2" class="page out"><a href="#pageHome" data-rel="back">&laquo;返回2</a></div>
-<div id="page3" class="page out"><a href="#pageHome" data-rel="back">&laquo;返回3</a></div>
+<div id="page1" class="page out"><a href="javascript:" data-rel="back">&laquo;返回1</a></div>
+<div id="page2" class="page out"><a href="javascript:" data-rel="back">&laquo;返回2</a></div>
+<div id="page3" class="page out"><a href="javascript:" data-rel="back">&laquo;返回3</a></div>
 
 <script src="../../src/mobilebone.js"></script>
 </body>

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