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] Pass jshint.

Browse source
This commit is contained in:
opi 2015-08-29 15:45:00 +02:00
parent 6edab52e74
commit 2c7a1ebb5b
3 changed files with 78 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/.jshintrc Normal file
View file

@ -0,0 +1,3 @@
{
"sub": true
}

136
src/js/app.js
View file

@ -14,7 +14,7 @@ var app = Sammy('#main', function (sam) {
}); });
Handlebars.registerHelper('humanSize', function(bytes) { Handlebars.registerHelper('humanSize', function(bytes) {
var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB']; var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
if (bytes == 0) return 'n/a'; if (bytes === 0) return 'n/a';
var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024))); var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[[i]]; return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[[i]];
}); });
@ -23,7 +23,7 @@ var app = Sammy('#main', function (sam) {
}); });
Handlebars.registerHelper('bitRate', function(bytes, time) { Handlebars.registerHelper('bitRate', function(bytes, time) {
var sizes = ['b', 'Kb', 'Mb', 'Gb', 'Tb']; var sizes = ['b', 'Kb', 'Mb', 'Gb', 'Tb'];
if (time == 0) return 'n/a'; if (time === 0) return 'n/a';
var bps = bytes / time * 8; var bps = bytes / time * 8;
var i = parseInt(Math.floor(Math.log(bps) / Math.log(1024))); var i = parseInt(Math.floor(Math.log(bps) / Math.log(1024)));
return Math.round(bps / Math.pow(1024, i), 2) + ' ' + sizes[[i]] + '/s'; return Math.round(bps / Math.pow(1024, i), 2) + ' ' + sizes[[i]] + '/s';
@ -129,9 +129,9 @@ var app = Sammy('#main', function (sam) {
} }
loaded = false; loaded = false;
if ($('div.loader').length == 0) { if ($('div.loader').length === 0) {
setInterval(function () { setInterval(function () {
if (!loaded && $('div.loader').length == 0) { if (!loaded && $('div.loader').length === 0) {
$('#main').append('<div class="loader loader-content"></div>'); $('#main').append('<div class="loader loader-content"></div>');
} }
}, 500); }, 500);
@ -189,9 +189,9 @@ var app = Sammy('#main', function (sam) {
if (uri !== '/postinstall') { if (uri !== '/postinstall') {
store.clear('slide'); store.clear('slide');
c.redirect(store.get('path-1')); c.redirect(store.get('path-1'));
};
});
} }
});
};
websocket = typeof websocket !== 'undefined' ? websocket : true; websocket = typeof websocket !== 'undefined' ? websocket : true;
if (websocket) { if (websocket) {
@ -203,14 +203,14 @@ var app = Sammy('#main', function (sam) {
$.each($.parseJSON(evt.data), function(k, v) { $.each($.parseJSON(evt.data), function(k, v) {
c.flash(k, v); c.flash(k, v);
}); });
} };
// If not connected, WebSocket connection will raise an error, but we do not want to interrupt API request // If not connected, WebSocket connection will raise an error, but we do not want to interrupt API request
ws.onerror = ws.onopen; ws.onerror = ws.onopen;
ws.onclose = function() { ws.onclose = function() {
store.clear('flash'); store.clear('flash');
} };
ws.onopen = call(uri, callback, method, data); ws.onopen = call(uri, callback, method, data);
} else { } else {
@ -231,7 +231,7 @@ var app = Sammy('#main', function (sam) {
$('#modal').modal('hide'); $('#modal').modal('hide');
if (enableSlide) { if (enableSlide) {
function leSwap() { var leSwap = function() {
rendered.swap(function() { rendered.swap(function() {
$('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() { $('.slide, .btn-breadcrumb a:not(:last-child)').on('click', function() {
$(this).addClass('active'); $(this).addClass('active');
@ -245,7 +245,7 @@ var app = Sammy('#main', function (sam) {
// Force scrollTop on page load // Force scrollTop on page load
$('html, body').scrollTop(0); $('html, body').scrollTop(0);
}); });
} };
blockSize = $('#slider').width(); blockSize = $('#slider').width();
@ -273,7 +273,7 @@ var app = Sammy('#main', function (sam) {
} }
} else { } else {
rendered.swap(function(){ rendered.swap(function(){
callback() callback();
// Force scrollTop on page load // Force scrollTop on page load
$('html, body').scrollTop(0); $('html, body').scrollTop(0);
}); });
@ -338,7 +338,7 @@ var app = Sammy('#main', function (sam) {
arr1 = arr1 || []; arr1 = arr1 || [];
arr2 = arr2 || []; arr2 = arr2 || [];
return arr1.filter(function (a) { return arr1.filter(function (a) {
return ((arr2.indexOf(a) == -1) && (a != "")); return ((arr2.indexOf(a) == -1) && (a !== ""));
}); });
} }
}); });
@ -416,12 +416,12 @@ var app = Sammy('#main', function (sam) {
sam.get('#/', function (c) { sam.get('#/', function (c) {
c.api('/users', function(data) { c.api('/users', function(data) {
// Warn admin if no users are created. // Warn admin if no users are created.
if (data.users.length == 0) { if (data.users.length === 0) {
c.flash('warning', y18n.t('warning_first_user')); c.flash('warning', y18n.t('warning_first_user'));
} }
// Get security feed and display new items // Get security feed and display new items
var securityFeed = 'https://yunohost.org/security.rss' var securityFeed = 'https://yunohost.org/security.rss';
var forumUrl = 'https://forum.yunohost.org'; var forumUrl = 'https://forum.yunohost.org';
$.ajax({ $.ajax({
@ -437,7 +437,7 @@ var app = Sammy('#main', function (sam) {
// Loop through items // Loop through items
$('item', xml).each(function(k, v) { $('item', xml).each(function(k, v) {
var link=$('link', v)[0].innerHTML; var link=$('link', v)[0].innerHTML;
if (typeof link == 'string' && link!='' && link.charAt(0)=='/') if (typeof link == 'string' && link !== '' && link.charAt(0) == '/')
link=forumUrl+link; link=forumUrl+link;
var description=$('description', v)[0].textContent; var description=$('description', v)[0].textContent;
description=description.replace('href="/','href="'+forumUrl+'/'); description=description.replace('href="/','href="'+forumUrl+'/');
@ -448,7 +448,7 @@ var app = Sammy('#main', function (sam) {
url: link, url: link,
desc: description, desc: description,
date: $('pubDate', v)[0].innerHTML.split(' +')[0], date: $('pubDate', v)[0].innerHTML.split(' +')[0],
} };
if (viewedItems.indexOf(item.guid) === -1) { if (viewedItems.indexOf(item.guid) === -1) {
// Show security message to administrator // Show security message to administrator
// var warning = '<h2>'+ item.title +'</h2>'+ item.desc // var warning = '<h2>'+ item.title +'</h2>'+ item.desc
@ -466,7 +466,7 @@ var app = Sammy('#main', function (sam) {
}); });
}) })
.fail(function() { .fail(function() {
c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed])) c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed]));
}); });
c.view('home'); c.view('home');
@ -484,9 +484,9 @@ var app = Sammy('#main', function (sam) {
$('#masthead').show(); $('#masthead').show();
$('.logout-button').hide(); $('.logout-button').hide();
store.set('path-1', '#/login'); store.set('path-1', '#/login');
if ($('div.loader').length == 0) { if ($('div.loader').length === 0) {
setInterval(function () { setInterval(function () {
if (!loaded && $('div.loader').length == 0) { if (!loaded && $('div.loader').length === 0) {
$('#main').append('<div class="loader loader-content"></div>'); $('#main').append('<div class="loader loader-content"></div>');
} }
}, 500); }, 500);
@ -541,7 +541,7 @@ var app = Sammy('#main', function (sam) {
params = { params = {
'password': c.params['password'] 'password': c.params['password']
} };
c.api('/login', function(data) { c.api('/login', function(data) {
store.set('connected', true); store.set('connected', true);
@ -635,7 +635,7 @@ var app = Sammy('#main', function (sam) {
// Execute post-installation // Execute post-installation
sam.post('#/postinstall', function (c) { sam.post('#/postinstall', function (c) {
if (c.params['password'] == '' || c.params['confirmation'] == '') { if (c.params['password'] === '' || c.params['confirmation'] === '') {
c.flash('fail', y18n.t('password_empty')); c.flash('fail', y18n.t('password_empty'));
} }
else if (c.params['password'] == c.params['confirmation']) { else if (c.params['password'] == c.params['confirmation']) {
@ -644,14 +644,14 @@ var app = Sammy('#main', function (sam) {
store.clear('slide'); store.clear('slide');
c.redirect('#/postinstall/domain'); c.redirect('#/postinstall/domain');
} else { } else {
params = { 'domain': c.params['domain'].toLowerCase() } params = { 'domain': c.params['domain'].toLowerCase() };
} }
c.confirm( c.confirm(
y18n.t('postinstall'), y18n.t('postinstall'),
y18n.t('confirm_postinstall', [c.params['domain']]), y18n.t('confirm_postinstall', [c.params['domain']]),
function(){ function(){
params['password'] = c.params['password'] params['password'] = c.params['password'];
store.set('url', window.location.hostname +'/yunohost/api'); store.set('url', window.location.hostname +'/yunohost/api');
store.set('user', 'admin'); store.set('user', 'admin');
@ -724,15 +724,15 @@ var app = Sammy('#main', function (sam) {
data.email = { data.email = {
username : email[0], username : email[0],
domain : email[1] domain : email[1]
} };
// Domains // Domains
data.domains = [] data.domains = [];
$.each(dataDomains.domains, function(key, value) { $.each(dataDomains.domains, function(key, value) {
data.domains.push({ data.domains.push({
domain: value, domain: value,
selected: (value == data.email.domain) ? true : false selected: (value == data.email.domain) ? true : false
}) });
}); });
c.view('user/user_edit', data); c.view('user/user_edit', data);
@ -757,8 +757,8 @@ var app = Sammy('#main', function (sam) {
// force array type for mail aliases and redirections // force array type for mail aliases and redirections
if (typeof c.params['mailalias'] == 'string') {c.params['mailalias'] = [c.params['mailalias']]}; if (typeof c.params['mailalias'] == 'string') {c.params['mailalias'] = [c.params['mailalias']];}
if (typeof c.params['mailforward'] == 'string') {c.params['mailforward'] = [c.params['mailforward']]}; if (typeof c.params['mailforward'] == 'string') {c.params['mailforward'] = [c.params['mailforward']];}
// Check for added/removed aliases and redirections // Check for added/removed aliases and redirections
c.params['add_mailalias'] = c.arrayDiff(c.params['mailalias'], user['mail-aliases']); c.params['add_mailalias'] = c.arrayDiff(c.params['mailalias'], user['mail-aliases']);
@ -770,7 +770,7 @@ var app = Sammy('#main', function (sam) {
c.params['mailalias'] = c.params['mailforward'] = ''; c.params['mailalias'] = c.params['mailforward'] = '';
// Remove empty inputs // Remove empty inputs
params = {} params = {};
$.each(c.params.toHash(), function(key, value) { $.each(c.params.toHash(), function(key, value) {
if (value.length > 0 && key !== 'user') { params[key] = value; } if (value.length > 0 && key !== 'user') { params[key] = value; }
}); });
@ -867,10 +867,10 @@ var app = Sammy('#main', function (sam) {
ddomains : c.params.ddomains, ddomains : c.params.ddomains,
domains : c.params.domains, domains : c.params.domains,
allowDyndnsDomain : true allowDyndnsDomain : true
} };
// Allow only 1 DynDns domain. // Allow only 1 DynDns domain.
var regex = data.ddomains.join('|') var regex = data.ddomains.join('|');
$.each(data.domains, function(k, domain) { $.each(data.domains, function(k, domain) {
if ( domain.search(regex) > 0 ) { if ( domain.search(regex) > 0 ) {
data.allowDyndnsDomain = false; data.allowDyndnsDomain = false;
@ -883,16 +883,16 @@ var app = Sammy('#main', function (sam) {
// Add domain (POST) // Add domain (POST)
sam.post('#/domains/add', function (c) { sam.post('#/domains/add', function (c) {
if (c.params['domain'] == '') { if (c.params['domain'] === '') {
if (c.params['ddomain'] == '') { if (c.params['ddomain'] === '') {
c.flash('fail', y18n.t('error_select_domain')); c.flash('fail', y18n.t('error_select_domain'));
store.clear('slide'); store.clear('slide');
c.redirect('#/domains/add'); c.redirect('#/domains/add');
} }
params = {'domain': c.params['ddomain'] + c.params['ddomain-ext']} params = {'domain': c.params['ddomain'] + c.params['ddomain-ext']};
endurl = 'dyndns' endurl = 'dyndns';
} else { } else {
params = { 'domain': c.params['domain'] } params = { 'domain': c.params['domain'] };
endurl = ''; endurl = '';
} }
@ -921,7 +921,7 @@ var app = Sammy('#main', function (sam) {
// Set default domain // Set default domain
sam.post('#/domains', function (c) { sam.post('#/domains', function (c) {
if (c.params['domain'] == '') { if (c.params['domain'] === '') {
c.flash('fail', y18n.t('error_select_domain')); c.flash('fail', y18n.t('error_select_domain'));
store.clear('slide'); store.clear('slide');
c.redirect('#/domains'); c.redirect('#/domains');
@ -930,7 +930,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('domains'), y18n.t('domains'),
y18n.t('confirm_change_maindomain'), y18n.t('confirm_change_maindomain'),
function(){ function(){
params = {'new_domain': c.params['domain']} params = {'new_domain': c.params['domain']};
c.api('/domains/main', function(data) { // http://api.yunohost.org/#!/tools/tools_maindomain_put_1 c.api('/domains/main', function(data) { // http://api.yunohost.org/#!/tools/tools_maindomain_put_1
store.clear('slide'); store.clear('slide');
c.redirect('#/domains'); c.redirect('#/domains');
@ -939,7 +939,7 @@ var app = Sammy('#main', function (sam) {
// Wait 15s and refresh the page // Wait 15s and refresh the page
refreshDomain = window.setTimeout(function(){ refreshDomain = window.setTimeout(function(){
store.clear('slide'); store.clear('slide');
c.redirect('#/domains') c.redirect('#/domains');
}, 15000); }, 15000);
}, },
function(){ function(){
@ -960,7 +960,7 @@ var app = Sammy('#main', function (sam) {
sam.get('#/apps', function (c) { sam.get('#/apps', function (c) {
c.api('/apps', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8
// Keep only installed apps // Keep only installed apps
data2 = { 'apps': [], 'installed_apps': true } data2 = { 'apps': [], 'installed_apps': true };
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if (v['installed']) data2['apps'].push(v); if (v['installed']) data2['apps'].push(v);
}); });
@ -975,7 +975,7 @@ var app = Sammy('#main', function (sam) {
c.api('/apps', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8
c.api('/apps?raw', function(dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8 c.api('/apps?raw', function(dataraw) { // http://api.yunohost.org/#!/app/app_list_get_8
// Keep only uninstalled apps, or multi-instance apps // Keep only uninstalled apps, or multi-instance apps
data2 = { 'apps': [], 'installed_apps': false } data2 = { 'apps': [], 'installed_apps': false };
$.each(data['apps'], function(k, v) { $.each(data['apps'], function(k, v) {
if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) { if ((!v['installed'] || dataraw[v['id']].manifest.multi_instance == "true") && !v['id'].match(/__[0-9]{1,5}$/)) {
v['install_link']=true; v['install_link']=true;
@ -1033,7 +1033,7 @@ var app = Sammy('#main', function (sam) {
data = { data = {
id: appId, id: appId,
manifest: manifest manifest: manifest
} };
if (typeof data.manifest.arguments.install !== 'undefined') { if (typeof data.manifest.arguments.install !== 'undefined') {
$.each(data.manifest.arguments.install, function(k, v) { $.each(data.manifest.arguments.install, function(k, v) {
@ -1142,12 +1142,12 @@ var app = Sammy('#main', function (sam) {
sam.post('#/apps', function(c) { sam.post('#/apps', function(c) {
// Warn admin if app is going to be installed on domain root. // Warn admin if app is going to be installed on domain root.
if (c.params['path'] !== '/' || confirm(y18n.t('confirm_install_domain_root', [c.params['domain']]))) { if (c.params['path'] !== '/' || confirm(y18n.t('confirm_install_domain_root', [c.params['domain']]))) {
params = { 'label': c.params['label'], 'app': c.params['app'] } params = { 'label': c.params['label'], 'app': c.params['app'] };
delete c.params['label']; delete c.params['label'];
delete c.params['app']; delete c.params['app'];
params['args'] = c.serialize(c.params.toHash()); params['args'] = c.serialize(c.params.toHash());
// Do not pass empty args. // Do not pass empty args.
if (params['args'] == "") { if (params['args'] === "") {
delete params['args']; delete params['args'];
} }
@ -1165,7 +1165,7 @@ var app = Sammy('#main', function (sam) {
// Install custom app from github // Install custom app from github
sam.post('#/apps/install/custom', function(c) { sam.post('#/apps/install/custom', function(c) {
params = { 'label': c.params['label'], 'app': c.params['url'] } params = { 'label': c.params['label'], 'app': c.params['url'] };
delete c.params['label']; delete c.params['label'];
delete c.params['url']; delete c.params['url'];
@ -1260,9 +1260,9 @@ var app = Sammy('#main', function (sam) {
username: username, username: username,
fullname: user.fullname, fullname: user.fullname,
mail: user.mail, mail: user.mail,
};
} }
} });
})
c.view('app/app_access', data); c.view('app/app_access', data);
}); });
@ -1275,7 +1275,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('applications'), y18n.t('applications'),
y18n.t('confirm_access_remove_all', [c.params['app']]), y18n.t('confirm_access_remove_all', [c.params['app']]),
function() { function() {
params = {'apps': c.params['app'], 'users':[]} params = {'apps': c.params['app'], 'users':[]};
c.api('/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12 c.api('/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12
store.clear('slide'); store.clear('slide');
c.redirect('#/apps/'+ c.params['app']+ '/access'); c.redirect('#/apps/'+ c.params['app']+ '/access');
@ -1294,7 +1294,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('applications'), y18n.t('applications'),
y18n.t('confirm_access_remove_user', [c.params['app'], c.params['user']]), y18n.t('confirm_access_remove_user', [c.params['app'], c.params['user']]),
function() { function() {
params = {'apps': c.params['app'], 'users': c.params['user']} params = {'apps': c.params['app'], 'users': c.params['user']};
c.api('/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12 c.api('/access?'+c.serialize(params), function(data) { // http://api.yunohost.org/#!/app/app_removeaccess_delete_12
store.clear('slide'); store.clear('slide');
c.redirect('#/apps/'+ c.params['app']+ '/access'); c.redirect('#/apps/'+ c.params['app']+ '/access');
@ -1313,7 +1313,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('applications'), y18n.t('applications'),
y18n.t('confirm_access_add', [c.params['app']]), y18n.t('confirm_access_add', [c.params['app']]),
function() { function() {
params = {'apps': c.params['app'], 'users': null} params = {'apps': c.params['app'], 'users': null};
c.api('/access', function() { // http://api.yunohost.org/#!/app/app_addaccess_put_13 c.api('/access', function() { // http://api.yunohost.org/#!/app/app_addaccess_put_13
store.clear('slide'); store.clear('slide');
c.redirect('#/apps/'+ c.params['app'] +'/access'); c.redirect('#/apps/'+ c.params['app'] +'/access');
@ -1328,7 +1328,7 @@ var app = Sammy('#main', function (sam) {
// Grant access for a specific user // Grant access for a specific user
sam.post('#/apps/:app/access/add', function (c) { sam.post('#/apps/:app/access/add', function (c) {
params = {'users': c.params['user'], 'apps': c.params['app']} params = {'users': c.params['user'], 'apps': c.params['app']};
c.api('/access', function() { // http://api.yunohost.org/#!/app/app_addaccess_put_13 c.api('/access', function() { // http://api.yunohost.org/#!/app/app_addaccess_put_13
store.clear('slide'); store.clear('slide');
c.redirect('#/apps/'+ c.params['app'] +'/access'); c.redirect('#/apps/'+ c.params['app'] +'/access');
@ -1341,7 +1341,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('applications'), y18n.t('applications'),
y18n.t('confirm_access_clear', [c.params['app']]), y18n.t('confirm_access_clear', [c.params['app']]),
function() { function() {
params = {'apps': c.params['app']} params = {'apps': c.params['app']};
c.api('/access', function() { // c.api('/access', function() { //
store.clear('slide'); store.clear('slide');
c.redirect('#/apps/'+ c.params['app'] +'/access'); c.redirect('#/apps/'+ c.params['app'] +'/access');
@ -1381,7 +1381,7 @@ var app = Sammy('#main', function (sam) {
// All services status // All services status
sam.get('#/services', function (c) { sam.get('#/services', function (c) {
c.api('/services', function(data) { // ? c.api('/services', function(data) { // ?
data2 = { 'services': [] } data2 = { 'services': [] };
$.each(data, function(k, v) { $.each(data, function(k, v) {
v.name = k; v.name = k;
v.is_loaded = (v.loaded=='enabled') ? true : false; v.is_loaded = (v.loaded=='enabled') ? true : false;
@ -1395,7 +1395,7 @@ var app = Sammy('#main', function (sam) {
// Status & actions for a service // Status & actions for a service
sam.get('#/services/:service', function (c) { sam.get('#/services/:service', function (c) {
c.api('/services/'+ c.params['service'], function(data) { // ? c.api('/services/'+ c.params['service'], function(data) { // ?
data2 = { 'service': data } data2 = { 'service': data };
data2.service.name = c.params['service']; data2.service.name = c.params['service'];
data2.service.is_loaded = (data.loaded=='enabled') ? true : false; data2.service.is_loaded = (data.loaded=='enabled') ? true : false;
data2.service.is_running = (data.status=='running') ? true : false; data2.service.is_running = (data.status=='running') ? true : false;
@ -1407,9 +1407,9 @@ var app = Sammy('#main', function (sam) {
// Service log // Service log
sam.get('#/services/:service/log', function (c) { sam.get('#/services/:service/log', function (c) {
params = { 'number': 50 } params = { 'number': 50 };
c.api('/services/'+ c.params['service'] +'/log', function(data) { // ? c.api('/services/'+ c.params['service'] +'/log', function(data) { // ?
data2 = { 'logs': [], 'name': c.params['service'] } data2 = { 'logs': [], 'name': c.params['service'] };
$.each(data, function(k, v) { $.each(data, function(k, v) {
data2.logs.push({filename: k, filecontent: v.join('\n')}); data2.logs.push({filename: k, filecontent: v.join('\n')});
}); });
@ -1503,7 +1503,7 @@ var app = Sammy('#main', function (sam) {
y18n.t('firewall'), y18n.t('firewall'),
y18n.t('confirm_upnp_action', [y18n.t(c.params['action'])]), y18n.t('confirm_upnp_action', [y18n.t(c.params['action'])]),
function(){ function(){
params = {'action' : c.params['action']} params = {'action' : c.params['action']};
c.api('/firewall/upnp', function(data) { c.api('/firewall/upnp', function(data) {
store.clear('slide'); store.clear('slide');
c.redirect('#/firewall'); c.redirect('#/firewall');
@ -1518,9 +1518,9 @@ var app = Sammy('#main', function (sam) {
// Toggle port status helper (available in every controller) // Toggle port status helper (available in every controller)
sam.helper('togglePort', function(port, protocol, connection, action) { sam.helper('togglePort', function(port, protocol, connection, action) {
var method = null var method = null,
, endurl = [] endurl = [],
, c = this c = this
; ;
if (port != parseInt(port) || port < 0 || port > 65535) { if (port != parseInt(port) || port < 0 || port > 65535) {
@ -1562,7 +1562,7 @@ var app = Sammy('#main', function (sam) {
c.redirect('#/firewall'); c.redirect('#/firewall');
} }
if (method !== null && protocol !== null && port != null) { if (method !== null && protocol !== null && port !== null) {
// port: // port:
// protocol: // protocol:
// - UDP // - UDP
@ -1574,7 +1574,7 @@ var app = Sammy('#main', function (sam) {
var params = { var params = {
'port' : port, 'port' : port,
'protocol' : protocol, 'protocol' : protocol,
} };
c.api('/firewall/port?'+endurl, function(data) { c.api('/firewall/port?'+endurl, function(data) {
store.clear('slide'); store.clear('slide');
c.redirect('#/firewall'); c.redirect('#/firewall');
@ -1636,7 +1636,7 @@ var app = Sammy('#main', function (sam) {
// Server monitoring // Server monitoring
sam.get('#/monitor', function (c) { sam.get('#/monitor', function (c) {
monitorData = {} monitorData = {};
// Why this method ? // Why this method ?
c.api('/services/glances', function(data) { // ? c.api('/services/glances', function(data) { // ?
@ -1687,7 +1687,7 @@ var app = Sammy('#main', function (sam) {
// Update administration password (PUT) // Update administration password (PUT)
sam.put('#/tools/adminpw', function (c) { sam.put('#/tools/adminpw', function (c) {
params = {} params = {};
$.each(c.params.toHash(), function(key, value) { $.each(c.params.toHash(), function(key, value) {
if (value !== '') { params[key] = value; } if (value !== '') { params[key] = value; }
}); });
@ -1781,7 +1781,7 @@ var app = Sammy('#main', function (sam) {
data.url = { data.url = {
web: securityUrl, web: securityUrl,
rss: securityFeed rss: securityFeed
} };
$.ajax({ $.ajax({
url: securityFeed, url: securityFeed,
@ -1792,7 +1792,7 @@ var app = Sammy('#main', function (sam) {
// Loop through items // Loop through items
$('item', xml).each(function(k, v) { $('item', xml).each(function(k, v) {
var link=$('link', v)[0].innerHTML; var link=$('link', v)[0].innerHTML;
if (typeof link == 'string' && link!='' && link.charAt(0)=='/') if (typeof link == 'string' && link !== '' && link.charAt(0) == '/')
link=forumUrl+link; link=forumUrl+link;
var description=$('description', v)[0].textContent; var description=$('description', v)[0].textContent;
description=description.replace('href="/','href="'+forumUrl+'/'); description=description.replace('href="/','href="'+forumUrl+'/');
@ -1803,14 +1803,14 @@ var app = Sammy('#main', function (sam) {
url: link, url: link,
desc: description, desc: description,
date: $('pubDate', v)[0].innerHTML.split(' +')[0], date: $('pubDate', v)[0].innerHTML.split(' +')[0],
} };
data.items.push(item); data.items.push(item);
}); });
c.view('tools/tools_security_feed', data); c.view('tools/tools_security_feed', data);
}) })
.fail(function() { .fail(function() {
c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed])) c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed]));
}); });
}); });

14
src/js/y18n.js
View file

@ -7,7 +7,7 @@
locale: "en", locale: "en",
placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm, placeholder: /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm,
translations: {}, translations: {},
} };
/** /**
* Initialization * Initialization
@ -17,7 +17,7 @@
for (var key in defaultOptions) { for (var key in defaultOptions) {
y18n[key] = (typeof y18n[key] !== 'undefined') ? y18n[key] : defaultOptions[key]; y18n[key] = (typeof y18n[key] !== 'undefined') ? y18n[key] : defaultOptions[key];
} }
} };
y18n.init(); y18n.init();
@ -29,7 +29,7 @@
[].forEach.call( [].forEach.call(
document.querySelectorAll('[data-y18n]'), document.querySelectorAll('[data-y18n]'),
function(el){ function(el){
el.innerText = y18n.translate(el.getAttribute('data-y18n')) el.innerText = y18n.translate(el.getAttribute('data-y18n'));
} }
); );
@ -37,10 +37,10 @@
[].forEach.call( [].forEach.call(
document.querySelectorAll('[data-y18n-title]'), document.querySelectorAll('[data-y18n-title]'),
function(el){ function(el){
el.title = y18n.translate(el.getAttribute('data-y18n-title')) el.title = y18n.translate(el.getAttribute('data-y18n-title'));
} }
); );
} };
/** /**
* Translation * Translation
@ -60,7 +60,7 @@
// Variables remplacement // Variables remplacement
return (translation) ? translation.printf(options) : key; return (translation) ? translation.printf(options) : key;
} };
y18n.lookup = function(key, options) { y18n.lookup = function(key, options) {
// Default locale // Default locale
@ -74,7 +74,7 @@
return y18n.translations[options.locale][key]; return y18n.translations[options.locale][key];
} }
} }
} };
// Save some typing // Save some typing
y18n.t = y18n.translate; y18n.t = y18n.translate;