hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-24 00:34:07 +02:00
parent e711f9002e
commit 3bdb63f94e
10 changed files with 25 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
www/scripts/apps/admin/main/app.js
View File

@@ -22,32 +22,32 @@ define([
eventManager: _.extend({}, Backbone.Events)
};
var sessionActive = function() {
var pullNotifications = function (){
$.ajax({
type: "POST",
url: "/session/update/",
url: AdminApp.$scope.data("notif-url"),
dataType: 'json',
data: {
module : 3,
usr : AdminApp.$scope.data("usr")
},
error: function(){
window.setTimeout(function() {sessionActive();}, 10000);
window.setTimeout("pollNotifications();", 10000);
},
timeout: function(){
window.setTimeout(function() {sessionActive();}, 10000);
window.setTimeout("pollNotifications();", 10000);
},
success: function(data){
if(data) {
if (data) {
manageSession(data);
var t = 120000;
if(data.apps && parseInt(data.apps)>1) {
t = Math.round((Math.sqrt(parseInt(data.apps)-1) * 1.3 * 120000));
}
window.setTimeout(function() {sessionActive();}, t);
}
var t = 120000;
if (data.apps && parseInt(data.apps) > 1) {
t = Math.round((Math.sqrt(parseInt(data.apps)-1) * 1.3 * 120000));
}
window.setTimeout("pollNotifications();", t);
}
})
});
};
var create = function() {
@@ -77,7 +77,7 @@ define([
AdminApp.LeftView.activeTree();
AdminApp.LeftView.clickSelected();
window.setTimeout(function() {sessionActive();}, 15000);
window.setTimeout(function() {pullNotifications();}, 15000);
};
return {