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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
erp5
Commits
aa32859f
Commit
aa32859f
authored
Jun 28, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Increase URL timeout error verbosity
parent
31189e57
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-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
+11
-6
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
+6
-4
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
aa32859f
...
@@ -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
;
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
return
window
.
location
.
replace
(
hash
);
return
window
.
location
.
replace
(
hash
);
}
}
function
timeoutUrlChange
()
{
function
timeoutUrlChange
(
from_hash
,
to_hash
)
{
// prevent returning unexpected response
// prevent returning unexpected response
// wait for the hash change to occur
// wait for the hash change to occur
// fail if nothing happens
// fail if nothing happens
...
@@ -63,14 +63,18 @@
...
@@ -63,14 +63,18 @@
.
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:
'
+
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
;
});
});
}
}
function
synchronousChangeState
(
hash
)
{
function
synchronousChangeState
(
hash
)
{
var
from_hash
=
window
.
location
.
hash
;
changeState
(
hash
);
changeState
(
hash
);
return
timeoutUrlChange
();
return
timeoutUrlChange
(
from_hash
,
hash
);
}
}
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
...
@@ -835,8 +839,9 @@
...
@@ -835,8 +839,9 @@
delete
options
.
form_content
;
delete
options
.
form_content
;
return
this
.
getCommandUrlFor
(
options
)
return
this
.
getCommandUrlFor
(
options
)
.
push
(
function
(
hash
)
{
.
push
(
function
(
hash
)
{
var
from_hash
=
window
.
location
.
hash
;
window
.
location
.
replace
(
hash
);
window
.
location
.
replace
(
hash
);
return
timeoutUrlChange
();
return
timeoutUrlChange
(
from_hash
,
hash
);
});
});
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
aa32859f
...
@@ -66,7 +66,9 @@
...
@@ -66,7 +66,9 @@
<item>
<item>
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple/>
<tuple>
<string>
classification/collaborative/team
</string>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -185,7 +187,7 @@
...
@@ -185,7 +187,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
14
65381422.0
</float>
<float>
14
47177687.37
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
@@ -230,7 +232,7 @@
...
@@ -230,7 +232,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
952.1
0286.2333.57753
</string>
</value>
<value>
<string>
952.1
1450.4967.32904
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +250,7 @@
...
@@ -248,7 +250,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1467
047937.65
</float>
<float>
1467
212877.23
</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