Merge pull request #13 from GenbuProject/v2

GenbuHase · web-flow · commit 7b9e91aa8c42 · 2017-08-27T14:50:46.000+09:00
【再読み込みするとトップに戻る現象】修正
diff --git a/Core.js b/Core.js
@@ -5,6 +5,8 @@ window.addEventListener("DOMContentLoaded", () => {
 		location.href = "/SimpleThread/Error/403.10/";
 	}
 
+	location.pathname == "/SimpleThread/" || sessionStorage.setItem("com.GenbuProject.SimpleThread.currentPage", location.pathname + location.search);
+
 	DOM('@A[Href]:Not([Target]):Not([Href^="javascript:"])').forEach((elem) => {
 		elem.addEventListener("click", (event) => {
 			event.preventDefault();
diff --git a/Main.js b/Main.js
@@ -67,6 +67,8 @@ window.addEventListener("DOMContentLoaded", () => {
 
 		if (querys.TID) {
 			DOM("$IFrame.mdl-layout__content").src = "Thread/Viewer/?tid=" + querys.TID;
+		} else {
+			!sessionStorage.getItem("com.GenbuProject.SimpleThread.currentPage") || (DOM("$IFrame.mdl-layout__content").src = sessionStorage.getItem("com.GenbuProject.SimpleThread.currentPage"));
 		}
 	});
 
diff --git a/Thread/Viewer/index.html b/Thread/Viewer/index.html
@@ -3,7 +3,7 @@
 <HTML>
 	<Head>
 		<Meta Charset = "UTF-8" />
-		<Title>Simple Thread == </Title>
+		<Title>Simple Thread == Thread Viewer</Title>
 
 		<Link Rel = "StyleSheet" Href = "https://fonts.googleapis.com/icon?family=Material+Icons" />
 		<Link Rel = "StyleSheet" Href = "https://code.getmdl.io/1.3.0/material.teal-red.min.css" />
diff --git a/index.html b/index.html
@@ -12,6 +12,7 @@
 		<Link Rel = "StyleSheet" Href = "https://genbuproject.github.io/Programs/MDL Extender/MDL Extender.css" />
 
 		<Script Src = "https://genbuproject.github.io/Programs/DOM Extender/DOM Extender v3.0.js"></Script>
+		<Script Src = "https://caligatio.github.io/jsSHA/sha.js"></Script>
 		<Script Src = "https://www.gstatic.com/firebasejs/4.2.0/firebase.js"></Script>
 		<Script Src = "https://genbuproject.github.io/Programs/FirebasePlus.js"></Script>
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ window.addEventListener("DOMContentLoaded", () => {`
`5`	`5`	`location.href = "/SimpleThread/Error/403.10/";`
`6`	`6`	`}`
`7`	`7`
	`8`	`+ location.pathname == "/SimpleThread/" \|\| sessionStorage.setItem("com.GenbuProject.SimpleThread.currentPage", location.pathname + location.search);`
	`9`	`+`
`8`	`10`	`DOM('@A[Href]:Not([Target]):Not([Href^="javascript:"])').forEach((elem) => {`
`9`	`11`	`elem.addEventListener("click", (event) => {`
`10`	`12`	`event.preventDefault();`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ window.addEventListener("DOMContentLoaded", () => {`
`67`	`67`
`68`	`68`	`if (querys.TID) {`
`69`	`69`	`DOM("$IFrame.mdl-layout__content").src = "Thread/Viewer/?tid=" + querys.TID;`
	`70`	`+ } else {`
	`71`	`+ !sessionStorage.getItem("com.GenbuProject.SimpleThread.currentPage") \|\| (DOM("$IFrame.mdl-layout__content").src = sessionStorage.getItem("com.GenbuProject.SimpleThread.currentPage"));`
`70`	`72`	`}`
`71`	`73`	`});`
`72`	`74`