projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5105: Better assertion for tab-loading error display.
[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 a23a6d488045be7bc297aa217626e9d60cf23c02..63887b3ab970f3d75f4035169790e05752ea15a8 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/application.js
+++ b/
apps/workbench/app/assets/javascripts/application.js
@@
-23,15
+23,13
@@
//= 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 raphael
+//= require morris
+//= require jquery.number.min
//= 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(){
@@
-236,3
+234,7
@@
function showLoadingModal() {
function hideLoadingModal() {
$('#loading-modal').modal('hide');
}
function hideLoadingModal() {
$('#loading-modal').modal('hide');
}
+
+function hasHTML5History() {
+ return !!(window.history && window.history.pushState);
+}