Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Laurent S
erp5
Commits
54244846
Commit
54244846
authored
Jun 24, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Make URL handling timeout error more developper friendly
parent
90d6cfdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
10 deletions
+18
-10
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+16
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
54244846
...
...
@@ -55,12 +55,22 @@
return
window
.
location
.
replace
(
hash
);
}
function
synchronousChangeState
(
hash
)
{
changeState
(
hash
);
function
timeoutUrlChange
()
{
// prevent returning unexpected response
// wait for the hash change to occur
// fail if nothing happens
return
RSVP
.
timeout
(
REDIRECT_TIMEOUT
);
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
RSVP
.
timeout
(
REDIRECT_TIMEOUT
);
})
.
push
(
undefined
,
function
()
{
throw
new
Error
(
'
URL handling timeout:
'
+
window
.
location
.
hash
);
});
}
function
synchronousChangeState
(
hash
)
{
changeState
(
hash
);
return
timeoutUrlChange
();
}
//////////////////////////////////////////////////////////////////
...
...
@@ -500,6 +510,8 @@
//////////////////////////////////////////////////////////////////
function
routeMethodLess
(
gadget
)
{
// Nothing. Go to front page
// If no frontpage is configured, his may comes from missing configuration on website
// or default HTML gadget modification date more recent than the website modification date
return
gadget
.
getSetting
(
"
frontpage_gadget
"
)
.
push
(
function
(
result
)
{
return
synchronousChangeState
(
...
...
@@ -767,11 +779,7 @@
return
this
.
getCommandUrlFor
(
options
)
.
push
(
function
(
hash
)
{
window
.
location
.
replace
(
hash
);
// prevent returning unexpected response
// wait for the hash change to occur
// fail if nothing happens
return
RSVP
.
timeout
(
REDIRECT_TIMEOUT
);
return
timeoutUrlChange
();
});
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
54244846
...
...
@@ -232,7 +232,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
48.17472.32633.64870
</string>
</value>
<value>
<string>
9
52.5855.32841.20582
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>
14
52242357.34
</float>
<float>
14
66782122.1
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
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