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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
c6465736
Commit
c6465736
authored
Jun 29, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Only catch timeout error
parent
bf9eace2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
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
+6
-3
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 @
c6465736
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
COMMAND_SELECTION_NEXT
=
"
selection_next
"
,
COMMAND_SELECTION_NEXT
=
"
selection_next
"
,
COMMAND_HISTORY_PREVIOUS
=
"
history_previous
"
,
COMMAND_HISTORY_PREVIOUS
=
"
history_previous
"
,
COMMAND_PUSH_HISTORY
=
"
push_history
"
,
COMMAND_PUSH_HISTORY
=
"
push_history
"
,
REDIRECT_TIMEOUT
=
50
00
,
REDIRECT_TIMEOUT
=
50
55
,
VALID_URL_COMMAND_DICT
=
{};
VALID_URL_COMMAND_DICT
=
{};
VALID_URL_COMMAND_DICT
[
COMMAND_DISPLAY_STATE
]
=
null
;
VALID_URL_COMMAND_DICT
[
COMMAND_DISPLAY_STATE
]
=
null
;
VALID_URL_COMMAND_DICT
[
COMMAND_DISPLAY_STORED_STATE
]
=
null
;
VALID_URL_COMMAND_DICT
[
COMMAND_DISPLAY_STORED_STATE
]
=
null
;
...
@@ -63,8 +63,11 @@
...
@@ -63,8 +63,11 @@
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
timeout
(
REDIRECT_TIMEOUT
);
return
RSVP
.
timeout
(
REDIRECT_TIMEOUT
);
})
})
.
push
(
undefined
,
function
()
{
.
push
(
undefined
,
function
(
error
)
{
throw
new
Error
(
'
URL handling timeout. From: "
'
+
from_hash
+
'
" to: "
'
+
to_hash
+
'
" and current: "
'
+
window
.
location
.
hash
+
'
"
'
);
if
(
error
===
'
Timed out after
'
+
REDIRECT_TIMEOUT
+
'
ms
'
)
{
throw
new
Error
(
'
URL handling timeout. From: "
'
+
from_hash
+
'
" to: "
'
+
to_hash
+
'
" and current: "
'
+
window
.
location
.
hash
+
'
"
'
);
}
throw
error
;
});
});
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
c6465736
...
@@ -232,7 +232,7 @@
...
@@ -232,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.
5859.60284.2696
</string>
</value>
<value>
<string>
952.
11450.4967.32904
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1467
117724.5
3
</float>
<float>
1467
212877.2
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</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