#1341:

* re-arrange script imports in logical groupings * rename all top-level xpra scripts (remove xpra prefix) * remove deps.js 404 link (we don't ship it) git-svn-id: https://xpra.org/svn/Xpra/trunk@14270 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Oct 23, 2016 · 478451f · 478451f
1 parent a08d9e7
commit 478451f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 19 deletions.
diff --git a/src/html5/index.html b/src/html5/index.html
@@ -147,19 +147,17 @@
 		<script type="text/javascript" src="js/lib/bencode.js"></script>
 		<script type="text/javascript" src="js/lib/zlib.js"></script>
 		<script type="text/javascript" src="js/lib/lz4.js"></script>
-		<script type="text/javascript" src="js/keycodes.js"></script>
+		<script type="text/javascript" src="js/lib/forge.js"></script>
 
 		<script type="text/javascript" src="js/lib/broadway/Decoder.js"></script>
-
 		<script type="text/javascript" src="js/lib/aurora/aurora.js"></script>
 		<script type="text/javascript" src="js/lib/aurora/aurora-xpra.js"></script>
 		<script type="text/javascript" src="js/lib/aurora/mp3.js"></script>
 
-		<script type="text/javascript" src="js/lib/forge.js"></script>
-
-		<script type="text/javascript" src="js/xpra_client.js"></script>
-		<script type="text/javascript" src="js/xpra_protocol.js"></script>
-		<script type="text/javascript" src="js/xpra_window.js"></script>
+		<script type="text/javascript" src="js/Keycodes.js"></script>
+		<script type="text/javascript" src="js/Client.js"></script>
+		<script type="text/javascript" src="js/Protocol.js"></script>
+		<script type="text/javascript" src="js/Window.js"></script>
 	</head>
 
 	<body>

diff --git a/src/html5/js/xpra_client.js → src/html5/js/Client.js b/src/html5/js/xpra_client.js → src/html5/js/Client.js
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2013 Antoine Martin <antoine@devloop.org.uk>
+ * Copyright (c) 2013-2016 Antoine Martin <antoine@devloop.org.uk>
  * Copyright (c) 2014 Joshua Higgins <josh@kxes.net>
- * Copyright (c) 2015 Spikes, Inc.
+ * Copyright (c) 2015-2016 Spikes, Inc.
  * Licensed under MPL 2.0
  *
  * xpra client
  *
  * requires:
- *	xpra_protocol.js
- *  xpra_window.js
- *  keycodes.js
+ *	Protocol.js
+ *  Window.js
+ *  Keycodes.js
  */
 
 XPRA_CLIENT_FORCE_NO_WORKER = false;

diff --git a/src/html5/js/keycodes.js → src/html5/js/Keycodes.js b/src/html5/js/keycodes.js → src/html5/js/Keycodes.js
@@ -1,6 +1,6 @@
 /*
  * This file is part of Xpra.
- * Copyright (C) 2010-2013 Antoine Martin <antoine@devloop.org.uk>
+ * Copyright (C) 2010-2016 Antoine Martin <antoine@devloop.org.uk>
  * Licensed under MPL 2.0, see:
  * http://www.mozilla.org/MPL/2.0/
  *
@@ -89,6 +89,8 @@ for (var i=0; i<26; i++) {
 for (i=0; i<10; i++) {
 	CHARCODE_TO_NAME[48+i] = ""+i;
 	CHARCODE_TO_NAME[96+i] = ""+i;
+	//fix for OSX numpad?
+	//CHARCODE_TO_NAME[96+i] = "KP_"+i;
 }
 for (i=1; i<=24; i++) {
 	CHARCODE_TO_NAME[111+i] = "F"+i;

diff --git a/src/html5/js/xpra_protocol.js → src/html5/js/Protocol.js b/src/html5/js/xpra_protocol.js → src/html5/js/Protocol.js
@@ -27,7 +27,7 @@ function XpraProtocolWorkerHost() {
 
 XpraProtocolWorkerHost.prototype.open = function(uri) {
 	var me = this;
-	this.worker = new Worker('js/xpra_protocol.js');
+	this.worker = new Worker('js/Protocol.js');
 	this.worker.addEventListener('message', function(e) {
 		var data = e.data;
 		switch (data.c) {

diff --git a/src/html5/js/xpra_window.js → src/html5/js/Window.js b/src/html5/js/xpra_window.js → src/html5/js/Window.js
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2013 Antoine Martin <antoine@devloop.org.uk>
+ * Copyright (c) 2013-2016 Antoine Martin <antoine@devloop.org.uk>
  * Copyright (c) 2014 Joshua Higgins <josh@kxes.net>
- * Copyright (c) 2015 Spikes, Inc.
+ * Copyright (c) 2015-2016 Spikes, Inc.
  * Licensed under MPL 2.0
  *
  * xpra window

diff --git a/src/html5/js/lib/zlib.js b/src/html5/js/lib/zlib.js
@@ -228,9 +228,6 @@ if(!COMPILED && goog.ENABLE_DEBUG_LOADER) {
     }
   };
   goog.findBasePath_();
-  if(!goog.global.CLOSURE_NO_DEPS) {
-    goog.importScript_(goog.basePath + "deps.js")
-  }
 }
 goog.typeOf = function(value) {
   var s = typeof value;