projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3781: Add browser->api/keepproxy angular app as Upload tab on collections#show
[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 1990b8b0f55c8d2497db67cae6d6da21f714663b..6b98fd93cc44cfd67023e12800294c501f74d5c0 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/application.js
+++ b/
apps/workbench/app/assets/javascripts/application.js
@@
-23,15
+23,10
@@
//= require bootstrap3-editable/bootstrap-editable
//= require bootstrap-tab-history
//= require wiselinks
//= require bootstrap3-editable/bootstrap-editable
//= require bootstrap-tab-history
//= require wiselinks
+//= require angular
//= require_tree .
jQuery(function($){
//= require_tree .
jQuery(function($){
- $.ajaxSetup({
- headers: {
- 'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
- }
- });
-
$(document).ajaxStart(function(){
$('.modal-with-loading-spinner .spinner').show();
}).ajaxStop(function(){
$(document).ajaxStart(function(){
$('.modal-with-loading-spinner .spinner').show();
}).ajaxStop(function(){