Merge pull request #136 from zhangxinxu/develop

Develop

Author: zhangxinxu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobilebone",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "Bone main for mobile web APP with a sigle page mode.",
   "main": "src/mobilebone.js",
   "directories": {

src/mobilebone.js

@@ -43,7 +43,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '2.5.3';
+	Mobilebone.VERSION = '2.5.4';
 
 	/**
 	 * Whether catch attribute of href from element with tag 'a'
@@ -579,25 +579,27 @@
 		var create = document.createElement("div");
 		if (typeof domHtml == "string") {
 			create.innerHTML = domHtml;
-			
-			if (Mobilebone.evalScript == true) {
-				slice.call(create.getElementsByTagName("script")).forEach(function(originScript) {
-					var scriptContent = originScript.innerHTML.trim(), type = originScript.getAttribute("type");
-					if (scriptContent.trim() == "" || originScript.src) return;
-					var head = document.getElementsByTagName("head")[0] || document.documentElement,
-					script = document.createElement("script");
-					if (type) script.type = type;
-					script.appendChild(document.createTextNode(scriptContent));
-					setTimeout(function() {
-						head.insertBefore(script, head.firstChild);
-						head.removeChild(script);
-					}, 16);
-					originScript = null;
-				});	
-			}
 		} else {
 			create.appendChild(domHtml);
 		}
+		
+		// excute inline JavaScript
+		if (Mobilebone.evalScript == true) {
+			slice.call(create.getElementsByTagName("script")).forEach(function(originScript) {
+				var scriptContent = originScript.innerHTML.trim(), type = originScript.getAttribute("type");
+				if (scriptContent.trim() == "" || originScript.src) return;
+				var head = document.getElementsByTagName("head")[0] || document.documentElement,
+				script = document.createElement("script");
+				if (type) script.type = type;
+				script.appendChild(document.createTextNode(scriptContent));
+				setTimeout(function() {
+					head.insertBefore(script, head.firstChild);
+					head.removeChild(script);
+				}, 16);
+				originScript = null;
+			});	
+		}
+		
 		var create_title = create.getElementsByTagName("title")[0];
 		// get the page element
 		if (!(create_page = create.querySelector("." + classPage))) {
@@ -890,6 +892,8 @@
 			history.tempBack = null;
 			return true;
 		}
+		if (typeof page_in == "undefined") return true;
+		if (!page_out) return false;
 		return page_in.compareDocumentPosition(page_out) == 4;
 	};
 
@@ -1190,10 +1194,21 @@
 			if (page_in.id) return;			
 		} else {
 			page_in = store[hash];
+			
+			if (isSimple.test(hash) == false) {
+				// ajax store
+				Mobilebone.createPage(page_in, {
+					url: hash,
+					dataType: "unknown",
+					history: false,
+					back: true
+				});
+				return;
+			}
 		}
 
 		if (!page_in) {
-			if(isSimple.test(hash) == false) {
+			if (isSimple.test(hash) == false) {
 				// as a url
 				Mobilebone.ajax({
 					url: hash,

test/ajax-html/index.html

@@ -43,8 +43,8 @@
 <script src="../../src/mobilebone.js"></script>
 <script src="../../src/mobilebone.js"></script>
 <!-- 厂子的frozenjs兼容测试 -->
-<script src="../base-slide/zepto.js"></script>
-<script src="../base-slide/frozen.js"></script>
+<!--<script src="../base-slide/zepto.js"></script>
+<script src="../base-slide/frozen.js"></script>-->
 <script>
 var optionsTest = function(elein, eleout, options) {
 	// ajax过场回调options参数测试

test/ajax-html/root-reload.php

@@ -9,9 +9,13 @@
 	<p>document.getElementById("idShow").innerHTML是：<strong id="idShow">&nbsp;</strong>，应该结果是<strong id="idShould"><?php echo $_GET['id']; ?></strong>.</p>
 	<ul>
         <li><a href="#pageHome" id="scriptTest" data-rel="back" data-ajax="true">返回</a></li>
+        <li><a href="root-reload.php?id=8" data-ajax="true">id不一样的页面</a></li>
     </ul>
     <script>
 	document.getElementById("scriptTest").style.backgroundColor = "#" + (Math.random() + "").slice(-6);
+	document.getElementById("idShow").parentNode.addEventListener("touchstart", function() {
+		document.getElementById("scriptTest").style.backgroundColor = "#" + (Math.random() + "").slice(-6);	
+	});
 	console.log("script excuted!");
 	</script>
     <script type="text/template">