From 478451fe04f2a6d0c2ee931c91972492c6ba9ebc Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 23 Oct 2016 09:14:27 +0000 Subject: [PATCH] #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 --- src/html5/index.html | 12 +++++------- src/html5/js/{xpra_client.js => Client.js} | 10 +++++----- src/html5/js/{keycodes.js => Keycodes.js} | 4 +++- src/html5/js/{xpra_protocol.js => Protocol.js} | 2 +- src/html5/js/{xpra_window.js => Window.js} | 4 ++-- src/html5/js/lib/zlib.js | 3 --- 6 files changed, 16 insertions(+), 19 deletions(-) rename src/html5/js/{xpra_client.js => Client.js} (99%) rename src/html5/js/{keycodes.js => Keycodes.js} (95%) rename src/html5/js/{xpra_protocol.js => Protocol.js} (99%) rename src/html5/js/{xpra_window.js => Window.js} (99%) diff --git a/src/html5/index.html b/src/html5/index.html index d7893d496b..d29ae55f71 100644 --- a/src/html5/index.html +++ b/src/html5/index.html @@ -147,19 +147,17 @@ - + - - - - - - + + + + diff --git a/src/html5/js/xpra_client.js b/src/html5/js/Client.js similarity index 99% rename from src/html5/js/xpra_client.js rename to src/html5/js/Client.js index b76f58be9f..b99ece4252 100644 --- a/src/html5/js/xpra_client.js +++ b/src/html5/js/Client.js @@ -1,15 +1,15 @@ /* - * Copyright (c) 2013 Antoine Martin + * Copyright (c) 2013-2016 Antoine Martin * Copyright (c) 2014 Joshua Higgins - * 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 b/src/html5/js/Keycodes.js similarity index 95% rename from src/html5/js/keycodes.js rename to src/html5/js/Keycodes.js index 9afe2d02a8..5ae168a855 100644 --- a/src/html5/js/keycodes.js +++ b/src/html5/js/Keycodes.js @@ -1,6 +1,6 @@ /* * This file is part of Xpra. - * Copyright (C) 2010-2013 Antoine Martin + * Copyright (C) 2010-2016 Antoine Martin * 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 b/src/html5/js/Protocol.js similarity index 99% rename from src/html5/js/xpra_protocol.js rename to src/html5/js/Protocol.js index 01f23be907..c19dba6a51 100644 --- a/src/html5/js/xpra_protocol.js +++ b/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 b/src/html5/js/Window.js similarity index 99% rename from src/html5/js/xpra_window.js rename to src/html5/js/Window.js index f486a12303..48a9597590 100644 --- a/src/html5/js/xpra_window.js +++ b/src/html5/js/Window.js @@ -1,7 +1,7 @@ /* - * Copyright (c) 2013 Antoine Martin + * Copyright (c) 2013-2016 Antoine Martin * Copyright (c) 2014 Joshua Higgins - * 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 index cf2607114d..7d1702c746 100644 --- 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;