From 094562e54b5c6a9af0df151f28996e860081bd47 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Wed, 18 Sep 2013 15:23:07 -0400 Subject: [PATCH] Update to latest JQuery and JQuery UI - closes #817 - also remove our custom ESC key handler and its eventstack plugin dependency since this is handled by default by jQuery --- .../webapp/modules/core/MOD-INF/controller.js | 23 +- main/webapp/modules/core/about.html | 2 +- .../modules/core/externals/jquery-1.10.2.js | 9789 ++++++++++++ .../core/externals/jquery-1.10.2.min.js | 6 + .../core/externals/jquery-1.10.2.min.map | 1 + .../core/externals/jquery-1.7.2.min.js | 4 - .../core/externals/jquery-migrate-1.2.1.js | 521 + .../externals/jquery-migrate-1.2.1.min.js | 2 + .../ui-lightness/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 260 -> 418 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 251 -> 312 bytes .../images/ui-bg_flat_10_000000_40x100.png | Bin 178 -> 205 bytes .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 104 -> 262 bytes .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 125 -> 348 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 207 bytes .../ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 3762 -> 5815 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 90 -> 278 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 129 -> 328 bytes .../images/ui-icons_222222_256x240.png | Bin 4369 -> 6922 bytes .../images/ui-icons_228ef1_256x240.png | Bin 4369 -> 4549 bytes .../images/ui-icons_ef8c08_256x240.png | Bin 4369 -> 4549 bytes .../images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 4549 bytes .../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 6299 bytes .../ui-lightness/jquery-ui-1.10.3.custom.css | 1177 ++ .../jquery-ui-1.10.3.custom.min.css | 7 + .../ui-lightness/jquery-ui-1.8.20.custom.css | 493 - .../jquery-ui/jquery-ui-1.10.3.custom.js | 12715 ++++++++++++++++ .../jquery-ui/jquery-ui-1.10.3.custom.min.js | 7 + .../jquery-ui/jquery-ui-1.8.20.custom.min.js | 125 - .../core/externals/jquery.eventstack-0.3.js | 94 - .../modules/core/scripts/util/dialog.js | 14 - main/webapp/modules/core/scripts/util/menu.js | 13 - 32 files changed, 24238 insertions(+), 755 deletions(-) create mode 100644 main/webapp/modules/core/externals/jquery-1.10.2.js create mode 100644 main/webapp/modules/core/externals/jquery-1.10.2.min.js create mode 100644 main/webapp/modules/core/externals/jquery-1.10.2.min.map delete mode 100644 main/webapp/modules/core/externals/jquery-1.7.2.min.js create mode 100644 main/webapp/modules/core/externals/jquery-migrate-1.2.1.js create mode 100644 main/webapp/modules/core/externals/jquery-migrate-1.2.1.min.js create mode 100644 main/webapp/modules/core/externals/jquery-ui/css/ui-lightness/images/animated-overlay.gif create mode 100644 main/webapp/modules/core/externals/jquery-ui/css/ui-lightness/jquery-ui-1.10.3.custom.css create mode 100644 main/webapp/modules/core/externals/jquery-ui/css/ui-lightness/jquery-ui-1.10.3.custom.min.css delete mode 100644 main/webapp/modules/core/externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.20.custom.css create mode 100644 main/webapp/modules/core/externals/jquery-ui/jquery-ui-1.10.3.custom.js create mode 100644 main/webapp/modules/core/externals/jquery-ui/jquery-ui-1.10.3.custom.min.js delete mode 100644 main/webapp/modules/core/externals/jquery-ui/jquery-ui-1.8.20.custom.min.js delete mode 100644 main/webapp/modules/core/externals/jquery.eventstack-0.3.js diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index 5b82da4fb..edceaa93a 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/main/webapp/modules/core/MOD-INF/controller.js @@ -306,10 +306,10 @@ function init() { module, [ - "externals/jquery-1.7.2.min.js", + "externals/jquery-1.10.2.min.js", + "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", - "externals/jquery.eventstack-0.3.js", - "externals/jquery-ui/jquery-ui-1.8.20.custom.min.js", + "externals/jquery-ui/jquery-ui-1.10.3.custom.js", "externals/date.js", "externals/jquery.i18n.js", @@ -353,7 +353,7 @@ function init() { "index/styles", module, [ - "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.20.custom.css", + "externals/jquery-ui/css/ui-lightness/jquery-ui-1.10.3.custom.css", "styles/jquery-ui-overrides.less", "styles/common.less", "styles/pure.css", @@ -381,11 +381,11 @@ function init() { "project/scripts", module, [ - "externals/jquery-1.7.2.min.js", + "externals/jquery-1.10.2.min.js", + "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", - "externals/jquery.eventstack-0.3.js", "externals/suggest/suggest-4_3.js", - "externals/jquery-ui/jquery-ui-1.8.20.custom.min.js", + "externals/jquery-ui/jquery-ui-1.10.3.min.js", "externals/imgareaselect/jquery.imgareaselect.js", "externals/date.js", "externals/jquery.i18n.js", @@ -452,7 +452,7 @@ function init() { module, [ "externals/suggest/css/suggest-4_3.min.css", - "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.20.custom.css", + "externals/jquery-ui/css/ui-lightness/jquery-ui-1.10.3.custom.css", "externals/imgareaselect/css/imgareaselect-default.css", "styles/jquery-ui-overrides.less", @@ -489,10 +489,11 @@ function init() { "preferences/scripts", module, [ - "externals/jquery-1.7.2.min.js", + "externals/jquery-1.10.2.min.js", + "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", "externals/suggest/suggest-4_3.js", - "externals/jquery-ui/jquery-ui-1.8.20.custom.min.js", + "externals/jquery-ui/jquery-ui-1.10.3.min.js", "externals/imgareaselect/jquery.imgareaselect.js", "externals/date.js", "externals/jquery.i18n.js", @@ -504,7 +505,7 @@ function init() { module, [ "externals/suggest/css/suggest-4_3.min.css", - "externals/jquery-ui/css/ui-lightness/jquery-ui-1.8.20.custom.css", + "externals/jquery-ui/css/ui-lightness/jquery-ui-1.10.3.custom.css", "styles/jquery-ui-overrides.less", "styles/common.less", "styles/pure.css", diff --git a/main/webapp/modules/core/about.html b/main/webapp/modules/core/about.html index d94d28f22..02f8a69d7 100644 --- a/main/webapp/modules/core/about.html +++ b/main/webapp/modules/core/about.html @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. } - +