From 7e5fe3d27f1921841f45b46dc508af133403c1f0 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Thu, 26 Sep 2013 10:50:12 +0100 Subject: Switch Javascript (bar admin) to be served with the asset pipline --- app/assets/javascripts/application.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 app/assets/javascripts/application.js (limited to 'app/assets/javascripts/application.js') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..f92f0562a --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,6 @@ +// ... +//= require jquery +//= require jquery-ui.min +//= require jquery.cookie +//= require general +//= require ba-throttle-debounce -- cgit v1.2.3 From 68a8a9945d73e22d19d58f89162f46c3d175fc58 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Mon, 25 Nov 2013 17:44:58 +0000 Subject: Remove jquery-ui; in a later commit we'll add it back via the gem The intention is to stop including our own custom build of jquery-ui but instead use the jquery-ui-rails gem, which works well with the asset pipeline. This commit should remove all traces of the old download of jquery-ui. --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/javascripts/application.js') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f92f0562a..f2413bde9 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,6 +1,5 @@ // ... //= require jquery -//= require jquery-ui.min //= require jquery.cookie //= require general //= require ba-throttle-debounce -- cgit v1.2.3 From f91d66d42f517f778cac130466b7cffc7fd8b085 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Mon, 25 Nov 2013 18:02:58 +0000 Subject: Use the jquery-rails-ui gem, just including the modules we need As far as I can tell, we only use the 'tabs' module in admin and 'datepicker' on the user-facing part of the site. The advantage of using this packaging of the gem is that its assets are in the gem, which simplifies things greatly - otherwise we'd end up doing something like rewrite the jquery-ui CSS to SCSS, referencing the image assets via sass-rails helpers or keep them in their expected paths in public or something. (Thanks to Louise Crow for pointing out the problem of just moving jquery-ui's image assets into the asset pipeline.) --- app/assets/javascripts/application.js | 1 + 1 file changed, 1 insertion(+) (limited to 'app/assets/javascripts/application.js') diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f2413bde9..d8aed6346 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,5 +1,6 @@ // ... //= require jquery +//= require jquery.ui.datepicker //= require jquery.cookie //= require general //= require ba-throttle-debounce -- cgit v1.2.3