X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8d141d95a821f785f6f0619aebd3cf4a1ccdbca3..8dcb4daaa7e740f5957043321ccf2c1a7bd2ccb6:/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 3010d5fafa..cf0812adae 100644
--- 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').
- append(' ');
+ append(' ');
$(this).
parent().
find('>span').
append(new_tag_span).
- append(' ');
+ append(' ');
$.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();
- });
-
- $(document).
+ }).
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) {
@@ -180,10 +182,26 @@ jQuery(function($){
});
$(document).ready(function() {
- window.wiselinks = new Wiselinks();
+ /* When wiselinks is initialized, selection.js is not working. Since we want to stop
+ using selection.js in the near future, let's not initialize wiselinks for now. */
+
+ // window.wiselinks = new Wiselinks();
+
+ $(document).off('page:loading').on('page:loading', function(event, $target, render, url){
+ $("#page-wrapper").fadeOut(200);
+ });
+
+ $(document).off('page:redirected').on('page:redirected', function(event, $target, render, url){
+ });
+
+ $(document).off('page:always').on('page:always', function(event, xhr, settings){
+ $("#page-wrapper").fadeIn(200);
+ });
+
+ $(document).off('page:done').on('page:done', function(event, $target, status, url, data){
+ });
- $(document).off('page:loading').on('page:loading', function(event, url, target, render) {
- $("#page-wrapper").hide().fadeIn(200);
+ $(document).off('page:fail').on('page:fail', function(event, $target, status, url, error, code){
});
});