simple_form_extension 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c0c901f77313d4994125503b41485d4d73110d
-  data.tar.gz: b9195dec83b06e0c2381d553308afe21ffc2001e
+  metadata.gz: 58c0b2f6d645cc957beb0490999f19aa2fe2b311
+  data.tar.gz: 0a4babbd115696a168f07a2b86477de745e8c9cb
 SHA512:
-  metadata.gz: 0d0f105067cf002348b383c07ca61a3c0f33c0cc456bb9e115b6508f971fdd2ae3959a66c9c6ab624fb041b7e61a21eb7e49c387ea96aabc2b0c4dfccaca00b1
-  data.tar.gz: 9d9f8d0a464183ce41d859a9b2e9d729667903ccf88c6ab6c55eb6578479c71fb72788be38e8d7dafd85956b209119319872db97a2024fe479b3dc23bc973ce8
+  metadata.gz: 525267f1f89d731e5d8f54667aa980c516f376d76bc02237b4f213ee8993738e78f9da9801e0371d5660eb3f206aad376a71f909ba328cd1571b681fdc6aac8d
+  data.tar.gz: ddcf4d10d63dbd502e1ad5a7fb29c4a8f80786b04df719c2d0d17dc0321487e2f4cda687a3861028a8621ebf421a3e876bc74ffefefafa818b92f34a9a4b4f59

data/lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.en.yml

@@ -12,6 +12,10 @@ en:
         format:
           js: 'Y/m/d'
           rails: '%Y/%m/%d'
+      time:
+        format:
+          js: 'H:i'
+          rails: '%H:%M'    
       datetime:
         format:
           js: 'Y/m/d H:i'

data/lib/generators/simple_form_extension/templates/config/locales/simple_form_extension.fr.yml

@@ -8,6 +8,10 @@ fr:
       image:
         select: "Sélectionnez une image"
         change: "Changer"
+      time:
+        format:
+          js: 'H:i'
+          rails: '%H:%M'      
       date:
         format:
           js: 'd/m/Y'

data/lib/simple_form_extension/inputs.rb

@@ -11,7 +11,6 @@ module SimpleFormExtension
     autoload :FileInput
     autoload :ImageInput
     autoload :RedactorInput
-    autoload :AirRedactorInput
     autoload :SelectizeInput
   end
 end

data/lib/simple_form_extension/inputs/date_time_input.rb

@@ -9,28 +9,39 @@ module SimpleFormExtension
       	input_html_options[:class] << "form-control"
 
         input_html_options[:data] ||= {}
-        input_html_options[:data].merge!(
-          :'date-format' => _translate('date.format.js'),
-          :'datetime-format' => _translate('datetime.format.js'),
-          :'week-start-day' => _translate('shared.week_start_day')
-        )
+        input_html_options[:data].merge!(type_specific_option)
 
         if (value = object.send(attribute_name)) && !input_html_options.key?(:value)
           format = _translate("#{ input_type }.format.rails")
           input_html_options[:value] = I18n.l(value, format: format)
         end
 
-
         content_tag(:div, class: 'input-group') do
           @builder.text_field(attribute_name, input_html_options) +
 
           content_tag(:span, class: 'input-group-btn') do
             content_tag(:button, type: 'button', class: 'btn btn-default datetimepicker-trigger') do
-              content_tag(:i, '', class: 'fa fa-calendar')
+              content_tag(:i, '', class: "fa fa-#{ icon }")
             end
           end
         end
       end
+
+      private
+
+      def type_specific_option
+        options = { format: _translate("#{ input_type }.format.js") }
+
+        unless input_type == :time 
+          options[:'week-start-day'] = _translate('shared.week_start_day')
+        end
+
+        options
+      end
+
+      def icon
+        input_type == :time ? 'clock-o' : 'calendar'
+      end
     end
   end
 end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/vendor/assets/javascripts/simple_form_extension/datetimepicker.coffee

@@ -13,7 +13,7 @@ class DateTimePicker
   initializePicker: ->
     @$input.datetimepicker(
       lang: @locale
-      format: @$input.data('datetime-format')
+      format: @$input.data('format')
       dayOfWeekStart: @$input.data('week-start-day')
     )
 
@@ -25,10 +25,18 @@ class DatePicker extends DateTimePicker
     @$input.datetimepicker(
       lang: @locale
       timepicker: false
-      format: @$input.data('date-format')
+      format: @$input.data('format')
       dayOfWeekStart: @$input.data('week-start-day')
     )
 
+class TimePicker extends DateTimePicker
+  initializePicker: ->
+    @$input.datetimepicker(
+      lang: @locale
+      datepicker: false,
+      format: @$input.data('format')
+    )
+
 # Lazy initialization of date and datetime pickers
 onPageReady ->
   $('body').on 'click', 'input.datetime', (e) ->
@@ -44,4 +52,11 @@ onPageReady ->
   $('body').on 'click', '.date .datetimepicker-trigger', (e) ->
     $input = $(e.currentTarget).closest('.date').find('input.date')
     DatePicker.forInput($input, DatePicker).show()
-    
+    
+  $('body').on 'click', 'input.time', (e) ->
+    TimePicker.forInput($(e.currentTarget), TimePicker).show()
+
+  $('body').on 'click', '.time .datetimepicker-trigger', (e) ->
+    $input = $(e.currentTarget).closest('.time').find('input.time')
+    TimePicker.forInput($input, TimePicker).show()
+      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Alexandre Vasseur
@@ -118,7 +118,6 @@ files:
 - lib/simple_form_extension/components/popovers.rb
 - lib/simple_form_extension/ext/form_builder.rb
 - lib/simple_form_extension/inputs.rb
-- lib/simple_form_extension/inputs/air_redactor_input.rb
 - lib/simple_form_extension/inputs/boolean_input.rb
 - lib/simple_form_extension/inputs/collection_check_boxes_input.rb
 - lib/simple_form_extension/inputs/collection_radio_buttons_input.rb
@@ -167,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple extention for simple_form with, colorpiker, icon, fileupload, image

data/lib/simple_form_extension/inputs/air_redactor_input.rb

@@ -1,15 +0,0 @@
-module SimpleFormExtension
-  module Inputs
-    class AirRedactorInput < SimpleForm::Inputs::TextInput
-      def input(wrapper_options = nil)
-        @additional_classes ||= additional_classes
-        @additional_classes -= [input_type]
-
-        
-        input_html_options[:"data-air-redactor"] = true
-
-        super
-      end
-    end
-  end
-end