Merge pull request mbulat#61 from imacchiato/fix_jquery_load-58

Fix issue with plutus requiring the jquery-ui files
ndrmc · May 12, 2016 · 1510208 · 1510208
2 parents 7941fa1 + 21bd551
commit 1510208
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md 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
@@ -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
@@ -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
@@ -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}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Not Released

		- Fix loading of jquery-ui files (Fixes https://github.com/mbulat/plutus/issues/58)