anjlab-widgets 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce23c07ae07ffad959a9bdfaa5cd06d87c6acd4
-  data.tar.gz: 9c2b951f3394d1ee02661af03eec23e3a769c6aa
+  metadata.gz: 1ec99f00a18ca6d9718827c73d21a1c16ac0f7f0
+  data.tar.gz: 3fee3300ceb57043fd3bae398c700deb8802324f
 SHA512:
-  metadata.gz: bf80d6538c01a24730ef51b4068a16349d2bb19106d35427a07808ed68d7d50e672ddd66f55e5fb624ffb2b32a49fc88ba15f5c64d786181f96481fdf02e01e8
-  data.tar.gz: a49971d2a010d826d56fc6b8747ba9c7f89031c7c0842189c8dde65e1acc700e59c36154a6ad7c0f694b1ddce3f5d56c6252db83e550ce8d4dc64ff3acaeb2dc
+  metadata.gz: 722c8309b76f2466c26dad4ece94b3e79aaa912bb83e1cd5b45ba7cd99ad3c921f095dce616514527397e1b1585d946b1236eb669f39b04f3f55857608d3fc69
+  data.tar.gz: 9140eeaa92907c37f0b282a5dd22e4e4acf756f71b11899328d7b83cb67511503aef8b739cfc596d1b134a214f0e5986861ecd368a0f193ff5758c658eefefec

data/app/assets/javascripts/anjlab/timepicker.js.coffee

@@ -42,10 +42,12 @@ class Timepicker extends NativeRailsTimepicker
       blur: $.proxy(@hide, this)
     }
 
-    @step    = options.step || @element.data('date-time-step') || 30
-    @minTime = options.minTime || @element.data('date-time-min') || 9 * 60
-    @maxTime = options.maxTime || @element.data('date-time-max') || 20 * 60
-
+    @step      = options.step || @element.data('date-time-step') || 30
+    @startTime = options.startTime || (@element.data('date-time-start') || 0) * 60
+    @endTime   = options.endTime || (@element.data('date-time-end') || 24) * 60
+    @minTime   = options.minTime || (@element.data('date-time-min') || 9) * 60
+    @maxTime   = options.maxTime || (@element.data('date-time-max') || 20) * 60
+    
     @fillTimes()
     @update()
     @scrollPlaced = false
@@ -85,9 +87,9 @@ class Timepicker extends NativeRailsTimepicker
     @element.prop('value', @time)
 
   fillTimes: ->
-    timeCnt = 0
+    timeCnt = @startTime
     html = []
-    while timeCnt < 24 * 60
+    while timeCnt < @endTime
       mm = timeCnt % 60
       hh = Math.floor(timeCnt / 60)
       mm = (if mm < 10 then '0' else '') + mm

data/lib/anjlab-widgets/simple_form.rb

@@ -20,7 +20,7 @@ module Anjlab
           :value => Widgets::format_date(time),
           :required => input_html_options[:required],
           :class => "#{input_html_options[:date_class] || 'input-small'}"
-        }
+        }.merge(input_html_options)
 
         time_data = {
           "data-widget" => "timepicker",
@@ -28,7 +28,7 @@ module Anjlab
           :value => Widgets::format_time(time),
           :required => input_html_options[:required],
           :class => "#{input_html_options[:time_class] || 'input-small'}"
-        }
+        }.merge(input_html_options)
 
         case input_type
         when :datetime, :anjlab_datetime

data/lib/anjlab-widgets/version.rb

@@ -1,5 +1,5 @@
 module Anjlab
   module Widgets
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-widgets
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anjlab-bootstrap-rails