YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Allow API connections without paired websocket

Browse source
This commit is contained in:
kload 2014-06-08 13:55:40 +00:00
parent 2bed7f8cd0
commit bba105c228
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
js/app.js
View file

@ -109,26 +109,10 @@ app = Sammy('#main', function (sam) {
}, },
// API call // API call
api: function(uri, callback, method, data) { api: function(uri, callback, method, data, websocket) {
c = this; c = this;
// Open a WebSocket connection to retrieve live messages from the moulinette call = function(uri, callback, method, data) {
ws = new WebSocket('wss://'+ store.get('url') +'/messages');
ws.onmessage = function(evt) {
console.log(evt.data);
$.each($.parseJSON(evt.data), function(k, v) {
c.flash(k, v);
});
}
// If not connected, WebSocket connection will raise an error, but we do not want to interrupt API request
ws.onerror = ws.onopen;
ws.onclose = function() {
store.clear('flash');
}
ws.onopen = function(evt) {
method = typeof method !== 'undefined' ? method : 'GET'; method = typeof method !== 'undefined' ? method : 'GET';
data = typeof data !== 'undefined' ? data : {}; data = typeof data !== 'undefined' ? data : {};
if (window.navigator && window.navigator.language && (typeof data.locale === 'undefined')) { if (window.navigator && window.navigator.language && (typeof data.locale === 'undefined')) {
@ -241,6 +225,32 @@ app = Sammy('#main', function (sam) {
}; };
}); });
} }
websocket = typeof websocket !== 'undefined' ? websocket : true;
if (websocket) {
// Open a WebSocket connection to retrieve live messages from the moulinette
ws = new WebSocket('wss://'+ store.get('url') +'/messages');
ws.onmessage = function(evt) {
console.log(evt.data);
$.each($.parseJSON(evt.data), function(k, v) {
c.flash(k, v);
});
}
// If not connected, WebSocket connection will raise an error, but we do not want to interrupt API request
ws.onerror = ws.onopen;
ws.onclose = function() {
store.clear('flash');
}
ws.onopen = call(uri, callback, method, data);
} else {
call(uri, callback, method, data);
}
}, },
// Render view (cross-browser) // Render view (cross-browser)
@ -404,7 +414,7 @@ app = Sammy('#main', function (sam) {
} else { } else {
c.redirect('#/'); c.redirect('#/');
} }
}, 'POST', params); }, 'POST', params, false);
// } else { // } else {
// c.flash('fail', y18n.t('non_compatible_api')); // c.flash('fail', y18n.t('non_compatible_api'));
// c.redirect('#/login'); // c.redirect('#/login');
@ -419,7 +429,7 @@ app = Sammy('#main', function (sam) {
store.set('path', '#/'); store.set('path', '#/');
c.flash('success', y18n.t('logged_out')); c.flash('success', y18n.t('logged_out'));
c.redirect('#/login'); c.redirect('#/login');
}); }, 'GET', {}, false);
}); });
sam.get('#/postinstall', function(c) { sam.get('#/postinstall', function(c) {