sortablelabel-js 2.2 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65f7a5079171fc4ef7f2cd422425f139e6b351b
-  data.tar.gz: 9abaaa646f8d8bf2ef89925ffea110d40e64cc5f
+  metadata.gz: d890b2d22bfe370e92b426d127c405fdc13576c5
+  data.tar.gz: 0810fec8bae3ba84dfc4808d20eeb7898e1e2ff1
 SHA512:
-  metadata.gz: 7719e1dcaea286c9129f7b3a747a0b6afecbb22e9440b28a409428b34f61cbf455a1ae7210cfc546a62302f161640371be506563a17433b24a0794cb16f55fe4
-  data.tar.gz: 3ed548f4f3bb6fd66c41adee6a31b653caf179aaf0afadcbcb236282ba62051b47068a04445d38b81e3a2eb50224ff1b0063530fda317182d5ef6088de0bc2c9
+  metadata.gz: 79fb54d22de5683cbedab7de923ebf2c6d7f612b2ea55ef3643351109ee9f0b46064d0ae946b24beb192064c241d03290d6e4ab61908ba998eccb83f2f4ab190
+  data.tar.gz: a3709cce2568a4fa9dcf83e37e37122b966a0e2f8e6d0bb9546a781254a971e6f56976b962384977e21d6055b946888050e58602763f125ab9673088d087c0be

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sortablelabel-js (2.2)
+    sortablelabel-js (2.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -42,6 +42,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/ZYMori
 Install dependencies lib
 ```
 npm run-script dependency
+bower install
 ```
 
 #### Step 2

data/bower.json

@@ -3,7 +3,7 @@
   "description": "Sortable label js dependencies",
   "main": "index.js",
   "authors": [
-    "Joe <ashzhouyue@gmail.com>"
+    "Ben <bzbnhang@gmail.com>"
   ],
   "license": "MIT",
   "homepage": "",
@@ -15,9 +15,9 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "^3.2.1",
-    "jasmine-jquery": "^2.1.1",
-    "jquery-sortable": "^0.9.13",
-    "jquery-ui": "^1.12.1"
+    "jquery": "1.11.1",
+    "jasmine-jquery": "2.1.1",
+    "jquery-sortable": "0.9.13",
+    "jquery-ui": "1.11.4"
   }
 }

data/lib/sortablelabel/js/version.rb

@@ -1,5 +1,5 @@
 module Sortablelabel
   module Js
-    VERSION = "2.2"
+    VERSION = "2.3"
   end
 end

data/vendor/assets/javascripts/sortable_label.coffee

@@ -16,7 +16,7 @@ class @SortableLabel
     @stop_callback  = @options["stop"]
     @initSortByPosition()
     @calStepLable()
-    if $(".sortable-label-#{@targetId}").size() == 0
+    if $(".sortable-label-#{@targetId}").length == 0
       $(document).on("nested:fieldAdded:#{@targetId}", (event) =>
         @calStepLable()
         if typeof(@stop_callback) == 'function'
@@ -85,7 +85,7 @@ class @SortableLabel
         # in case that new added field position value is initialized as null or '' or undefined
         all_fields.each((_, field_item) ->
           _position = $(field_item).find(_positionTarget).val()
-          if !_position || _position == '' || typeof _position != 'undefined'
+          if !_position || _position == '' || typeof _position == 'undefined'
             maxium_position += 1
             $(field_item).find(_positionTarget).val(maxium_position)
         )
@@ -94,14 +94,14 @@ class @SortableLabel
         all_fields.each((_, field_item) ->
           _position = $(field_item).find(_positionTarget).val()
           _is_removed = $(field_item).find(_option['removeField']).val()
-          if _is_removed == "false" || _is_removed == false
-            _is_removed = "false"
+          if _is_removed == "false" || _is_removed == false || _is_removed == "0"
+            _is_removed = false
           else
-            _is_removed = "true"
+            _is_removed = true
 
           # removed fields should be filtered
           # only unremoved fields will be sorted
-          if _is_removed == 'true'
+          if _is_removed
             all_removed_fields_info.push({
               position: _position,
               j_element: field_item
@@ -145,15 +145,16 @@ class @SortableLabel
     )
 
   calStepLable: ->
-    this.calLabel(this.options['removeField']+'[value=false]')
+    this.calLabel()
     if this.options['weekGroupLabelTarget']
       this.calWeekGroupLabel(this.options['weekGroupLabelTarget'])
 
-  calLabel: (target) ->
+  calLabel: ->
     _this = this
     $(@target.selector).each(->
       stepCount = 1
-      $(this).find(target).each( ->
+      $(this).find(_this.options['removeField']).each( ->
+        return if $(this).val() == 'true' || $(this).val() == '1'
         if($(this).closest('.fields').find('.remove_nested_fields').data('association') == _this.options['fieldName'])
           if _this.options['minimun'] >= stepCount
             $(this).closest('.fields').find('.remove_nested_fields').hide();
@@ -163,17 +164,12 @@ class @SortableLabel
           if typeof(_this.options['label']) == 'string'
             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)
+                $(this).closest('.fields').find(_this.options['labelTarget']).html("#{_this.options['label']} #{stepCount}")
             else
               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
+          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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortablelabel-js
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
 platform: ruby
 authors:
 - BenZhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake