From 21bd551e948fe70794b27cc368e8d4a7eb53b024 Mon Sep 17 00:00:00 2001
From: Ramon Tayag <ramon.tayag@gmail.com>
Date: Thu, 3 Mar 2016 10:10:38 +0800
Subject: [PATCH] Fix issue with plutus requiring the jquery-ui files

jquery-ui change:
https://github.com/joliss/jquery-ui-rails/commit/774f8b3e2e5ae8b80515128dd0cdb5cde48dfc01

Fixes #58
---
 CHANGELOG.md                                  | 3 +++
 app/assets/javascripts/plutus/application.js  | 2 +-
 app/assets/stylesheets/plutus/application.css | 2 +-
 plutus.gemspec                                | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..7e6e6a57
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Not Released
+
+- Fix loading of jquery-ui files (Fixes https://github.com/mbulat/plutus/issues/58)
diff --git a/app/assets/javascripts/plutus/application.js b/app/assets/javascripts/plutus/application.js
index 9da3dcbd..58a0fdab 100644
--- a/app/assets/javascripts/plutus/application.js
+++ b/app/assets/javascripts/plutus/application.js
@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.datepicker
+//= require jquery-ui/datepicker
 //= require_tree .
diff --git a/app/assets/stylesheets/plutus/application.css b/app/assets/stylesheets/plutus/application.css
index ac26e950..0f67b72f 100644
--- a/app/assets/stylesheets/plutus/application.css
+++ b/app/assets/stylesheets/plutus/application.css
@@ -13,7 +13,7 @@
  *= require_tree .
  *= require bootstrap.min
  *= require bootstrap-theme.min
- *= require jquery.ui.datepicker
+ *= require jquery-ui/datepicker
  *= require_self
  */
 body { padding-top: 60px; }
diff --git a/plutus.gemspec b/plutus.gemspec
index da03319b..a4b1c90e 100644
--- a/plutus.gemspec
+++ b/plutus.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   ]
   s.add_dependency("rails", "~> 4.0")
   s.add_dependency("jquery-rails", ">= 3.0")
-  s.add_dependency("jquery-ui-rails", ">= 4.0")
+  s.add_dependency("jquery-ui-rails", ">= 4.2.2")
   s.add_development_dependency("yard")
   s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE", "Rakefile", "README.markdown"]
   s.homepage = %q{http://github.com/mbulat/plutus}