check update tag

@@ -1351,11 +1351,16 @@ $('body').on('click', '.delete-image-from-list', function(){
 
 $('body').on('click', '.delete-tag-from-list', function(){
     var $this = $(this),
+        $label = $this.closest('label'),
         url = $this.attr('href'),
         title = "Are you sure? If files are assigned to this tag, the assignment is removed.";
 
     bootbox.confirm(title, function(result) {
         if(result){
+            if($label.hasClass('active')){
+              $label.trigger('click');
+            }
+
             jQuery.ajax({
                 type: 'GET',
                 url: url,
@@ -2163,6 +2168,9 @@ jQuery(document).ready(function(){
         $('.modal').modal('hide'); 
         $('#gallery_image_' + data.id).find('.card-img-top').attr('src', data.link);
         $('#gallery_image_' + data.id).find('.card-title').text(data.title);
+        saveCurrentTags();
+        $('.tags-list-block').html(data.tag_list);
+        setCurrentTags();
       }else{
         $this.find('.error-message').html(data.message);
       }

+var currentChooseTags = [];
+
+var saveCurrentTags = function(){
+  $('.tags-list-block label.active').each(function(){
+    currentChooseTags.push($(this).data('value'));
+  });
+}
+
+var setCurrentTags = function(){
+  $('.tags-list-block label').each(function(){
+    if(currentChooseTags.indexOf($(this).data('value')) != -1){
+      $(this).addClass('active');
+    }
+  });
+}
+
 jQuery(document).ready(function(){
-  var loadImage = function($wrapper){
+  var loadImage = function($wrapper, update_tag){
     var url = $wrapper.data('url'),
         $loader = $wrapper.find('.loader-demo'),
         $images = $wrapper.find('.exist-image-list');
@@ -16,11 +32,16 @@ jQuery(document).ready(function(){
       type: 'POST',
       url: url,
       data: ({tags: mas}),
-      dataType: 'html',
+      dataType: 'json',
       success: function(data){
-        $images.html(data);
+        $images.html(data.images);
         $loader.addClass('not-visible');
-        $images.removeClass('not-visible');        
+        $images.removeClass('not-visible');     
+        if(update_tag){
+          saveCurrentTags();
+          $('.tags-list-block').html(data.tag_list);   
+          setCurrentTags();
+        }
       }
     });
   };
@@ -28,9 +49,9 @@ jQuery(document).ready(function(){
 
   if($('.image-list').length > 0){
     var $wrapper = $('.image-list');
-    loadImage($wrapper);
-    $wrapper.find('.filter label').click(function(e){
-      if(e.target.tagName != 'A'){
+    loadImage($wrapper, false);
+    $wrapper.on('click', '.filter label', function(e){
+      if(e.target.tagName != 'A' && e.target.tagName != 'I'){
         var $this = $(this);
         if($this.hasClass('active')){
           $this.removeClass('active');
@@ -43,14 +64,14 @@ jQuery(document).ready(function(){
         if($this.data('value') != 'all' && $this.hasClass('active')){
           $wrapper.find(".filter label.active[data-value=all]").removeClass('active');
         };      
-        loadImage($wrapper);
+        loadImage($wrapper, false);
       }
     });
   }
 
   $(window).bind('images:update', function(){
     if($('.image-list').length > 0){
-      loadImage($('.image-list'));
+      loadImage($('.image-list'), true);
     };
   });
 

@@ -48,10 +48,12 @@
 }
 
 .filter .btn-group-toggle > .btn{margin-bottom:5px;position:relative;}
-.filter .btn-group-toggle > .btn a, .filter .btn-group-toggle > .btn a:hover{text-decoration:none;position:absolute;top:-14px;right:2px;font-size:14px;line-height:14px;}
+.filter .btn-group-toggle > .btn a, .filter .btn-group-toggle > .btn a:hover{text-decoration:none;position:absolute;top:-16px;right:2px;font-size:14px;line-height:14px;}
 .filter .btn-group-toggle > .btn a{display:none;}
 .filter .btn-group-toggle > .btn:hover a{display:inline;}
 .checkbox-list{
   input{margin-right:3px;}
   label{margin-right:10px;}
-}
\ No newline at end of file
+}
+
+.block{display:block !important;}
\ No newline at end of file

@@ -13,7 +13,7 @@ module Kanjai
         collection = collection.tagged_with(params[:tags], :any => true)
       end
 
-      render partial: 'kanjai/admin/images/gallery_exist_images', locals: {collection: collection}
+      render json: {images: render_to_string(partial: 'kanjai/admin/images/gallery_exist_images', locals: {collection: collection}), tag_list: render_to_string(partial: 'kanjai/admin/images/tags')} 
     end
 
     def edit
@@ -34,7 +34,7 @@ module Kanjai
           @file.resize! 
 
         end
-        render json: {status: 'ok', id: @file.id, link: @file.preview_link, title: @file.title}
+        render json: {status: 'ok', id: @file.id, link: @file.preview_link, title: @file.title, tag_list: render_to_string(partial: 'kanjai/admin/images/tags')}
       else
         render json: {status: 'error', message: @file.errors.full_message}
       end

@@ -11,5 +11,7 @@ module Kanjai
       end
       render json: {status: 'ok', id: tag.id}
     end
+
+
   end
 end
\ No newline at end of file

+<label data-value='all' class="btn btn-primary active">All</label>
+<% ActsAsTaggableOn::Tag.most_used.each do |tag| %>
+  <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>">
+    <%= tag.name %>
+    <a class="delete-tag-from-list" href="<%= url_for(controller: 'tags', action: 'delete', id: tag.id) %>"><i class="fa fa-trash"></i></a>  
+  </label>
+<% end %>
\ No newline at end of file

@@ -32,7 +32,7 @@
               <label class="col-md-2 col-form-label">Tags</label>
               <div class="col-md-10">
                 <%= f.text_field :tag_list, class: 'form-control', data: {role: 'tagsinput'}, value: f.object.tag_list.join(', ') %>
-                <div class="form-text"><%= t('tag_input_help_text') %></div>
+                <div class="invalid-feedback block"><%= t('tag_input_help_text') %></div>
               </div>
             </div>
           </fieldset>

@@ -26,14 +26,8 @@
 
       <div class="mt-20 image-list"  data-url='<%= list_admin_images_url %>'>
         <div class="filter">
-          <div class="btn-group-toggle">
-            <label data-value='all' class="btn btn-primary active">All</label>
-            <% ActsAsTaggableOn::Tag.most_used.each do |tag| %>
-              <label data-value='<%= tag.name %>' class="btn btn-primary tag-item-<%= tag.id %>">
-                <%= tag.name %>
-                <a class="delete-tag-from-list" href="<%= url_for(controller: 'tags', action: 'delete', id: tag.id) %>"><i class="fa fa-times"></i></a>  
-              </label>
-            <% end %>
+          <div class="btn-group-toggle tags-list-block">
+            <%= render partial: 'kanjai/admin/images/tags' %>
           </div>
         </div>        
         <div class="loader-demo">

 module Kanjai
-  VERSION = "0.0.233"
+  VERSION = "0.0.234"
 end