sortablelabel-js 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f370c6a7e8cd062bacb56116186ad205d0850e7
-  data.tar.gz: c8fd7f3a6d6b2be042f51225d6dd4ccba57a3d48
+  metadata.gz: 133834335558558247a311078d3b4b37fefa539b
+  data.tar.gz: dc23c8b48047fcefb1cd6e1e4dae9e314221e752
 SHA512:
-  metadata.gz: 491aa937af69e1268b1e5b68aab8a6637ecc4f5070e0e6a64c92db4ec1451a22c36c3e502261ad5a32490f8e3c6ff74ad74189c7f63a0a88ee87866160f7cdc6
-  data.tar.gz: 2f6d18d4c164cdfa675f49f48f617323e48e1fb2387a5e9bb85d2f74b1b81f538f724ed4e54be6f64f8ced0bb16fd5e33c3f9e2e4c56d53fd9619beefdfbf2a2
+  metadata.gz: 6115e5e420c318138ec88640596e3944e954cb4c0e7e6f9d179069b0695cb9a3fc8f93835b70d486df775822ce7d8963ca0ac79fa90d423235cc028bc7ad7fa6
+  data.tar.gz: 70a4c4f4fd9360c0dd173efe9616be2a3601ebb0de8041437b6357c50a543d6e024d1488a7c28264c75ef9b363abc20e0911d7e0b0f85bfaca55bd32eecc35dd

data/lib/sortablelabel/js/version.rb

@@ -1,5 +1,5 @@
 module Sortablelabel
   module Js
-    VERSION = "1.3"
+    VERSION = "1.4"
   end
 end

data/vendor/assets/javascripts/sortable_label.coffee

@@ -39,7 +39,7 @@ class @SortableLabel
       items: @options['sortableItem']
       placeholder: "ui-state-highlight"
       start: (event, ui)->
-        $(this).find('.ui-state-highlight').css('height', $(ui.item).css('height'))        
+        $(this).find('.ui-state-highlight').css('height', $(ui.item).css('height'))
       stop: =>
         @calStepLable()
         if typeof(@stop_callback) == 'function'
@@ -57,10 +57,13 @@ class @SortableLabel
     @target.each((i, sub_target) ->
       all_fields = $(sub_target).find(_option['sortableItem'])
       _positionTarget = _option['positionTarget']
-      all_fields_info = []
+      all_remain_fields_info = []
+      all_removed_fields_info = []
       maxium_position = 1
 
       if all_fields.length > 0
+
+        # get the maxinum_position
         all_fields.each((index, field_item) ->
           _position = $(field_item).find(_positionTarget).val()
           if _position && _position != '' && typeof _position != 'undefined'
@@ -68,23 +71,65 @@ class @SortableLabel
             if _position >= maxium_position
               maxium_position = _position
         )
+
+        # in case that new added field position value is initialized as null or '' or undefined
         all_fields.each((index, field_item) ->
-          _position = parseInt($(field_item).find(_positionTarget).val(), 10)
-          if typeof(_position) == 'undefined'
-            _position = maxium_position
+          _position = $(field_item).find(_positionTarget).val()
+          if !_position || _position == '' || typeof _position != 'undefined'
             maxium_position += 1
-          all_fields_info.push({
-            position: _position,
-            j_element: field_item
-          })
+            $(field_item).find(_positionTarget).val(maxium_position)
+        )
+
+        # filter removed fields and remain fields
+        all_fields.each((index, 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"
+          else
+            _is_removed = "true"
+
+          # removed fields should be filtered
+          # only unremoved fields will be sorted
+          if _is_removed == 'true'
+            all_removed_fields_info.push({
+              position: _position,
+              j_element: field_item
+            })
+          else
+            all_remain_fields_info.push({
+              position: _position,
+              j_element: field_item
+            })
         )
 
-        if all_fields_info.length > 0
-          all_fields_info.sort((a, b) -> 
+        # 1. go through sorted array to check if a field is of same position as previous fields
+        # 2. if so, update the position of later one as max position + 1
+        if all_remain_fields_info.length > 0
+
+          _tmp_remain_fields_info = all_remain_fields_info.slice()
+          for field, key in _tmp_remain_fields_info
+            current_position = field.position
+            for previous_field, previous_key in _tmp_remain_fields_info
+              tmp_position = previous_field.position
+              if tmp_position == current_position && previous_key < key
+                maxium_position += 1
+                all_remain_fields_info[key].position = maxium_position
+
+          all_remain_fields_info.sort((a, b) ->
             return a.position - b.position
           )
+
+          # set remain fields position value as the acutal position in html page
+          for field, key in all_remain_fields_info
+            all_remain_fields_info[key].position = key + 1
+
         _target = $(sub_target)
-        all_fields_info.forEach((item, index) ->
+        all_remain_fields_info.forEach((item, index) ->
+          _target.append(item.j_element)
+        )
+
+        all_removed_fields_info.forEach((item, index) ->
           _target.append(item.j_element)
         )
     )
@@ -111,8 +156,8 @@ 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['label'].trim() == 'Day'
+              $(this).closest('.fields').find(_this.options['labelTarget']).html(_this.dayOfWeek(stepCount - 1))
             else
               if _this.options['fieldName']
                 if $(this).parent().find('.remove_nested_fields').data('association') == _this.options['fieldName']
@@ -122,7 +167,7 @@ class @SortableLabel
           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))
           stepCount += 1
-      )      
+      )
     )
     if typeof(@stop_callback) == 'function'
       @stop_callback();
@@ -173,4 +218,4 @@ class @SortableLabel
 (($) ->
   $.fn.sortableLabel = (options) ->
     new SortableLabel(this, options)
-)(jQuery)
+)(jQuery)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortablelabel-js
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Joe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler