simple_form_extension 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 946b7d8265779451e32f1032aa3b9ace6d8f02c4
-  data.tar.gz: 0bd6a400862b4f5fdea0b5fab2fd476c64ab0d27
+  metadata.gz: dce3e78a64dd2c77636f1d9a891d6863d6da048f
+  data.tar.gz: d4342009b4702683ce62bbc0382fd3ea27717441
 SHA512:
-  metadata.gz: aee6e469e6e1fec674d2aae34dd90cf4b8f5a7337b7f1e479b504573082de14bd1ca43fe2990b99da422524accf9066ed96cb3d1274af8dd2d9dd051bb69f84c
-  data.tar.gz: 1e5f4de04288e9789a897d2cd4e338a9fcaf4fa7b8854b68bd2f8b3cb6314d6a602d60d550539b9b0c36e603d5c3e4f20ef402db74b8ab13d14aced69de85514
+  metadata.gz: 6e9c2f6d5cb278850a4e5c97152c505ac83251442926e6b98adf16d97a193a1ab6585fbfcc07165132a8ee9db728e669fa5e5e48fe5be9ff18e2e016f9117b4e
+  data.tar.gz: 5ba0bceafadeeea0fbe1f114c425f5327aa7b043c7ae2d8b1ade47764763749fc2714f15f9eb1a16eab59fc3d6c685cc4049eb0d87e50cd900cc8dd49634e81f

data/lib/simple_form_extension/inputs/image_input.rb

@@ -13,7 +13,7 @@ module SimpleFormExtension
               <span class=\"fileinput-exists\">#{ _translate('image.change') }</span>
               #{@builder.file_field(attribute_name, input_html_options)}
             </div>
-            <button class=\"btn btn-danger fileinput-exists pull-right\" data-dismiss=\"fileinput\" type=\"button\"><i class=\"fa fa-times\"></i></button>
+            <button class=\"btn btn-danger fileinput-exists\" data-dismiss=\"fileinput\" type=\"button\"><i class=\"fa fa-times\"></i></button>
           </div>
           <div class=\"fileinput-preview thumbnail\">
             #{ image_tag }

data/lib/simple_form_extension/inputs/selectize_input.rb

@@ -33,12 +33,12 @@ module SimpleFormExtension
 
       def multi?
         (options.key?(:multi) && !!options[:multi]) ||
-          value.class.include?(Enumerable)
+          enumerable?(value)
       end
 
       def collection
         if (collection = options[:collection])
-          if collection.class.include?(Enumerable)
+          if enumerable?(collection)
             collection.map(&method(:serialize_option))
           else
             (object.send(collection) || []).map(&method(:serialize_option))
@@ -65,8 +65,10 @@ module SimpleFormExtension
       private
 
       def serialize_option(option)
-        if option.kind_of?(Hash) && options.key?(:text) && option.key?(:value)
+        if option.kind_of?(Hash) && option.key?(:text) && option.key?(:value)
           option
+        elsif option.kind_of?(ActiveRecord::Base)
+          { text: name_for(option), value: option.id }
         elsif !option.kind_of?(Hash)
           { text: option.to_s, value: option }
         else
@@ -83,6 +85,14 @@ module SimpleFormExtension
         # Return default block value or nil if no block was given
         block ? block.call : nil
       end
+
+      def enumerable?(object)
+        object.class.include?(Enumerable) || ActiveRecord::Relation === object
+      end
+
+      def name_for(option)
+        option.try(:name) || options.try(:title) || option.to_s
+      end
     end
   end
 end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/vendor/assets/javascripts/simple_form_extension.coffee

@@ -2,10 +2,13 @@
 #= require redactor-rails/langs/fr
 #= require redactor-rails/plugins
 #= require selectize
+#= require spinbox
 #= require jquery.datetimepicker
 #= require_self
 #= require_tree ./simple_form_extension
 
