Inicio Explorar Ayuda
Registro Iniciar sesión
GfA
/
novnc
6
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Move vnc.js into include directory.

Also, allow 'include/' to be overridden in VNC_uri_prefix.
Joel Martin hace 15 años
padre
2152a88f5c
commit
96a6eaadbc
Se han modificado 4 ficheros con 15 adiciones y 13 borrados
Dividir vista Mostrar estadísticas de diff
  1. 1 1
      README.md
  2. 12 10
      include/vnc.js
  3. 1 1
      vnc.html
  4. 1 1
      vnc_auto.html

+ 1 - 1
README.md
Ver fichero 

@@ -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 () {

+ 12 - 10
vnc.js → include/vnc.js
Ver fichero 

@@ -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');

+ 1 - 1
vnc.html
Ver fichero 

@@ -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 () {

+ 1 - 1
vnc_auto.html
Ver fichero 

@@ -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);