projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3149: Propagate filters from remote->dialog->infinite. Fix tests.
[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 2ad7ae5dad519037e88fcc03ffb76f5a9473f26b..cf0812adae935d955a60b09719e8545dc1efbe8e 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/application.js
+++ b/
apps/workbench/app/assets/javascripts/application.js
@@
-107,12
+107,12
@@
jQuery(function($){
attr('data-tag-link-uuid', new_tag_uuid).
text(new_tag).
css('opacity', '0.2').
attr('data-tag-link-uuid', new_tag_uuid).
text(new_tag).
css('opacity', '0.2').
- append(' <
a title="Delete tag"><i class="glyphicon glyphicon-trash"></i></a>
');
+ append(' <
span class="removable-tag"><a title="Delete tag"><i class="fa fa-fw fa-trash-o"></i></a></span>
');
$(this).
parent().
find('>span').
append(new_tag_span).
$(this).
parent().
find('>span').
append(new_tag_span).
- append('
');
+ append(' ');
$.ajax($(this).attr('data-remote-href'),
{dataType: 'json',
type: $(this).attr('data-remote-method'),
$.ajax($(this).attr('data-remote-href'),
{dataType: 'json',
type: $(this).attr('data-remote-method'),
@@
-136,11
+136,13
@@
jQuery(function($){
on('ajax:complete ready', function() {
// See http://getbootstrap.com/javascript/#buttons
$('.btn').button();
on('ajax:complete ready', function() {
// See http://getbootstrap.com/javascript/#buttons
$('.btn').button();
- });
-
- $(document).
+ }).
on('ready ajax:complete', function() {
$('[data-toggle~=tooltip]').tooltip({container:'body'});
on('ready ajax:complete', function() {
$('[data-toggle~=tooltip]').tooltip({container:'body'});
+ }).
+ on('ready ajax:complete', function() {
+ // This makes the dialog close on Esc key, obviously.
+ $('.modal').attr('tabindex', '-1')
});
HeaderRowFixer = function(selector) {
});
HeaderRowFixer = function(selector) {