+$.fn.simpleForm = {}
+
 window.onPageReady = (callback) ->
   $(document).ready ->
     callback() if Turbolinks is undefined

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

@@ -43,4 +43,5 @@ onPageReady ->
 
   $('body').on 'click', '.date .datetimepicker-trigger', (e) ->
     $input = $(e.currentTarget).closest('.date').find('input.date')
-    DatePicker.forInput($input, DatePicker).show()
+    DatePicker.forInput($input, DatePicker).show()
+    

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

@@ -49,4 +49,3 @@ onPageReady ->
         lang: "fr"      
         
       $textArea.data('initialized.redactor', true)
-

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

@@ -43,13 +43,12 @@ class Selectize
         </div>
       """
 
-onPageReady ->
-  $selectizes = $('[data-selectize]')
-
-  return unless $selectizes.length
-
-  $('[data-selectize]').each (i, el) ->
+$.fn.simpleFormSelectize = ->
+  @each (i, el) ->
     $select = $(el)
     return if $select.data('simple-form:selectize')
     instance = new Selectize($select)
     $select.data('simple-form:selectize', instance)
+
+onPageReady ->
+  $('[data-selectize]').simpleFormSelectize()

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

@@ -0,0 +1,16 @@
+class Spinbox
+  constructor: (@$el) ->
+    @el = @$el[0]
+
+    @$el.spinbox()
+
+onPageReady ->
+  $spinbox = $('.spinner')
+
+  return unless $spinbox.length
+
+  $spinbox.each (i, el) ->
+    $spinner = $(el)
+    return if $spinner.data('simple-form:spinner')
+    instance = new Spinbox($spinner)
+    $spinner.data('simple-form:spinner', instance)

data/vendor/assets/javascripts/spinbox.js

@@ -0,0 +1,445 @@
+/*
+ * Fuel UX Spinbox
+ * https://github.com/ExactTarget/fuelux
+ *
+ * Copyright (c) 2014 ExactTarget
+ * Licensed under the BSD New license.
+ */
+
+// -- BEGIN UMD WRAPPER PREFACE --
+
+// For more information on UMD visit:
+// https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
+
+(function(factory) {
+  if (typeof define === 'function' && define.amd) {
+    // if AMD loader is available, register as an anonymous module.
+    define(['jquery'], factory);
+  } else {
+    // OR use browser globals if AMD is not present
+    factory(jQuery);
+  }
+}(function($) {
+  // -- END UMD WRAPPER PREFACE --
+
+  // -- BEGIN MODULE CODE HERE --
+
+  var old = $.fn.spinbox;
+
+  // SPINBOX CONSTRUCTOR AND PROTOTYPE
+
+  var Spinbox = function(element, options) {
+    this.$element = $(element);
+    this.$element.find('.btn').on('click', function(e) {
+      //keep spinbox from submitting if they forgot to say type="button" on their spinner buttons
+      e.preventDefault();
+    });
+    this.options = $.extend({}, $.fn.spinbox.defaults, options);
+    this.$input = this.$element.find('.spinner-input');
+    this.$element.on('focusin.fu.spinbox', this.$input, $.proxy(this.changeFlag, this));
+    this.$element.on('focusout.fu.spinbox', this.$input, $.proxy(this.change, this));
+    this.$element.on('keydown.fu.spinbox', this.$input, $.proxy(this.keydown, this));
+    this.$element.on('keyup.fu.spinbox', this.$input, $.proxy(this.keyup, this));
+
+    this.bindMousewheelListeners();
+    this.mousewheelTimeout = {};
+
+    if (this.options.hold) {
+      this.$element.on('mousedown.fu.spinbox', '.spinner-up', $.proxy(function() {
+        this.startSpin(true);
+      }, this));
+      this.$element.on('mouseup.fu.spinbox', '.spinner-up, .spinner-down', $.proxy(this.stopSpin, this));
+      this.$element.on('mouseout.fu.spinbox', '.spinner-up, .spinner-down', $.proxy(this.stopSpin, this));
+      this.$element.on('mousedown.fu.spinbox', '.spinner-down', $.proxy(function() {
+        this.startSpin(false);
+      }, this));
+    } else {
+      this.$element.on('click.fu.spinbox', '.spinner-up', $.proxy(function() {
+        this.step(true);
+      }, this));
+      this.$element.on('click.fu.spinbox', '.spinner-down', $.proxy(function() {
+        this.step(false);
+      }, this));
+    }
+
+    this.switches = {
+      count: 1,
+      enabled: true
+    };
+
+    if (this.options.speed === 'medium') {
+      this.switches.speed = 300;
+    } else if (this.options.speed === 'fast') {
+      this.switches.speed = 100;
+    } else {
+      this.switches.speed = 500;
+    }
+
+    this.lastValue = this.options.value;
+
+    this.render();
+
+    if (this.options.disabled) {
+      this.disable();
+    }
+  };
+
+  Spinbox.prototype = {
+    constructor: Spinbox,
+
+    destroy: function() {
+      this.$element.remove();
+      // any external bindings
+      // [none]
+      // set input value attrbute
+      this.$element.find('input').each(function() {
+        $(this).attr('value', $(this).val());
+      });
+      // empty elements to return to original markup
+      // [none]
+      // returns string of markup
+      return this.$element[0].outerHTML;
+    },
+
+    render: function() {
+      var inputValue = this.parseInput(this.$input.val());
+      var maxUnitLength = '';
+
+      // if input is empty and option value is default, 0
+      if (inputValue !== '' && this.options.value === 0) {
+        this.value(inputValue);
+      } else {
+        this.output (this.options.value);
+      }
+
+      if (this.options.units.length) {
+        $.each(this.options.units, function(index, value) {
+          if (value.length > maxUnitLength.length) {
+            maxUnitLength = value;
+          }
+        });
+      }
+
+    },
+
+    output: function(value, updateField) {
+      value = (value + '').split('.').join(this.options.decimalMark);
+      updateField = (updateField || true);
+      if (updateField) {
+        this.$input.val(value);
+      }
+
+      return value;
+    },
+
+    parseInput: function(value) {
+      value = (value + '').split(this.options.decimalMark).join('.');
+
+      return value;
+    },
+
+    change: function() {
+      var newVal = this.parseInput(this.$input.val()) || '';
+
+      if (this.options.units.length || this.options.decimalMark !== '.') {
+        newVal = this.parseValueWithUnit(newVal);
+      } else if (newVal / 1) {
+        newVal = this.options.value = this.checkMaxMin(newVal / 1);
+      } else {
+        newVal = this.checkMaxMin(newVal.replace(/[^0-9.-]/g, '') || '');
+        this.options.value = newVal / 1;
+      }
+      this.output (newVal);
+
+      this.changeFlag = false;
+      this.triggerChangedEvent();
+    },
+
+    changeFlag: function() {
+      this.changeFlag = true;
+    },
+
+    stopSpin: function() {
+      if (this.switches.timeout !== undefined) {
+        clearTimeout(this.switches.timeout);
+        this.switches.count = 1;
+        this.triggerChangedEvent();
+      }
+    },
+
+    triggerChangedEvent: function() {
+      var currentValue = this.value();
+      if (currentValue === this.lastValue) return;
+
+      this.lastValue = currentValue;
+
+      // Primary changed event
+      this.$element.trigger('changed.fu.spinbox', this.output(currentValue, false)); // no DOM update
+    },
+
+    startSpin: function(type) {
+
+      if (!this.options.disabled) {
+        var divisor = this.switches.count;
+
+        if (divisor === 1) {
+          this.step(type);
+          divisor = 1;
+        } else if (divisor < 3) {
+          divisor = 1.5;
+        } else if (divisor < 8) {
+          divisor = 2.5;
+        } else {
+          divisor = 4;
+        }
+
+        this.switches.timeout = setTimeout($.proxy(function() {
+          this.iterate(type);
+        }, this), this.switches.speed / divisor);
+        this.switches.count++;
+      }
+    },
+
+    iterate: function(type) {
+      this.step(type);
+      this.startSpin(type);
+    },
+
+    step: function(isIncrease) {
+      // isIncrease: true is up, false is down
+
+      var digits, multiple, currentValue, limitValue;
+
+      // trigger change event
+      if (this.changeFlag) {
+        this.change();
+      }
+
+      // get current value and min/max options
+      currentValue = this.options.value;
+      limitValue = isIncrease ? this.options.max : this.options.min;
+
+      if ( (isIncrease ? currentValue < limitValue : currentValue > limitValue) ) {
+        var newVal = currentValue + (isIncrease ? 1 : -1) * this.options.step;
+
+        // raise to power of 10 x number of decimal places, then round
+        if (this.options.step % 1 !== 0) {
+          digits = (this.options.step + '').split('.')[1].length;
+          multiple = Math.pow(10, digits);
+          newVal = Math.round(newVal * multiple) / multiple;
+        }
+
+        // if outside limits, set to limit value
+        if (isIncrease ? newVal > limitValue : newVal < limitValue) {
+          this.value(limitValue);
+        } else {
+          this.value(newVal);
+        }
+
+      } else if (this.options.cycle) {
+        var cycleVal = isIncrease ? this.options.min : this.options.max;
+        this.value(cycleVal);
+      }
+    },
+
+    value: function(value) {
+
+      if (value || value === 0) {
+        if (this.options.units.length || this.options.decimalMark !== '.') {
+          this.output(this.parseValueWithUnit(value + (this.unit || '')));
+          return this;
+
+        } else if (!isNaN(parseFloat(value)) && isFinite(value)) {
+          this.options.value = value / 1;
+          this.output (value + (this.unit ? this.unit : ''));
+          return this;
+
+        }
+      } else {
+        if (this.changeFlag) {
+          this.change();
+        }
+
+        if (this.unit) {
+          return this.options.value + this.unit;
+        } else {
+          return this.output(this.options.value, false); // no DOM update
+        }
+      }
+    },
+
+    isUnitLegal: function(unit) {
+      var legalUnit;
+
+      $.each(this.options.units, function(index, value) {
+        if (value.toLowerCase() === unit.toLowerCase()) {
+          legalUnit = unit.toLowerCase();
+          return false;
+        }
+      });
+
+      return legalUnit;
+    },
+
+    // strips units and add them back
+    parseValueWithUnit: function(value) {
+      var unit = value.replace(/[^a-zA-Z]/g, '');
+      var number = value.replace(/[^0-9.-]/g, '');
+
+      if (unit) {
+        unit = this.isUnitLegal(unit);
+      }
+
+      this.options.value = this.checkMaxMin(number / 1);
+      this.unit = unit || undefined;
+      return this.options.value + (unit || '');
+    },
+
+    checkMaxMin: function(value) {
+      // if unreadable
+      if (isNaN(parseFloat(value))) {
+        return value;
+      }
+      // if not within range return the limit
+      if (!(value <= this.options.max && value >= this.options.min)) {
+        value = value >= this.options.max ? this.options.max : this.options.min;
+      }
+      return value;
+    },
+
+    disable: function() {
+      this.options.disabled = true;
+      this.$element.addClass('disabled');
+      this.$input.attr('disabled', '');
+      this.$element.find('button').addClass('disabled');
+    },
+
+    enable: function() {
+      this.options.disabled = false;
+      this.$element.removeClass('disabled');
+      this.$input.removeAttr('disabled');
+      this.$element.find('button').removeClass('disabled');
+    },
+
+    keydown: function(event) {
+      var keyCode = event.keyCode;
+      if (keyCode === 38) {
+        this.step(true);
+      } else if (keyCode === 40) {
+        this.step(false);
+      }
+    },
+
+    keyup: function(event) {
+      var keyCode = event.keyCode;
+
+      if (keyCode === 38 || keyCode === 40) {
+        this.triggerChangedEvent();
+      }
+    },
+
+    bindMousewheelListeners: function() {
+      var inputEl = this.$input.get(0);
+      if (inputEl.addEventListener) {
+        //IE 9, Chrome, Safari, Opera
+        inputEl.addEventListener('mousewheel', $.proxy(this.mousewheelHandler, this), false);
+        // Firefox
+        inputEl.addEventListener('DOMMouseScroll', $.proxy(this.mousewheelHandler, this), false);
+      } else {
+        // IE <9
+        inputEl.attachEvent('onmousewheel', $.proxy(this.mousewheelHandler, this));
+      }
+    },
+
+    mousewheelHandler: function(event) {
+      var e = window.event || event; // old IE support
+      var delta = Math.max(-1, Math.min(1, (e.wheelDelta || -e.detail)));
+      var self = this;
+
+      clearTimeout(this.mousewheelTimeout);
+      this.mousewheelTimeout = setTimeout(function() {
+        self.triggerChangedEvent();
+      }, 300);
+
+      if (delta < 0) {
+        this.step(true);
+      } else {
+        this.step(false);
+      }
+
+      if (e.preventDefault) {
+        e.preventDefault();
+      } else {
+        e.returnValue = false;
+      }
+      return false;
+    }
+  };
+
+
+  // SPINBOX PLUGIN DEFINITION
+
+  $.fn.spinbox = function(option) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    var methodReturn;
+
+    var $set = this.each(function() {
+      var $this = $(this);
+      var data = $this.data('fu.spinbox');
+      var options = typeof option === 'object' && option;
+
+      if (!data) {
+        $this.data('fu.spinbox', (data = new Spinbox(this, options)));
+      }
+      if (typeof option === 'string') {
+        methodReturn = data[option].apply(data, args);
+      }
+    });
+
+    return (methodReturn === undefined) ? $set : methodReturn;
+  };
+
+  // value needs to be 0 for this.render();
+  $.fn.spinbox.defaults = {
+    value: 0,
+    min: 0,
+    max: 999,
+    step: 1,
+    hold: true,
+    speed: 'medium',
+    disabled: false,
+    cycle: false,
+    units: [],
+    decimalMark: '.'
+  };
+
+  $.fn.spinbox.Constructor = Spinbox;
+
+  $.fn.spinbox.noConflict = function() {
+    $.fn.spinbox = old;
+    return this;
+  };
+
+
+  // DATA-API
+
+  $(document).on('mousedown.fu.spinbox.data-api', '[data-initialize=spinbox]', function(e) {
+    var $control = $(e.target).closest('.spinner');
+    if (!$control.data('fu.spinbox')) {
+      $control.spinbox($control.data());
+    }
+  });
+
+  // Must be domReady for AMD compatibility
+  $(function() {
+    $('[data-initialize=spinbox]').each(function() {
+      var $this = $(this);
+      if (!$this.data('fu.spinbox')) {
+        $this.spinbox($this.data());
+      }
+    });
+  });
+
+  // -- BEGIN UMD WRAPPER AFTERWORD --
+}));
+// -- END UMD WRAPPER AFTERWORD --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexandre Vasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,6 +140,8 @@ files:
 - vendor/assets/javascripts/simple_form_extension/datetimepicker.coffee
 - vendor/assets/javascripts/simple_form_extension/redactor.coffee
 - vendor/assets/javascripts/simple_form_extension/selectize.coffee
+- vendor/assets/javascripts/simple_form_extension/spinbox.coffee
+- vendor/assets/javascripts/spinbox.js
 - vendor/assets/stylesheets/jquery.datetimepicker.css
 - vendor/assets/stylesheets/simple_form_extension.sass
 homepage: http://www.glyph.fr
@@ -162,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple extention for simple_form with, colorpiker, icon, fileupload, image