Fix styles, add new params, remove init script (#9)

* Remove invalid css styles and add new params * fix wrap class params and add new param for disabel all wrap classes
distroid · Sep 27, 2017 · 8d75126 · 8d75126
1 parent 199c24f
commit 8d75126
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -129,7 +129,8 @@ Script automaticly will be replace `{{id}}` param to selected value.
 `label`             | string            | From object
 `value`             | mixed             | From object
 `placeholder`       | string            | --
-`wrap_class`        | string            | --
+`wrap_class`        | string \| false   | --
+`wrap_class_only`   | true \| false     | false
 `label_class`       | string            | --
 `input_html[class]` | string            | --
 `required`          | true \| false     | From object

diff --git a/app/assets/javascripts/selectize-ajax.coffee b/app/assets/javascripts/selectize-ajax.coffee
@@ -83,10 +83,10 @@ window.SelectizeAjax = class SelectizeAjax
     $(@options.add_modal).on 'hidden.bs.modal, show.bs.modal', ->
       $(this).find('form')[0].reset() if $(this).find('form').length > 0
 
-      $('.error').each ->
+      $(this).find('.error').each ->
         $(this).remove()
 
-      $('.field_with_errors').each ->
+      $(this).find('.field_with_errors').each ->
         $(this).removeClass 'field_with_errors'
 
   ajax_edit_complete_script: () ->
@@ -112,6 +112,7 @@ window.SelectizeAjax = class SelectizeAjax
         .closest('.selectize-ajax-wrapper')
         .addClass('selectize-ajax-wrapper--empty')
     else
+      $(".edit-#{@options.resource_id}").show()
       $(".edit-#{@options.resource_id}").attr(
         'href',
         @options.edit_resource_template.replace('{{id}}', $("##{@options.resource_id}").val())

diff --git a/app/assets/stylesheets/selectize-ajax.css b/app/assets/stylesheets/selectize-ajax.css
@@ -1,18 +1,9 @@
-.input-group-btn .btn-remote {
-}
-
 .selectize-input-group {
   position: relative;
   display: table;
   border-collapse: separate;
 }
 
-.selectize-ajax-wrapper {
-  position: relative;
-  display: flex;
-  align-items: flex-end;
-}
-
 .selectize-ajax-wrapper.form-group {
   flex: 1;
   margin-left: 0;

diff --git a/app/views/selectize_ajax/_tag.html.erb b/app/views/selectize_ajax/_tag.html.erb
@@ -32,7 +32,8 @@
         <% if control.can_edit? %>
           <%= link_to control.options.edit_path,
             class: "btn btn-primary btn-remote edit-#{control.resource_id} #{control.options.edit_button_class}",
-            data: { toggle: 'modal', target: control.options.edit_modal } do %>
+            data: { toggle: 'modal', target: control.options.edit_modal },
+            style: ('display:none;' if control.value.blank?) do %>
             <span class="glyphicon glyphicon-edit"></span>
             <%= control.options.edit_button_text %>
           <% end %>

diff --git a/lib/selectize/ajax/core/control.rb b/lib/selectize/ajax/core/control.rb
@@ -61,10 +61,13 @@ def field_required?
     end
 
     def wrap_classes
+      return if options.wrap_class == false
+      return options.wrap_class if options.wrap_class_only
+
       classes = [options.wrap_class]
       classes << 'selectize-input-group' if can_add?
       classes << (options.horizontal ? 'col-sm-9' : 'col-sm-12')
-      classes.reject!(&:blank?).join(' ')
+      classes.compact.reject(&:blank?).join(' ')
     end
 
     def has_error?

diff --git a/lib/selectize/ajax/core/script.rb b/lib/selectize/ajax/core/script.rb
@@ -13,11 +13,12 @@ def call
     private
 
     def js_script_tag
-      "<script type=\"text/javascript\">
-        $(function(event) {
+      "<script type=\"text/javascript\" id=\"sj-#{control.resource_id}-script\">
+        $(function() {
           setTimeout(function() {
             obj = new window.SelectizeAjax(#{tag_options.to_json});
             SJCollection['#{control.resource_id}'] = obj;
+            $('#sj-#{control.resource_id}-script').remove();
           });
         });
       </script>"

diff --git a/lib/selectize/ajax/core/settings.rb b/lib/selectize/ajax/core/settings.rb
@@ -25,6 +25,7 @@ def default_options
         search_param: 'q',
         placeholder: nil,
         wrap_class: '',
+        wrap_class_only: false,
         label_class: '',
         add_button_class: '',
         edit_button_class: '',

diff --git a/lib/selectize/ajax/version.rb b/lib/selectize/ajax/version.rb
@@ -1,5 +1,5 @@
 module Selectize
   module Ajax
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end