From 96a6eaadbc647cf769b74840ccc81fb50301af29 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Mon, 14 Jun 2010 14:56:19 -0500
Subject: [PATCH] Move vnc.js into include directory.

Also, allow 'include/' to be overridden in VNC_uri_prefix.
---
 README.md                |  2 +-
 vnc.js => include/vnc.js | 22 ++++++++++++----------
 vnc.html                 |  2 +-
 vnc_auto.html            |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename vnc.js => include/vnc.js (98%)
diff --git a/README.md b/README.md
index 61eb3164..e7eb7d68 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ scripts and call their load() functions. For example:
     <body>
         <div id='vnc'>Loading</div>
     </body>
-    <script src='vnc.js'></script>
+    <script src='include/vnc.js'></script>
     <script src="include/default_controls.js"></script>
     <script>
         window.onload = function () {
diff --git a/vnc.js b/include/vnc.js
similarity index 98%
rename from vnc.js
rename to include/vnc.js
index 026ae1cc..8d38ae6f 100644
--- a/vnc.js
+++ b/include/vnc.js
@@ -18,7 +18,9 @@ var VNC_native_ws, RFB;
 (function () {
     var extra, start, end;
 
-    if (typeof VNC_uri_prefix === "undefined") { VNC_uri_prefix=""; }
+    if (typeof VNC_uri_prefix === "undefined") {
+        VNC_uri_prefix="include/";
+    }
     extra = "";
     start = "<script src='" + VNC_uri_prefix;
     end = "'><\/script>";
@@ -27,20 +29,20 @@ var VNC_native_ws, RFB;
     //extra += start + "http://getfirebug.com/releases/lite/1.2/" + 
     //         "firebug-lite-compressed.js" + end;
 
-    extra += start + "include/mootools.js" + end;
-    extra += start + "include/base64.js" + end;
-    extra += start + "include/des.js" + end;
-    extra += start + "include/util.js" + end;
-    extra += start + "include/canvas.js" + end;
+    extra += start + "mootools.js" + end;
+    extra += start + "base64.js" + end;
+    extra += start + "des.js" + end;
+    extra += start + "util.js" + end;
+    extra += start + "canvas.js" + end;
 
     /* If no builtin websockets then load web_socket.js */
     if (window.WebSocket) {
         VNC_native_ws = true;
     } else {
         VNC_native_ws = false;
-        extra += start + "include/web-socket-js/swfobject.js" + end;
-        extra += start + "include/web-socket-js/FABridge.js" + end;
-        extra += start + "include/web-socket-js/web_socket.js" + end;
+        extra += start + "web-socket-js/swfobject.js" + end;
+        extra += start + "web-socket-js/FABridge.js" + end;
+        extra += start + "web-socket-js/web_socket.js" + end;
     }
     document.write(extra);
 }());
@@ -117,7 +119,7 @@ load: function () {
                     "'file://' URL is incompatible with Adobe Flash");
         } else {
             WebSocket.__swfLocation = VNC_uri_prefix +
-                        "include/web-socket-js/WebSocketMain.swf";
+                        "web-socket-js/WebSocketMain.swf";
             WebSocket.__initialize();
             RFB.use_seq = true;
             RFB.updateState('disconnected', 'Disconnected');
diff --git a/vnc.html b/vnc.html
index 47fd4958..35c3481c 100644
--- a/vnc.html
+++ b/vnc.html
@@ -11,7 +11,7 @@ noVNC example: simple example using default controls
         <div id='vnc'>Loading</div>
     </body>
 
-    <script src="vnc.js"></script>
+    <script src="include/vnc.js"></script>
     <script src="include/default_controls.js"></script>
     <script>
         window.onload = function () {
diff --git a/vnc_auto.html b/vnc_auto.html
index 5634b73d..d1ecc33f 100644
--- a/vnc_auto.html
+++ b/vnc_auto.html
@@ -19,7 +19,7 @@ Connect parameters are provided in query string:
         </div>
     </body>
 
-    <script src="vnc.js"></script>
+    <script src="include/vnc.js"></script>
     <script>
         function setPassword() {
             RFB.setPassword($('password_input').value);
