Merge branch '2798-go-keep-client' into 1885-keep-proxy refs #1885

[arvados.git] / apps / workbench / app / assets / javascripts / application.js

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 92cce3e31c4d501645e0598f96a8135f5873f716..d66cb9224f0f703dfe8484b83b142d483d9b8901 100644 (file)
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -18,6 +18,8 @@
 //= require bootstrap/tooltip
 //= require bootstrap/popover
 //= require bootstrap/collapse
+//= require bootstrap/modal
+//= require bootstrap/button
 //= require bootstrap3-editable/bootstrap-editable
 //= require_tree .
 
@@ -27,7 +29,6 @@ jQuery(function($){
             'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
         }
     });
-    $('.editable').editable();
     $('[data-toggle=tooltip]').tooltip();
 
     $('.expand-collapse-row').on('click', function(event) {
@@ -41,6 +42,7 @@ jQuery(function($){
         }
         targets.fadeToggle(200);
     });
+
     $(document).
         on('ajax:send', function(e, xhr) {
             $('.loading').fadeTo('fast', 1);
@@ -78,17 +80,16 @@ jQuery(function($){
                 attr('data-tag-link-uuid', new_tag_uuid).
                 text(new_tag).
                 css('opacity', '0.2').
-                append('&nbsp;<a><i class="glyphicon glyphicon-trash"></i></a>&nbsp;');
+                append('&nbsp;<a title="Delete tag"><i class="glyphicon glyphicon-trash"></i></a>&nbsp;');
             $(this).
                 parent().
                 find('>span').
                 append(new_tag_span).
-                append(' ');
+                append('&nbsp; ');
             $.ajax($(this).attr('data-remote-href'),
                            {dataType: 'json',
                             type: $(this).attr('data-remote-method'),
                             data: {
-                                'link[head_kind]': 'arvados#collection',
                                 'link[head_uuid]': tag_head_uuid,
                                 'link[link_class]': 'tag',
                                 'link[name]': new_tag
@@ -104,15 +105,26 @@ jQuery(function($){
             return false;
         });
 
+    $(document).
+        on('ajax:complete ready', function() {
+            // See http://getbootstrap.com/javascript/#buttons
+            $('.btn').button();
+        });
+
     HeaderRowFixer = function(selector) {
-        var tables = $(selector);
         this.duplicateTheadTr = function() {
-            $('>tbody', tables).each(function(){
-                $(this).prepend($('thead>tr', this).clone().css('opacity:0'));
+            $(selector).each(function() {
+                var the_table = this;
+                if ($('>tbody>tr:first>th', the_table).length > 0)
+                    return;
+                $('>tbody', the_table).
+                    prepend($('>thead>tr', the_table).
+                            clone().
+                            css('opacity', 0));
             });
         }
         this.fixThead = function() {
-            tables.each(function() {
+            $(selector).each(function() {
                 var widths = [];
                 $('> tbody > tr:eq(1) > td', this).each( function(i,v){
                     widths.push($(v).width());
@@ -123,10 +135,15 @@ jQuery(function($){
             });
         }
     }
+
     var fixer = new HeaderRowFixer('.table-fixed-header-row');
-    fixer.fixThead();
     fixer.duplicateTheadTr();
+    fixer.fixThead();
     $(window).resize(function(){
         fixer.fixThead();
     });
-})(jQuery);
+    $(document).on('ajax:complete', function(e, status) {
+        fixer.duplicateTheadTr();
+        fixer.fixThead();
+    });
+});