Merge pull request #101 from zhangxinxu/develop

zhangxinxu · zhangxinxu · commit dae80e68bf93 · 2015-03-28T00:10:48.000+08:00
fix page recreate and function recall bug
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name" : "mobilebone",
-  "version" : "1.1.3",
+  "version" : "2.4.3",
   "main" : "src/mobilebone.js",
   "license" : "MIT",
   "dependencies" : {},
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobilebone",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "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
@@ -38,7 +38,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '2.4.2';
+	Mobilebone.VERSION = '2.4.3';
 	
 	/**
 	 * Whether catch attribute of href from element with tag 'a'
@@ -285,7 +285,7 @@
 			}
 			
 			// do transition
-			if (pageOut)  pageInto.classList.add(params_in.form);
+			if (pageOut) pageInto.classList.add(params_in.form);
 			// iOS bug 
 			// reflow for fixing issues #80, #86
 			pageInto.offsetWidth = pageInto.offsetWidth;
@@ -298,7 +298,7 @@
 
 			// do callback when come in first time
 			var onpagefirstinto = params_in.onpagefirstinto;
-			if (!store[pageid]) {
+			if (!store[pageid] && !store[hashid]) {
 				if (typeof onpagefirstinto == "string" && params_in.root[onpagefirstinto]) {
 					params_in.root[onpagefirstinto](pageInto, pageOut, options);
 				} else if (typeof onpagefirstinto == "function") {
@@ -362,6 +362,10 @@
 			// store page-id, just once
 			if (!store[pageid]) {
 				store[pageid] = pageInto;
+				// when we back/prev, we need to get true 
+				if (hashid !== pageid) {
+					store[hashid] = pageInto;
+				}
 			}
 			
 			// do callback every time
diff --git a/test/ajax-html/index.html b/test/ajax-html/index.html
@@ -27,7 +27,8 @@
         <li><a href="root-reload.php?id=2" data-reload="root">根地址不缓存2</a></li>
     </ul>
     <ul>
-        <li><a href="b.html">连续加载测试-加载b页面</a></li>
+        <li><a href="b.html" data-reload="root">连续加载测试-加载b页面</a></li>
+        <li><a href="b.html?a=1" data-reload="true">连续加载测试-加载b页面</a></li>
     </ul>
     <ul>
         <li><a href="http://www.zhangxinxu.com/sp/char.html" target="_blank">外部地址测试，应该直接跳转</a></li>
@@ -38,6 +39,7 @@
 </div>
 
 <script src="../../src/mobilebone.js"></script>
+<script src="../complex/js/zepto-docs.js"></script>
 <script>
 var optionsTest = function(elein, eleout, options) {
 	// ajax过场回调options参数测试
@@ -60,7 +62,10 @@
 };
 
 var page_b_first = function() {
-	// console.log("first?");
+	console.log("first?");
+};
+var page_root_first = function() {
+	console.log("root?");
 };
 </script>
 </body>
diff --git a/test/ajax-html/root-reload.php b/test/ajax-html/root-reload.php
@@ -5,7 +5,7 @@
 </head>
 
 <body>
-<div class="page out" data-callback="root_reload">
+<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" data-rel="back">返回</a></li>
diff --git a/test/form-submit/search.html b/test/form-submit/search.html
@@ -14,6 +14,7 @@
         <li class="p5 bgf0 mt1 btc">搜索结果1</li>
         <li class="p5 bgf0 mt1 btc">搜索结果2</li>
         <li class="p5 bgf0 mt1 btc">搜索结果3</li>
+        <li><a href="../ajax-html/c.html">C页面</a></li>
         <li><a href="#pageHome" data-rel="back">点此返回</a></li>
     </ul>
 </div>

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