Merge pull request #402 from coopdevs/remove_jquery_ui

Remove jquery-ui
coopdevs · Aug 16, 2018 · 4320971 · 4320971
2 parents 50f930d + 009250e
commit 4320971
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -31,7 +31,6 @@ gem 'rufus-scheduler', '~> 3.4.2'
 
 # Assets
 gem 'jquery-rails', '>= 4.2.0'
-gem 'jquery-ui-rails'
 gem 'bootstrap-sass'
 gem 'sass-rails', '~> 5.0.7'
 gem 'coffee-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -180,8 +180,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.3)
-      railties (>= 3.2.16)
     json (2.1.0)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
@@ -423,7 +421,6 @@ DEPENDENCIES
   hstore_translate
   http_accept_language (~> 2.1.1)
   jquery-rails (>= 4.2.0)
-  jquery-ui-rails
   kaminari (~> 1.1.1)
   letter_opener (= 1.4.1)
   localeapp (= 2.1.1)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -1,5 +1,3 @@
-#= require_self
-#= require datepicker
 #= require give_time
 #= require tags
 #= require mobile_app_libs

diff --git a/app/assets/javascripts/datepicker.js.coffee b/app/assets/javascripts/datepicker.js.coffee
diff --git a/app/assets/javascripts/libs.js b/app/assets/javascripts/libs.js
@@ -1,6 +1,5 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
 //= require jquery.validate
 //= require bootstrap
 //= require highcharts

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -1,7 +1,3 @@
-/*
- *= require_self
- */
-
 @import "variables";
 @import "bootstrap-sprockets";
 @import "bootstrap-custom";
@@ -312,11 +308,6 @@ ul.statistics li{
   padding-left: 1.5rem;
 }
 
-// if not navbar hidden datepicker in small windows
-.ui-datepicker{
-  z-index: 1000 !important;
-}
-
 // fields that contain an error
 .field_with_errors{
   color: red;

diff --git a/app/assets/stylesheets/libs.scss b/app/assets/stylesheets/libs.scss
@@ -1,4 +1,3 @@
 /*
-*= require jquery-ui
 *= require select2
 */
diff --git a/app/views/statistics/statistics_global_activity.html.erb b/app/views/statistics/statistics_global_activity.html.erb
@@ -28,14 +28,12 @@
     <form class="form-inline text-right">
       <div class="form-group">
         <input class="form-control"
-               id="datepicker_from"
+               type="date"
                name="ini"
-               placeholder="<%= t '.ini_date' %>"
                value="<%= params[:ini] %>">
         <input class="form-control"
-               id="datepicker_to"
+               type="date"
                name="fin"
-               placeholder="<%= t '.end_date' %>"
                value="<%= params[:fin] %>">
         <button class="btn btn-default" type="submit">
           <%= t '.show' %>