From 1fb25fcd7c2796ae92ad4e03c57b11a28266e353 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Wed, 18 Sep 2013 18:43:19 -0400 Subject: [PATCH] Fix jQuery UI links, fall back to jQuery 1.9.1 as bundled with UI --- .../webapp/modules/core/MOD-INF/controller.js | 10 +- main/webapp/modules/core/about.html | 2 +- .../core/externals/jquery-1.10.2.min.js | 6 - .../core/externals/jquery-1.10.2.min.map | 1 - .../{jquery-1.10.2.js => jquery-1.9.1.js} | 5164 ++++++++--------- .../jquery-ui/jquery-ui-1.10.3.custom.js | 2260 +++++++- .../jquery-ui/jquery-ui-1.10.3.custom.min.js | 6 +- 7 files changed, 4753 insertions(+), 2696 deletions(-) delete mode 100644 main/webapp/modules/core/externals/jquery-1.10.2.min.js delete mode 100644 main/webapp/modules/core/externals/jquery-1.10.2.min.map rename main/webapp/modules/core/externals/{jquery-1.10.2.js => jquery-1.9.1.js} (88%) diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index edceaa93a..a0f96cb89 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/main/webapp/modules/core/MOD-INF/controller.js @@ -306,7 +306,7 @@ function init() { module, [ - "externals/jquery-1.10.2.min.js", + "externals/jquery-1.9.1.js", "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", "externals/jquery-ui/jquery-ui-1.10.3.custom.js", @@ -381,11 +381,11 @@ function init() { "project/scripts", module, [ - "externals/jquery-1.10.2.min.js", + "externals/jquery-1.9.1.js", "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", "externals/suggest/suggest-4_3.js", - "externals/jquery-ui/jquery-ui-1.10.3.min.js", + "externals/jquery-ui/jquery-ui-1.10.3.custom.js", "externals/imgareaselect/jquery.imgareaselect.js", "externals/date.js", "externals/jquery.i18n.js", @@ -489,11 +489,11 @@ function init() { "preferences/scripts", module, [ - "externals/jquery-1.10.2.min.js", + "externals/jquery-1.9.1.js", "externals/jquery-migrate-1.2.1.js", "externals/jquery.cookie.js", "externals/suggest/suggest-4_3.js", - "externals/jquery-ui/jquery-ui-1.10.3.min.js", + "externals/jquery-ui/jquery-ui-1.10.3.custom.js", "externals/imgareaselect/jquery.imgareaselect.js", "externals/date.js", "externals/jquery.i18n.js", diff --git a/main/webapp/modules/core/about.html b/main/webapp/modules/core/about.html index 02f8a69d7..6aa134412 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. } - +