projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 3b697a6aa992afbc36839ba9953ce63d16ca18b1..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);
@@
-88,7
+90,6
@@
jQuery(function($){
{dataType: 'json',
type: $(this).attr('data-remote-method'),
data: {
{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,6
+105,12
@@
jQuery(function($){
return false;
});
return false;
});
+ $(document).
+ on('ajax:complete ready', function() {
+ // See http://getbootstrap.com/javascript/#buttons
+ $('.btn').button();
+ });
+
HeaderRowFixer = function(selector) {
this.duplicateTheadTr = function() {
$(selector).each(function() {
HeaderRowFixer = function(selector) {
this.duplicateTheadTr = function() {
$(selector).each(function() {
@@
-128,7
+135,7
@@
jQuery(function($){
});
}
}
});
}
}
-
+
var fixer = new HeaderRowFixer('.table-fixed-header-row');
fixer.duplicateTheadTr();
fixer.fixThead();
var fixer = new HeaderRowFixer('.table-fixed-header-row');
fixer.duplicateTheadTr();
fixer.fixThead();
@@
-139,4
+146,4
@@
jQuery(function($){
fixer.duplicateTheadTr();
fixer.fixThead();
});
fixer.duplicateTheadTr();
fixer.fixThead();
});
-})
(jQuery)
;
+});