date_picker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa4b0eba3cacf7a3a72cb27e394033a85be8358
-  data.tar.gz: 4fb84b783d2a013b4d4f23b34479d39d0083f5cb
+  metadata.gz: 8c40ea21533eb2e4444b52cb4e0cfa932c156cc0
+  data.tar.gz: 28366f171ef15da86eb93e5be78e7b0f346ead3b
 SHA512:
-  metadata.gz: 27250c963f03d51744668c8114e723b3a5e6d1d66b401eca319466552914b12a6a2e1fb6584f40e5d2c89f1cc4c16cef56dfbe2c3a5e5ada767321b038223ce2
-  data.tar.gz: 74d92ae46d2c691ac5644b967157fb08f79760314987e4fbc3ca99f2084acdcc5c4fc86063874a9892692c1c9ef31d5d9f33400c7df2529f8d7ce682e68db5a7
+  metadata.gz: de10065d0598bfb401f15d94eb514e5a4180ab3d8e044821b34a40c1c33dea664ec651ddf268437af915b1ead10dbe46d8e34c9d5e3a20c69e49e5dfba7b24e3
+  data.tar.gz: a64616062f28b76d59ba1668dcc95d2efe9617ca5e74de692536c135c7ad20f37142a96c87f7038c30d0e07e008b2401bf52e2f1473d8db701666ddf51a65c48

data/lib/date_picker/form_tag_helper.rb

@@ -23,11 +23,13 @@ module DatePicker
       end
       
       # Get Type format if not specified
+      format = nil
       if options[:format].present?
         format = options[:format]
-      else
+      elsif DatePicker.config.formats.present?
         format = DatePicker.config.formats[type]
       end
+      
       if format.blank? || !format.is_a?(String)
         case type
           when :date
@@ -52,6 +54,9 @@ module DatePicker
         style = :bootstrap
       end
       
+      
+      
+      
       path = File.join(File.dirname(__FILE__), "styles", style.to_s)
       
       require path

data/lib/date_picker/styles/bootstrap.rb

@@ -15,7 +15,7 @@ module DatePicker
       def template() 
         %{
           <div id="<%= input_id %>_container" class="input-group">
-            <div class="input-group-addon">
+            <div class="input-group-addon" style="cursor: pointer">
               <span class="glyphicon glyphicon-calendar"></span>
             </div>
             <%= input_html %>
@@ -30,7 +30,7 @@ module DatePicker
                 .on('dp.change', function(e) {
                   $('#<%= input_id %>_hidden').val(e.date.format('<%= data_format %>'));
                 }).data('DateTimePicker');
-                <% if time %> datepicker.date(moment.utc(new Date(<%= time %>))); <% end %>
+                <% if time %> datepicker.date(moment(new Date(<%= time %>))); <% end %>
             })();
           </script>
         }

data/lib/date_picker/version.rb

@@ -1,3 +1,3 @@
 module DatePicker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/dummy/app/models/event.rb

@@ -1,2 +1,9 @@
 class Event < ActiveRecord::Base
+  after_initialize :init_event
+  
+  def init_event
+    self.date||= Date.tomorrow
+    self.time||= Time.now + 1.hour
+  end
+  
 end

data/test/dummy/bower.json

@@ -14,7 +14,6 @@
     "tests"
   ],
   "dependencies": {
-    "eonasdan-bootstrap-datetimepicker": "~4.7.14",
     "jquery-ui": "~1.11.4",
     "bootstrap": "~3.3.4"
   }

data/test/dummy/config/application.rb

@@ -17,7 +17,8 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.default_locale = :de
+    config.time_zone = 'Berlin'
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
     config.active_record.raise_in_transactional_callbacks = true