Merge branch 'master' of https://github.com/codeyu/EnglishGrammarBook

codeyu · codeyu · commit 0b0340ed979d · 2017-09-24T00:03:45.000+08:00
diff --git a/index.html b/index.html
@@ -12,7 +12,7 @@
   <script src="js/jquery-ui.min.js"></script>
   <script src="js/marked.js"></script>
   <script src="js/store.js"></script>
-  <script src="js/ditto.js"></script>
+  <script src="js/ditto.js?v=0.2"></script>
   <script src="js/prism.js"></script>
 </head>
 <body>
diff --git a/js/ditto.js b/js/ditto.js
@@ -254,17 +254,24 @@ function create_page_anchors() {
 function normalize_paths() {
   // images
   $(ditto.content_id + " img").map(function() {
-    var src = $(this).attr("src").replace("./", "");
-    if ($(this).attr("src").slice(0, 4) !== "http") {
-      var pathname = location.pathname.substr(0, location.pathname.length - 1);
-      var url = location.hash.replace("#", "");
-
-      // split and extract base dir
-      url = url.split("/");
-      var base_dir = url.slice(0, url.length - 1).toString();
-
-      // normalize the path (i.e. make it absolute)
-      $(this).attr("src", pathname + base_dir + "/" + src);
+    var src = $(this).attr("src");
+    if($(this).attr("src").indexOf("../") > -1){
+      src = $(this).attr("src").replace("../", "");
+      $(this).attr("src", "http://" + location.host + "/" + src);
+    }
+    else{
+      src = $(this).attr("src").replace("./", "");
+      if ($(this).attr("src").slice(0, 4) !== "http") {
+        var pathname = location.pathname.substr(0, location.pathname.length - 1);
+        var url = location.hash.replace("#", "");
+
+        // split and extract base dir
+        url = url.split("/");
+        var base_dir = url.slice(0, url.length - 1).toString();
+
+        // normalize the path (i.e. make it absolute)
+        $(this).attr("src", pathname + base_dir + "/" + src);
+      }
     }
   });
 }
