sortablelabel-js 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad6e133d3f37d035e43f162c125c6008744b714
-  data.tar.gz: 4ef18e451faf96a29c621fdac0ddcf6ce43caae4
+  metadata.gz: 84ede6e7b691a3c2aef076d3abc4b78f96266497
+  data.tar.gz: 50f2b75f3eef3b2ea66e93dcbbd3034946e58295
 SHA512:
-  metadata.gz: 4f96635dd62bdfcdbd2f09946f9aa06c0271a80ce77beca13da6d55be50ba3c1363cd4682fbf18cad0d9e981282d606389ff25d766db41dd3370cad06f9fdc77
-  data.tar.gz: c40918cd6948d5a3f4974de6b627062c86a760673f0565caaaf3250a6a66e4bc203385986b156ea5408b88b8eaa287cc3de2022a512c1badced49cd1773f2a91
+  metadata.gz: dc3132ed3982996f097ff85972946d71370cf69133bb255cd073d1721567de1e059afc87ecf2f37c629f8c5af9f316d14662c2900cc287501e73318f1d43de00
+  data.tar.gz: 4f3b8bb2ffdbe29260bf52cd2e4f9658b5c64c9d11f6a37db7961c28f3176afb31f8e8153937b45322e2afb445486745ca341b668f138ccb7a04809d40402f00

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    sortablelabel-js (1.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.15)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  sortablelabel-js!
+
+BUNDLED WITH
+   1.15.0

data/lib/sortablelabel/js/version.rb

@@ -1,5 +1,5 @@
 module Sortablelabel
   module Js
-    VERSION = "1.6"
+    VERSION = "1.7"
   end
 end

data/vendor/assets/javascripts/sortable_label.coffee

@@ -156,16 +156,18 @@ class @SortableLabel
             $(this).closest('.fields').find('.remove_nested_fields').show();
           $(this).closest('.fields').find(_this.options['positionTarget']).val(stepCount)
           if typeof(_this.options['label']) == 'string'
-            if _this.options['label'].trim() == 'Day'
-              $(this).closest('.fields').find(_this.options['labelTarget']).html(_this.dayOfWeek(stepCount - 1))
+            if _this.options['fieldName']
+              if $(this).parent().find('.remove_nested_fields').data('association') == _this.options['fieldName']
+                $(this).closest('.fields').find(_this.options['labelTarget']).html(_this.options['label'] + stepCount)
             else
-              if _this.options['fieldName']
-                if $(this).parent().find('.remove_nested_fields').data('association') == _this.options['fieldName']
-                  $(this).closest('.fields').find(_this.options['labelTarget']).html(_this.options['label'] + stepCount)
-              else
-                alert("Field name can't be empty!")
+              alert("Field name can't be empty!")
           else if typeof(_this.options['label']) == 'function'
             $(this).closest('.fields').find(_this.options['labelTarget']).html(_this.options['label'].call($(this).closest('.fields').find(_this.options['labelTarget']), stepCount))
+          else if _this.options['label'] == false
+            if !$(this).closest('.fields').find(_this.options['labelTarget']).data('label')
+              labelContent = $(this).closest('.fields').find(_this.options['labelTarget']).text()
+              $(this).closest('.fields').find(_this.options['labelTarget']).data('label', labelContent)
+            $(this).closest('.fields').find(_this.options['labelTarget']).html("#{$(this).closest('.fields').find(_this.options['labelTarget']).data('label')}")          
           else
             if !$(this).closest('.fields').find(_this.options['labelTarget']).data('label')
               labelContent = $(this).closest('.fields').find(_this.options['labelTarget']).text()
@@ -217,9 +219,6 @@ class @SortableLabel
       return index if _item.name is item
     return -1
 
-  dayOfWeek: (dayIndex) ->
-    ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"][dayIndex]
-
 (($) ->
   $.fn.sortableLabel = (options) ->
     new SortableLabel(this, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortablelabel-js
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Joe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console