Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
officejs
Commits
a87133ef
Commit
a87133ef
authored
Oct 03, 2011
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more bug fixes from Francois
parent
86916499
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
UNGProject/js/login.js
UNGProject/js/login.js
+0
-3
UNGProject/js/theme.js
UNGProject/js/theme.js
+3
-0
UNGProject/login.html
UNGProject/login.html
+3
-0
No files found.
UNGProject/js/login.js
View file @
a87133ef
...
@@ -39,8 +39,6 @@ function tryLog() {
...
@@ -39,8 +39,6 @@ function tryLog() {
wallet
.
applicationPassword
=
applicationPassword
;
wallet
.
applicationPassword
=
applicationPassword
;
setWallet
(
wallet
);
//to delete for new registration each time
setWallet
(
wallet
);
//to delete for new registration each time
initStorage
(
wallet
);
initStorage
(
wallet
);
//go to ung when the storage is ready
waitBeforeSucceed
(
function
()
{
return
getCurrentStorage
().
getUser
();},
function
(){
window
.
location
.
href
=
"
ung.html
"
;});
}
}
}
}
...
@@ -58,7 +56,6 @@ function logUser() {
...
@@ -58,7 +56,6 @@ function logUser() {
}
}
initStorage
(
wallet
);
initStorage
(
wallet
);
//go to ung when the storage is ready
//go to ung when the storage is ready
waitBeforeSucceed
(
function
()
{
return
getCurrentStorage
().
getUser
();},
function
(){
window
.
location
.
href
=
"
ung.html
"
;});
}
}
...
...
UNGProject/js/theme.js
View file @
a87133ef
...
@@ -218,6 +218,7 @@ Storage.load({
...
@@ -218,6 +218,7 @@ Storage.load({
success
:
function
(
data
)
{
//success
success
:
function
(
data
)
{
//success
storage
.
setUser
(
new
User
(
JSON
.
parse
(
data
)));
storage
.
setUser
(
new
User
(
JSON
.
parse
(
data
)));
storage
.
save
();
storage
.
save
();
storage
.
fireEvent
(
Storage
.
STORAGE_CREATED
);
},
},
errorHandler
:
function
(
errorEvent
)
{
//fail
errorHandler
:
function
(
errorEvent
)
{
//fail
if
(
errorEvent
.
status
==
404
){
//create a new user if there was no such one
if
(
errorEvent
.
status
==
404
){
//create a new user if there was no such one
...
@@ -226,6 +227,7 @@ Storage.load({
...
@@ -226,6 +227,7 @@ Storage.load({
storage
.
setUser
(
user
);
storage
.
setUser
(
user
);
storage
.
user
.
storageLocation
=
jioFileContent
.
location
;
storage
.
user
.
storageLocation
=
jioFileContent
.
location
;
storage
.
save
();
storage
.
save
();
storage
.
fireEvent
(
Storage
.
STORAGE_CREATED
);
}
}
},
},
asynchronous
:
false
asynchronous
:
false
...
@@ -247,6 +249,7 @@ Storage.load({
...
@@ -247,6 +249,7 @@ Storage.load({
},
},
USER_READY
:
"
userReady
"
,
// value of the USER_READY event
USER_READY
:
"
userReady
"
,
// value of the USER_READY event
LIST_READY
:
"
listReady
"
,
// value of the LIST_READY event
LIST_READY
:
"
listReady
"
,
// value of the LIST_READY event
STORAGE_CREATED
:
"
storageCreated
"
,
// value of the STORAGE_CREATED event
getJIO
:
function
()
{
return
this
.
jio
;},
getJIO
:
function
()
{
return
this
.
jio
;},
loadUser
:
function
(
userName
)
{
//warning no return value
loadUser
:
function
(
userName
)
{
//warning no return value
...
...
UNGProject/login.html
View file @
a87133ef
...
@@ -31,6 +31,9 @@
...
@@ -31,6 +31,9 @@
<script
type=
"text/javascript"
>
<script
type=
"text/javascript"
>
var
init
=
function
()
{
var
init
=
function
()
{
//go to ung when the storage is ready
Storage
.
addEventHandler
(
function
()
{
window
.
location
.
href
=
"
ung.html
"
;},
Storage
.
STORAGE_CREATED
,
true
);
//fill known informations
//fill known informations
var
wallet
=
getWallet
();
var
wallet
=
getWallet
();
if
(
wallet
)
{
if
(
wallet
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment