visual_condition_builder 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29c7b9f0c2676e707c087a1f800b69bb51d2db65
-  data.tar.gz: 5a6f334ce10f479ed1b6a5666eab2d9a0d46b991
+  metadata.gz: 258bcbf53cb35fa5811d80ab924d2a5a08e4196b
+  data.tar.gz: 09385020d82b9437dbb18a3e010242d87eb2b681
 SHA512:
-  metadata.gz: c65a6b40f4fb6ed9e7a5afb218c0c5df3e4f45814c8fe798b1c5b19be56d2bfd38b18eb1dfb6fe1389291ad46db6522b01c6e551182631a2fb8d372dc7cba491
-  data.tar.gz: 4813cea48ec606be4c682b50e1b68b5358a3f6e7ec3c4efa1059465db216d90c391cb934fc33d6d812f3332ded2c0165bf9336e5c1107c9a17f7f08ec47753a3
+  metadata.gz: 983e3adc63c7e4ecb00b2f55191d7b6cb980287f26141765f964bf9f43ff2afd582f3d87f3c08225a5fdb1404c89e4b85034893f8ace6b0dbf228cdb7ea847fd
+  data.tar.gz: d4abea958cd6b65a1414b30754b3dafe33fa670240782cd71e60bba8b6a7e07cd6e074f61015547b47a725e82b8a0dd5c8a8cc4464c193516a51703b8652faed

data/app/assets/javascripts/visual_condition_builder/condition_builder.js

@@ -148,11 +148,11 @@
         }; //END fill_condition
 
         plugin.load_values = function (values) {
-            if (typeof values == 'string') {
+            if (typeof values == 'string' && !is_blank(values)) {
                 plugin.parameters.values = getJson(values);
             } else if (is_blank(values) && !is_blank(plugin.parameters.input)) {
                 $elInput = $(plugin.parameters.input);
-                if ($elInput.length > 0) {
+                if ($elInput.length > 0 && !is_blank($elInput.val())) {
                     plugin.parameters.values = JSON.parse($elInput.val());
                 }
             } else {

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -13,15 +13,7 @@ module VisualConditionBuilder
           dictionary: dictionary_klass.dictionary(get_dictionary_context(dictionary), self.request)
       }.deep_merge(hArgs)
 
-      capture do
-        concat(content_tag(:div, nil, id: container_name))
-        concat(javascript_tag(<<txtjs
-            $(document).ready(function () {
-              $('##{container_name}').conditionBuilder(#{builder_options.to_json});
-            });
-txtjs
-        ))
-      end
+      render partial: 'visual_condition_builder/builder_conditions', locals: {container_name: container_name, builder_options: builder_options.to_json.html_safe}
     end
 
     def conditions_fields(dictionary)
@@ -33,18 +25,6 @@ txtjs
     end
 
     private
-    def create_conditions_fields_item(fields)
-      fields.each do |field, attrs|
-        if field.is_a?(Hash) #GROUP
-          group_label = field.values.first
-          concat(content_tag(:li, group_label, class: 'dropdown-header'))
-          create_conditions_fields_item(attrs)
-        else
-          concat(content_tag(:li, link_to(attrs[:label], '#', class: 'add-condition-field', data: {field: field})))
-        end
-      end
-    end
-
     def get_dictionary_context(dictionary)
       dictionary.is_a?(Hash) ? dictionary.values.first : :default
     end

data/app/views/visual_condition_builder/_builder_conditions.html.erb

@@ -0,0 +1,6 @@
+<div id="<%= container_name %>"></div>
+<script>
+$(document).ready(function () {
+  $("#<%= container_name %>").conditionBuilder(<%= builder_options %>);
+});
+</script>

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Bruno Porto
@@ -100,6 +100,7 @@ files:
 - app/controllers/application_dictionary.rb
 - app/controllers/visual_condition_builder/application_controller.rb
 - app/helpers/visual_condition_builder/application_helper.rb
+- app/views/visual_condition_builder/_builder_conditions.html.erb
 - app/views/visual_condition_builder/_conditions_fields.html.erb
 - app/views/visual_condition_builder/_conditions_fields_item.html.erb
 - config/initializers/assets.rb