Merge pull request #303 from retr0h/https-first

The https check should come first.

Merge pull request #303 from retr0h/https-first
The https check should come first.
5eed5a4e · Samuel · 7c76fd32 · 82744aa8 · 5eed5a4e
Commit 5eed5a4e authored 11 years ago by Samuel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

vnc_auto.html vnc_auto.html +5 -5

No files found.
--- a/vnc_auto.html
+++ b/vnc_auto.html
@@ -2,7 +2,7 @@
 <html>
 <head>

-    <!-- 
+    <!--
    noVNC example: simple example using default UI
    Copyright (C) 2012 Joel Martin
    Copyright (C) 2013 Samuel Mannehed for Cendio AB
@@ -128,12 +128,12 @@
            // if port == 80 (or 443) then it won't be present and should be
            // set manually
            if (!port) {
-                if (window.location.protocol.substring(0,4) == 'http') {            
-                    port = 80;
-                }
-                else if (window.location.protocol.substring(0,5) == 'https') {            
+                if (window.location.protocol.substring(0,5) == 'https') {
                    port = 443;
                }
+                else if (window.location.protocol.substring(0,4) == 'http') {
+                    port = 80;
+                }
            }

            // If a token variable is passed in, set the parameter in a cookie.