First attempt to support Stackexchange links

kiwix · Dec 13, 2017 · 0ccd932 · 0ccd932
1 parent 5ac8ae0
commit 0ccd932
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/www/js/app.js b/www/js/app.js
@@ -1783,19 +1783,15 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
                         // Add an onclick event to go to this article
                         // instead of following the link
 
-                        if (url.substring(0, 2) === "./") {
-                            url = url.substring(2);
-                        }
-                        // Remove the initial slash if it's an absolute URL
-                        else if (url.substring(0, 1) === "/") {
-                            url = url.substring(1);
-                        }
-                        //Supports stackexchange
-                        else if (url.substring(0, 6) == "../../") {
-                            url = url.substring(6);
-                            //This should match a stackexchange URL and replace with short form
-                            url = url.replace(/([^/]+\/\d+)\/[^/]+(\.html?)/, "$1$2");
-                        }
+                        //Get rid of any absolute or relative prefixes (../, ./../, /../.., etc.)
+                        url = url.replace(/^[.\/]*([\S\s]+)$/, "$1");
+
+                        //Add namespace if there is an intermedial slash (supports Stackexchange)
+                        //url = url.replace(/^([^\/]+\/[^\/]+[\S\s]+)$/, "A/$1");
+
+                        //This experimentally shortens the URL for Stackexchange, but I'm not sure it's necessary...
+                        //url = url.replace(/([^/]+\/\d+)\/[^/]+(\.html?)/, "A/$1$2");
+
                         $(this).on('click', function (e) {
                             clearFindInArticle();
                             //Re-enable top-level scrolling
@@ -2284,7 +2280,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'abstractFile
         selectedArchive.getDirEntryByTitle(title).then(function(dirEntry) {
             if (dirEntry === null || dirEntry === undefined) {
                 $("#readingArticle").hide();
-                alert("Article with title " + title + " not found in the archive");
+                console.error("Article with title " + title + " not found in the archive");
             }
             else {
                 $("#articleName").html(title);

diff --git a/www/js/lib/zimArchive.js b/www/js/lib/zimArchive.js
@@ -245,7 +245,8 @@ define(['zimfile', 'zimDirEntry', 'util', 'utf8'],
         });
     };
 
-    var regexpTitleWithoutNameSpace = /^[^\/]+$/;
+    //Supports Stackexchange [kiwix-js #205]
+    var regexpTitleWithoutNameSpace = /^(?![\w-]\/[^\/]+?)/;
 
     /**
      * Searches a DirEntry (article / page) by its title.