From 836035eee664051a1e5a9f9c1a7be61293ddcae3 Mon Sep 17 00:00:00 2001
From: "Darren.NET" <Darren.Net@hotmail.com>
Date: Wed, 16 Nov 2022 15:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=BD=89=E5=9D=80=20for=20Ni?=
 =?UTF-8?q?agara4=20=20js=20=E7=A7=BB=E5=88=B0=20/js/init.js=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/index.html | 12 +-----------
 Frontend/js/init.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Frontend/index.html b/Frontend/index.html
index d807777..ade6287 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -2064,17 +2064,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
     <script src="js/style.js"></script>
     <script src="js/site.js"></script>
     <script src="js/init.js"></script>
-    <script>
-
-        //重新轉址 for Niagara4
-        var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
-        var redirectionUrl = window.location.origin + "/" +
-            temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
-            window.location.pathname.split("/").slice(3).join("/");
-        //判斷url是否包含"ord"，如果有重新轉址
-        if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
-            document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
-        }
+    <script>       
 
         var jwt = localStorage.getItem("JWT-Authorization");
         var pageAct = {};  //記錄全頁面已選擇項目
diff --git a/Frontend/js/init.js b/Frontend/js/init.js
index c53c427..0cfa7bb 100644
--- a/Frontend/js/init.js
+++ b/Frontend/js/init.js
@@ -6,4 +6,14 @@ var varApiUrl = "/api/";  //API路徑
 var varPathImg = "/Upload/Images/";
 var varPathFile = "/Upload/Files/";
 var statusArr = { 1: "啟用", 0: "未啟用", 9: "刪除" };
-var objSendData = { Data: null };
\ No newline at end of file
+var objSendData = { Data: null };
+
+//重新轉址 for Niagara4
+var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);
+var redirectionUrl = window.location.origin + "/" +
+    temp_cuurent_Url_pathname[temp_cuurent_Url_pathname.length - 1].replace(":%5E", "/") + "/" +
+    window.location.pathname.split("/").slice(3).join("/");
+//判斷url是否包含"ord"，如果有重新轉址
+if (temp_cuurent_Url_pathname.findIndex(x => x == "ord") > -1) {
+    document.location.href = redirectionUrl.substr(0, redirectionUrl.length - 1);
+}
\ No newline at end of file