Merge remote-tracking branch 'refs/remotes/origin/Develop'

Scripts/Chapter.js

@@ -14,7 +14,7 @@ function Chapter() {
 		if (!injectManager && document.getElementById("navsubbar") != undefined) {
 			injectManager = true;
 			let info = $('div#navsubbar p a');
-			let manager = $('<div class="fk-managerWrapper"></div>').prepend(Management.CreateManager($(info).parent().text().split('\n')[3], $(info).attr("href").replace("http://kissmanga.com/", "")));
+			let manager = $('<div class="fk-managerWrapper"></div>').prepend(Management.CreateManager($(info).parent().text().split('\n')[3], $(info).attr("href").replace("https://kissmanga.com/", "")));
 			$("#headnav").after(manager);
 		}
 

Scripts/Class/Bookmarks.js

@@ -58,7 +58,7 @@ var Bookmarks = {
 			var obj = this;
 			$.ajax({
 				type: "GET",
-				url: "http://kissmanga.com/BookmarkList",
+				url: "https://kissmanga.com/BookmarkList",
 				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, "");

Scripts/Class/Manager.js

@@ -390,7 +390,7 @@ function RemoveManga(node) {
 		$.ajax(
 			{
 				type: "POST",
-				url: "http://kissmanga.com/Bookmark/" + mid + "/remove",
+				url: "https://kissmanga.com/Bookmark/" + mid + "/remove",
 				success: function (message) {
 					if (message != "") {
 						Bookmarks.remove(mid);
@@ -424,7 +424,7 @@ function AddManga(node) {
 		$.ajax(
 			{
 				type: "GET",
-				url: "http://kissmanga.com/" + $(manager).attr("data-url"),
+				url: "https://kissmanga.com/" + $(manager).attr("data-url"),
 				success: function (html) {
 					let reg = html.match(/mangaID=(\d+)/);
 					if (reg != null) {
@@ -454,7 +454,7 @@ function AddMangaQuery(node, manager) {
 	$.ajax(
 		{
 			type: "POST",
-			url: "http://kissmanga.com/Bookmark/" + node.attr("mid") + "/add",
+			url: "https://kissmanga.com/Bookmark/" + node.attr("mid") + "/add",
 			success: function (message) {
 				if (message != "") {
 					Bookmarks.sync(function() {
@@ -487,7 +487,7 @@ function MarkAsRead(node) {
 	$.ajax(
 		{
 			type: "POST",
-			url: "http://kissmanga.com/Bookmark/MarkBookmarkDetail",
+			url: "https://kissmanga.com/Bookmark/MarkBookmarkDetail",
 			data: {
 				"bdid": bid,
 				"strAlreadyRead": 1
@@ -523,7 +523,7 @@ function MarkAsUnread(node) {
 	$.ajax(
 		{
 			type: "POST",
-			url: "http://kissmanga.com/Bookmark/MarkBookmarkDetail",
+			url: "https://kissmanga.com/Bookmark/MarkBookmarkDetail",
 			data: {
 				"bdid": bid,
 				"strAlreadyRead": 0

Scripts/FreeKiss/Events.js

@@ -162,7 +162,7 @@ function onAlarm(alarm) {
 /** Refresh the cloudflare's cookies and retry to access the bookmarks list. If it does not work, you can start cursing. */
 function RefreshCfCookies() {
 	LogDebug("Refreshing Cloudflare cookies.");
-	$("body").append("<iframe id='frame' width='0' height='0' src='http://kissmanga.com'></iframe>");
+	$("body").append("<iframe id='frame' width='0' height='0' src='https://kissmanga.com'></iframe>");
 	// we wait for 6 seconds for cloudflare to do his things before removing the iframe
 	setTimeout(() => {
 		$("#frame").remove();

Scripts/Menu.js

@@ -6,7 +6,7 @@ function Menu() {
 	$(document).ready(function () {
 
 		// Make username directly lead to bookmarks
-		$("#aDropDown").attr("href", "http://kissmanga.com/BookmarkList");
+		$("#aDropDown").attr("href", "https://kissmanga.com/BookmarkList");
 
 	});	
 

Styles/FreeKiss.css

@@ -46,6 +46,7 @@
 	width: 20px;
 	height: 20px;
 	display: inline-block;
+	vertical-align: top;
 }
 
 .fk-management a {

Views/Export.html

@@ -23,7 +23,7 @@ <h1>Export bookmarks</h1>
             <hr/>
             <h2 class="exportTitle">Choose export format</h2>
             <div id="formats">
-                <img class="fk-imgLoader fk-hide" src="http://kissmanga.com/Content/images/loader.gif">
+                <img class="fk-imgLoader fk-hide" src="https://kissmanga.com/Content/images/loader.gif">
                 <button id="txtFormat">Text</button>
                 <button id="xmlFormat">XML</button>
                 <button id="jsonFormat">JSON</button>

Views/FreeKissPopup.html

@@ -17,7 +17,7 @@
 	    		<path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
 	    	</svg>
 	    </a>
-	    <a id="new-chapters" title="Open bookmarks" href="http://kissmanga.com/BookmarkList" target="_blank">
+	    <a id="new-chapters" title="Open bookmarks" href="https://kissmanga.com/BookmarkList" target="_blank">
 	    	New<br>chapters!
 	    </a>
 

Views/Patchnotes.html

@@ -23,6 +23,13 @@
     <div id="content">
         <h1>Versions</h1>
         <hr>
+        <div class="patch">
+            <h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.3.2">1.3.2</a></h2>
+            <ul>
+                <li>KissManga finally swapped from http to https. Changed the code accordingly.</li>
+                <li>Correct the "New Manga/Most Popular" managers' buttons not lining up properly on Chrome.</li>
+            </ul>
+        </div>
         <div class="patch">
             <h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.3.1">1.3.1</a></h2>
             <ul>

manifest.json

@@ -4,7 +4,7 @@
   "name": "FreeKiss",
   "short_name": "FreeKiss",
   "description": "Enhance your KissManga experience.",
-  "version": "1.3.1",
+  "version": "1.3.2",
 
   "icons": {
     "16": "Images/Icons/icon16.png",