projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2681-new-inactive-user-notification
[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 dc7177060ed3e085756837e664368e400d6945cc..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/tooltip
//= require bootstrap/popover
//= require bootstrap/collapse
+//= require bootstrap/modal
+//= require bootstrap/button
//= require bootstrap3-editable/bootstrap-editable
//= require_tree .
//= require bootstrap3-editable/bootstrap-editable
//= require_tree .
@@
-27,7
+29,6
@@
jQuery(function($){
'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
}
});
'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
}
});
- $('.editable').editable();
$('[data-toggle=tooltip]').tooltip();
$('.expand-collapse-row').on('click', function(event) {
$('[data-toggle=tooltip]').tooltip();
$('.expand-collapse-row').on('click', function(event) {
@@
-41,6
+42,7
@@
jQuery(function($){
}
targets.fadeToggle(200);
});
}
targets.fadeToggle(200);
});
+
$(document).
on('ajax:send', function(e, xhr) {
$('.loading').fadeTo('fast', 1);
$(document).
on('ajax:send', function(e, xhr) {
$('.loading').fadeTo('fast', 1);
@@
-83,12
+85,11
@@
jQuery(function($){
parent().
find('>span').
append(new_tag_span).
parent().
find('>span').
append(new_tag_span).
- append(' ');
+ append('
');
$.ajax($(this).attr('data-remote-href'),
{dataType: 'json',
type: $(this).attr('data-remote-method'),
data: {
$.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
'link[head_uuid]': tag_head_uuid,
'link[link_class]': 'tag',
'link[name]': new_tag
@@
-104,11
+105,18
@@
jQuery(function($){
return false;
});
return false;
});
+ $(document).
+ on('ajax:complete ready', function() {
+ // See http://getbootstrap.com/javascript/#buttons
+ $('.btn').button();
+ });
+
HeaderRowFixer = function(selector) {
HeaderRowFixer = function(selector) {
- var tables = $(selector);
this.duplicateTheadTr = function() {
this.duplicateTheadTr = function() {
-
tables
.each(function() {
+
$(selector)
.each(function() {
var the_table = this;
var the_table = this;
+ if ($('>tbody>tr:first>th', the_table).length > 0)
+ return;
$('>tbody', the_table).
prepend($('>thead>tr', the_table).
clone().
$('>tbody', the_table).
prepend($('>thead>tr', the_table).
clone().
@@
-116,9
+124,9
@@
jQuery(function($){
});
}
this.fixThead = function() {
});
}
this.fixThead = function() {
-
tables
.each(function() {
+
$(selector)
.each(function() {
var widths = [];
var widths = [];
- $('> tbody > tr:eq(
0
) > td', this).each( function(i,v){
+ $('> tbody > tr:eq(
1
) > td', this).each( function(i,v){
widths.push($(v).width());
});
for(i=0;i<widths.length;i++) {
widths.push($(v).width());
});
for(i=0;i<widths.length;i++) {
@@
-127,10
+135,15
@@
jQuery(function($){
});
}
}
});
}
}
+
var fixer = new HeaderRowFixer('.table-fixed-header-row');
var fixer = new HeaderRowFixer('.table-fixed-header-row');
- fixer.fixThead();
fixer.duplicateTheadTr();
fixer.duplicateTheadTr();
+ fixer.fixThead();
$(window).resize(function(){
fixer.fixThead();
});
$(window).resize(function(){
fixer.fixThead();
});
-})(jQuery);
+ $(document).on('ajax:complete', function(e, status) {
+ fixer.duplicateTheadTr();
+ fixer.fixThead();
+ });
+});