git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
436b222
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Chrysostomos Kolovos
<xrklvs@gmail.com>
Tue, 20 May 2014 10:03:11 +0000
(13:03 +0300)
committer
Chrysostomos Kolovos
<xrklvs@gmail.com>
Tue, 20 May 2014 10:03:11 +0000
(13:03 +0300)
portal/static/js/myslice.js
patch
|
blob
|
history
diff --git
a/portal/static/js/myslice.js
b/portal/static/js/myslice.js
index
2f86655
..
d9593af
100644
(file)
--- a/
portal/static/js/myslice.js
+++ b/
portal/static/js/myslice.js
@@
-106,7
+106,11
@@
var myslice = {
user: function() {
if ($.isEmptyObject(this.user)) {
//this.login(function() { return this.user; });
- this.user = JSON.parse(localStorage.getItem('user'));
+ if(localStorage.getItem('user')!='undefined'){
+ this.user = JSON.parse(localStorage.getItem('user'));
+ }else{
+ return false;
+ }
}
return this.user;
},