SVN merge r763.
This commit is contained in:
parent
1a8d59d9cf
commit
a7f19281ff
Notes:
subgit
2018-03-07 17:59:06 +01:00
r764 www/branches/life
30
www/misc.js
30
www/misc.js
@ -131,6 +131,11 @@ var config = {
|
||||
},
|
||||
networkBlacklist: ['NL', 'X5'],
|
||||
},
|
||||
tab: {
|
||||
active: 0,
|
||||
disabled: [2],
|
||||
max: 4,
|
||||
},
|
||||
};
|
||||
var networkURL = {
|
||||
GE: 'http://dx.doi.org/10.14470/TR560404',
|
||||
@ -175,6 +180,11 @@ $(document).ready(function() {
|
||||
if ( Number(parameters['timespan']) ) {
|
||||
config['map']['timespan'] = Number(parameters['timespan']);
|
||||
};
|
||||
if ( Number(parameters['tab']) ) {
|
||||
if ( Number(parameters['tab']) < config['tab']['max'] ) {
|
||||
config['tab']['active'] = Number(parameters['tab']);
|
||||
};
|
||||
};
|
||||
|
||||
// AJAX setup
|
||||
$.ajaxSetup({timeout: config['ajax']['timeout']});
|
||||
@ -184,8 +194,8 @@ $(document).ready(function() {
|
||||
|
||||
// create tabs
|
||||
$('#tabs').tabs({
|
||||
active: 0,
|
||||
disabled: [2],
|
||||
active: config['tab']['active'],
|
||||
disabled: config['tab']['disabled'],
|
||||
activate: function( event, ui ) { ui['newPanel'].find('table').trigger("update", [true]); },
|
||||
});
|
||||
// create accordions
|
||||
@ -195,12 +205,12 @@ $(document).ready(function() {
|
||||
heightStyle: 'content',
|
||||
animate: 200,
|
||||
});
|
||||
// spinner
|
||||
$(document).bind("ajaxSend", function() {
|
||||
$("#spinner").show();
|
||||
console.log('Starting Spinner at '+Date());
|
||||
}).bind("ajaxStop", function() {
|
||||
$("#spinner").hide();
|
||||
console.log('Stopping Spinner at '+Date());
|
||||
});
|
||||
// spinner
|
||||
$(document).bind("ajaxSend", function() {
|
||||
$("#spinner").show();
|
||||
console.log('Starting Spinner at '+Date());
|
||||
}).bind("ajaxStop", function() {
|
||||
$("#spinner").hide();
|
||||
console.log('Stopping Spinner at '+Date());
|
||||
});
|
||||
});
|
Loading…
Reference in New Issue
Block a user