fix safari bug, try ... catch ... - MithrilJS/mithril.js#917

cheft · Jan 8, 2016 · 581b8b3 · 581b8b3
1 parent 4649c17
commit 581b8b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 mithril-starter-kit
 ===================
 
-    modify your local IP in app/config.js
-
     npm install
 
     npm start

diff --git a/app/config.js b/app/config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  dbPrefix: 'http://172.16.0.135:3000/api/'
+  dbPrefix: typeof window == 'undefined' ? 'http://127.0.0.1:3000/api/' : '/api/'
   // :TODO
   // apiPrefix: 'http://shanghai.qfang.com/brokerweb/',
 };
diff --git a/public/assets/js/app.js b/public/assets/js/app.js
@@ -713,10 +713,15 @@
 				else nextSibling.insertAdjacentHTML("beforebegin", data);
 			}
 			else {
-				if (window.Range && window.Range.prototype.createContextualFragment) {
-					parentElement.appendChild($document.createRange().createContextualFragment(data));
-				}
-				else parentElement.insertAdjacentHTML("beforeend", data);
+				// if (window.Range && window.Range.prototype.createContextualFragment) {
+				// 	parentElement.appendChild($document.createRange().createContextualFragment(data));
+				// }
+				// else parentElement.insertAdjacentHTML("beforeend", data);
+				try {
+			    parentElement.appendChild($document.createRange().createContextualFragment(data))
+			  } catch (e) {
+			    parentElement.insertAdjacentHTML("beforeend", data)
+			  }
 			}
 			var nodes = [];
 			while (parentElement.childNodes[index] !== nextSibling) {
@@ -3457,7 +3462,7 @@
 /***/ function(module, exports) {
 
 	module.exports = {
-	  dbPrefix: 'http://172.16.0.135:3000/api/'
+	  dbPrefix: typeof window == 'undefined' ? 'http://127.0.0.1:3000/api/' : '/api/'
 	  // :TODO
 	  // apiPrefix: 'http://shanghai.qfang.com/brokerweb/',
 	};