From f75caa7245350c451769a19d2b6c9308ff8d36cb Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Mon, 29 May 2017 14:12:36 +0200 Subject: [PATCH] Webclient overhaul (#2735) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate from protobuf.js 5.x to 6.x (remove long.js and bytebuffer.js) Upgrade jQuery from 1.x to 3.x Upgrade jQueryUI to 1.12.x Use minimized version of js libraries Disable debug messages Fix default value for Event_RoomSay’s RoomMessageType field --- common/pb/event_room_say.proto | 5 +- webclient/index.html | 14 +- webclient/js/bytebuffer.js | 3651 ---- .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 418 -> 0 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 312 -> 0 bytes .../js/images/ui-bg_flat_10_000000_40x100.png | Bin 205 -> 0 bytes .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 348 -> 0 bytes .../js/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes .../ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 5815 -> 0 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 278 -> 0 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 328 -> 0 bytes .../js/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../js/images/ui-icons_228ef1_256x240.png | Bin 4549 -> 0 bytes .../js/images/ui-icons_444444_256x240.png | Bin 0 -> 7006 bytes .../js/images/ui-icons_555555_256x240.png | Bin 0 -> 7074 bytes .../js/images/ui-icons_777620_256x240.png | Bin 0 -> 4676 bytes .../js/images/ui-icons_777777_256x240.png | Bin 0 -> 7013 bytes .../js/images/ui-icons_cc0000_256x240.png | Bin 0 -> 4632 bytes .../js/images/ui-icons_ef8c08_256x240.png | Bin 4549 -> 0 bytes .../js/images/ui-icons_ffd27a_256x240.png | Bin 4549 -> 0 bytes .../js/images/ui-icons_ffffff_256x240.png | Bin 6299 -> 6313 bytes webclient/js/jquery-1.11.3.js | 10351 ---------- webclient/js/jquery-3.2.1.min.js | 4 + webclient/js/jquery-ui-1.11.4.css | 1225 -- webclient/js/jquery-ui-1.11.4.js | 16617 ---------------- webclient/js/jquery-ui-1.12.1.min.css | 7 + webclient/js/jquery-ui-1.12.1.min.js | 13 + webclient/js/long.js | 1220 -- webclient/js/protobuf-6.7.0.min.js | 10 + webclient/js/protobuf.js | 5211 ----- webclient/webclient.js | 58 +- 32 files changed, 73 insertions(+), 38313 deletions(-) delete mode 100755 webclient/js/bytebuffer.js delete mode 100644 webclient/js/images/ui-bg_diagonals-thick_18_b81900_40x40.png delete mode 100644 webclient/js/images/ui-bg_diagonals-thick_20_666666_40x40.png delete mode 100644 webclient/js/images/ui-bg_flat_10_000000_40x100.png delete mode 100644 webclient/js/images/ui-bg_glass_100_f6f6f6_1x400.png delete mode 100644 webclient/js/images/ui-bg_glass_100_fdf5ce_1x400.png delete mode 100644 webclient/js/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 webclient/js/images/ui-bg_gloss-wave_35_f6a828_500x100.png delete mode 100644 webclient/js/images/ui-bg_highlight-soft_100_eeeeee_1x100.png delete mode 100644 webclient/js/images/ui-bg_highlight-soft_75_ffe45c_1x100.png delete mode 100644 webclient/js/images/ui-icons_222222_256x240.png delete mode 100644 webclient/js/images/ui-icons_228ef1_256x240.png create mode 100644 webclient/js/images/ui-icons_444444_256x240.png create mode 100644 webclient/js/images/ui-icons_555555_256x240.png create mode 100644 webclient/js/images/ui-icons_777620_256x240.png create mode 100644 webclient/js/images/ui-icons_777777_256x240.png create mode 100644 webclient/js/images/ui-icons_cc0000_256x240.png delete mode 100644 webclient/js/images/ui-icons_ef8c08_256x240.png delete mode 100644 webclient/js/images/ui-icons_ffd27a_256x240.png delete mode 100755 webclient/js/jquery-1.11.3.js create mode 100644 webclient/js/jquery-3.2.1.min.js delete mode 100644 webclient/js/jquery-ui-1.11.4.css delete mode 100644 webclient/js/jquery-ui-1.11.4.js create mode 100644 webclient/js/jquery-ui-1.12.1.min.css create mode 100644 webclient/js/jquery-ui-1.12.1.min.js delete mode 100755 webclient/js/long.js create mode 100644 webclient/js/protobuf-6.7.0.min.js delete mode 100755 webclient/js/protobuf.js diff --git a/common/pb/event_room_say.proto b/common/pb/event_room_say.proto index 122f0f45..b5d02c44 100644 --- a/common/pb/event_room_say.proto +++ b/common/pb/event_room_say.proto @@ -6,8 +6,9 @@ message Event_RoomSay { optional Event_RoomSay ext = 1002; } enum RoomMessageType { - Welcome = 1; // rooms welcome message - ChatHistory = 2; // rooms chat history message + UserMessage = 0; // user message + Welcome = 1; // rooms welcome message + ChatHistory = 2; // rooms chat history message } optional string name = 1; optional string message = 2; diff --git a/webclient/index.html b/webclient/index.html index 87677ded..27be8dfd 100755 --- a/webclient/index.html +++ b/webclient/index.html @@ -3,7 +3,7 @@ Cockatrice web client - + @@ -75,11 +75,9 @@ Loading cockatrice web client... - - - - - + + +