Only use webshim for userload rerun form

sul-dlss · Jan 6, 2017 · 0469741 · 0469741
1 parent 805719f
commit 0469741
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/app/assets/javascripts/html5_webshim.js b/app/assets/javascripts/html5_webshim.js
@@ -1,5 +1,5 @@
 $(document).on('ready page:load', function() {
-  if (window.webshim) {
+  if (window.webshim && $('[data-behavior="rerun-date-picker"]').length > 0) {
     var webShimOptions = {
       lazyCustomMessages: true,
       replaceUI: true,
@@ -13,17 +13,8 @@ $(document).on('ready page:load', function() {
       }
     };
 
-    if ($('[data-behavior="rerun-date-picker"]').length === 0) {
-      webShimOptions.date.popover = {
-        position: {
-          my: 'center bottom',
-          at: 'center top',
-          collision: 'none'
-        }
-      };
-    }
-
     window.webshim.setOptions('forms-ext', webShimOptions);
     window.webshim.polyfill('forms-ext');
+    window.webshim.activeLang('en');
   }
 });
diff --git a/app/views/sal3_batch_requests_batches/new.html.erb b/app/views/sal3_batch_requests_batches/new.html.erb
@@ -79,13 +79,13 @@
         <div class='form-group row'>
           <%= f.label :batch_startdate, "Delivery start date:", class: 'col-sm-2 form-control-label' %>
           <div class='col-sm-10'>
-            <%= f.date_field 'batch_startdate', id: 'dp1', class: 'form-control', value: "#{DateTime.now.strftime('%d-%^b-%y')}" %>
+            <%= f.date_field 'batch_startdate', id: 'dp1', class: 'form-control' %>
           </div>
         </div>
         <div class='form-group row'>
           <%= f.label :batch_needbydate, "All items delivered by:", class: 'col-sm-2 form-control-label' %>
           <div class='col-sm-10'>
-            <%= f.date_field 'batch_needbydate', id: 'dp2', class: 'form-control', value: "#{DateTime.now.strftime('%d-%^b-%y')}" %>
+            <%= f.date_field 'batch_needbydate', id: 'dp2', class: 'form-control' %>
           </div>
         </div>
         <div class='indent'>