mirror of
https://github.com/YunoHost/yunohost-admin.git
synced 2024-09-03 20:06:15 +02:00
Merge pull request #3 from jeromelebleu/master
Remove DOM Storage dependency
This commit is contained in:
commit
cf47518d67
1 changed files with 12 additions and 3 deletions
15
js/app.js
15
js/app.js
|
@ -7,8 +7,18 @@ app = Sammy('#main', function (sam) {
|
||||||
// Plugins
|
// Plugins
|
||||||
sam.use('Mustache', 'ms');
|
sam.use('Mustache', 'ms');
|
||||||
|
|
||||||
|
// Look for supported type of storage to use
|
||||||
|
var storageType;
|
||||||
|
if (Sammy.Store.isAvailable('session')) {
|
||||||
|
storageType = 'session';
|
||||||
|
} else if (Sammy.Store.isAvailable('cookie')) {
|
||||||
|
storageType = 'cookie';
|
||||||
|
} else {
|
||||||
|
storageType = 'memory';
|
||||||
|
}
|
||||||
|
|
||||||
// Initialize storage
|
// Initialize storage
|
||||||
var store = new Sammy.Store({name: 'storage', type: 'session'});
|
var store = new Sammy.Store({name: 'storage', type: storageType});
|
||||||
var loaded = false;
|
var loaded = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -197,7 +207,7 @@ app = Sammy('#main', function (sam) {
|
||||||
store.set('path', req.path);
|
store.set('path', req.path);
|
||||||
|
|
||||||
// Redirect to login page if no credentials stored
|
// Redirect to login page if no credentials stored
|
||||||
if (!store.get('connected') && window.localStorage.getItem("isConnected") != 'true') {
|
if (!store.get('connected') != 'true') {
|
||||||
req.redirect('#/login');
|
req.redirect('#/login');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -258,7 +268,6 @@ app = Sammy('#main', function (sam) {
|
||||||
if (data.apiVersion == '0.1') {
|
if (data.apiVersion == '0.1') {
|
||||||
c.api('/users', function(data) {
|
c.api('/users', function(data) {
|
||||||
store.set('connected', true);
|
store.set('connected', true);
|
||||||
window.localStorage.setItem("isConnected", "true");
|
|
||||||
$('#logout-button').fadeIn();
|
$('#logout-button').fadeIn();
|
||||||
c.flash('success', 'Logged in');
|
c.flash('success', 'Logged in');
|
||||||
if (store.get('path')) {
|
if (store.get('path')) {
|
||||||
|
|
Loading…
Reference in a new issue