rails-jquery-tokeninput 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 11c59b6682b7ce709c4a6a7998e8eb730cf0439a
-  data.tar.gz: fc4992bff17cf83dab322d113ee2358fbc1f2756
+  metadata.gz: 8a4f79fa35b87c22c8af4467bb288a1ab3136f52
+  data.tar.gz: baf408d8041aa9f4ac36bfcacfa3ec79d54eaf5b
 SHA512:
-  metadata.gz: a12f0be7d001714a49fd660d9aef5d11853ef722b1432372aea52c81cd4fe67cb2bf708530240999f12efb94b2cfdd203fe0a07fba5ee064d4ff8adb6274f2a0
-  data.tar.gz: 3164972f37173f5dddf259d39fa5794c75a8cf3908ab23b8574e827add64cb8d3a57ce95be77e94ca53756fa8ac5ea156fd1d87ecda994ececcf1d784821e899
+  metadata.gz: d033be6eae3381413005b14152e22a69b9c515a9a3b78224787cf84c234f155c72b97118ee4b19529beaca5201dab348cae83858dd5eaf5098bf6218ebbe1fd2
+  data.tar.gz: f1dc21b6e5dfa8023eae238d1339e754ec089f39bcd6f3f456c267f22237dc91c46a0bd30b955d0f5993418d3d83c299a070660b4633aac7dd092dbc61698d2b

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.5
+  - 2.2.0
 before_install: "gem update --system"
 install: "bundle install"
 script: "bundle exec rspec"

data/lib/assets/javascripts/rails-jquery-tokeninput.js

@@ -10,7 +10,7 @@ $(function() {
     $.each($('input[data-tokeninput]'), function(index, input) {
         var inputName = $(input).attr('name');
         var source = $(input).data('tokeninput').collection || DEFAULTS.source;
-        var options = $(input).data('tokeninput').options || DEFAULTS.options;
+        var options = $.extend({}, DEFAULTS.options, $(input).data('tokeninput').options);
 
         var addInput = function(value) {
             var inputItemName = inputName + '[]';

data/lib/rails/jquery/tokeninput/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Jquery
     module Tokeninput
-      VERSION = '0.2.4'
+      VERSION = '0.2.5'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-jquery-tokeninput
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Evgeny Li