Merge branch 'develop'

Gerardufoin · Oct 10, 2018 · cf7c3a2 · cf7c3a2
2 parents 9bd6d6e + 8497341
commit cf7c3a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Scripts/Class/Bookmarks.js b/Scripts/Class/Bookmarks.js
@@ -62,8 +62,10 @@ var Bookmarks = {
 				success: (html) => {
 					// We remove elements making FireFox cry about CSP (onClick, Images and everything beside the .listing table)
 					html = html.replace(/onClick=['"].+?['"]|<img[^>]*>|\r?\n|\r/gi, "");
-					let table = html.match(/<table[^>]+class=['"]listing['"].*<\/table>/gi)[0];
-					obj.setBookmarks($(table).find("tr:not(:first-child)"));
+					let table = html.match(/<table[^>]+class=['"]listing['"].*<\/table>/gi);
+					if (table != null) {
+						obj.setBookmarks($(table[0]).find("tr:not(:first-child)"));
+					}
 					obj.executeCallbacks();
 				},
 				error: (req, status, err) => {

diff --git a/Views/Patchnotes.html b/Views/Patchnotes.html
@@ -23,6 +23,12 @@
     <div id="content">
         <h1>Versions</h1>
         <hr>
+        <div class="patch">
+            <h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.3.1">1.3.1</a></h2>
+            <ul>
+                <li>Correct a bug where FreeKiss would not stop loading if the bookmarks page was unavailable.</li>
+            </ul>
+        </div>
         <div class="patch">
             <h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.3.0">1.3.0</a></h2>
             <ul>

diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
   "name": "FreeKiss",
   "short_name": "FreeKiss",
   "description": "Enhance your KissManga experience.",
-  "version": "1.3.0",
+  "version": "1.3.1",
 
   "icons": {
     "16": "Images/Icons/icon16.png",