Przeglądaj źródła

HPCC-17845 Move logout() to new logout.js

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 8 lat temu
rodzic
commit
abee91ed53
4 zmienionych plików z 33 dodań i 31 usunięć
  1. 0 15
      esp/files/gen_form.js
  2. 31 0
      esp/files/logout.js
  3. 1 0
      esp/xslt/gen_form.xsl
  4. 1 16
      esp/xslt/soap_page.xsl

+ 0 - 15
esp/files/gen_form.js

@@ -498,18 +498,3 @@ function  onClickValidate(chked)
     }
 }
 
-function logout()
-{
-    var logoutRequest = new XMLHttpRequest();
-    logoutRequest.onreadystatechange = function()
-    { 
-        if (logoutRequest.readyState != 4)
-            console.log("Logout failed -- readyState: " + logoutRequest.readyState);
-        else if (logoutRequest.status != 200)
-            console.log("Logout failed -- status: " + logoutRequest.status);
-        else
-            parent.location = '/esp/files/userlogout.html';
-    }
-    logoutRequest.open( "GET", '/esp/logout', true );            
-    logoutRequest.send( null );
-}

+ 31 - 0
esp/files/logout.js

@@ -0,0 +1,31 @@
+/*##############################################################################
+#    HPCC SYSTEMS software Copyright (C) 2017 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+############################################################################## */
+
+function logout()
+{
+  var logoutRequest = new XMLHttpRequest();
+  logoutRequest.onreadystatechange = function()
+  { 
+    if (logoutRequest.readyState != 4)
+      console.log("Logout failed -- readyState: " + logoutRequest.readyState);
+    else if (logoutRequest.status != 200)
+      console.log("Logout failed -- status: " + logoutRequest.status);
+    else
+      parent.location = '/esp/files/userlogout.html';
+  }
+  logoutRequest.open( "GET", '/esp/logout', true );            
+  logoutRequest.send( null );
+}

+ 1 - 0
esp/xslt/gen_form.xsl

@@ -104,6 +104,7 @@
                 <script type="text/javascript" src="files_/req_array.js"/>
                 <script type="text/javascript" src="files_/hashtable.js"/>
                 <script type="text/javascript" src="files_/gen_form.js"/>
+                <script type="text/javascript" src="files_/logout.js"/>
                 <script type="text/javascript">         
   var isIE = (navigator.appName == "Microsoft Internet Explorer");  
   

+ 1 - 16
esp/xslt/soap_page.xsl

@@ -36,26 +36,11 @@
       <script type="text/javascript" src="/esp/files/get_input.js"/>
       <script type="text/javascript" src="/esp/files/stack.js"/>
       <script type="text/javascript" src="/esp/files/stringbuffer.js"/>
+      <script type="text/javascript" src="/esp/files/logout.js"/>
 
 <script type="text/javascript">
 var showhttp = '<xsl:value-of select="$showhttp"/>';
 
-  function logout()
-  {
-    var logoutRequest = new XMLHttpRequest();
-    logoutRequest.onreadystatechange = function()
-    { 
-      if (logoutRequest.readyState != 4)
-        console.log("Logout failed -- readyState: " + logoutRequest.readyState);
-      else if (logoutRequest.status != 200)
-        console.log("Logout failed -- status: " + logoutRequest.status);
-      else
-        parent.location = '/esp/files/userlogout.html';
-    }
-    logoutRequest.open( "GET", '/esp/logout', true );            
-    logoutRequest.send( null );
-  }
-
 <![CDATA[ 
   var xmlhttp = null;