Merge pull request #20 from zhangxinxu/develop

Develop

Author: zhangxinxu

src/mobilebone.js

@@ -218,10 +218,10 @@
 				pageInto.setAttribute("data-title", document.title);
 			}
 
-			// delete page with same id
+			// delete page with same id when options.remove !== false
 			var pageid = options.id || pageInto.id;
 
-			if (store[pageid] && store[pageid] != pageInto) {
+			if (options.remove !== false && store[pageid] && store[pageid] != pageInto && store[pageid].parentElement) {
 				store[pageid].parentElement.removeChild(store[pageid]);
 				delete store[pageid];
 			}
@@ -849,17 +849,26 @@
 	**/
 	window.addEventListener("popstate", function() {
 		var hash = location.hash.replace("#&", "").replace("#", "");
-		if (hash == "" || isSimple.test(hash) == false) return;
 
-		var page_in = store[hash] || document.querySelector("#" + hash), page_out = document.querySelector(".in." + Mobilebone.classPage);
+		var page_in = store[hash];
+		
+		if (!page_in) {
+			if(isSimple.test(hash) == false) {
+				return;
+			}
+			page_in =  document.querySelector("#" + hash)
+		}
+		
+		var page_out = document.querySelector(".in." + Mobilebone.classPage);
 
 		if ((page_in && page_in == page_out) || Mobilebone.pushStateEnabled == false) return;
 
 
 		// hash ↔ id													
 		if (page_in) {
 			Mobilebone.transition(page_in, page_out, Mobilebone.isBack(page_in, page_out), {
-				history: false	
+				history: false,
+				remove: false
 			});
 		}
 	});