Commit aa32859f authored by Romain Courteaud's avatar Romain Courteaud

[erp5_web_renderjs_ui] Increase URL timeout error verbosity

parent 31189e57
......@@ -27,7 +27,7 @@
COMMAND_SELECTION_NEXT = "selection_next",
COMMAND_HISTORY_PREVIOUS = "history_previous",
COMMAND_PUSH_HISTORY = "push_history",
REDIRECT_TIMEOUT = 5000,
REDIRECT_TIMEOUT = 5055,
VALID_URL_COMMAND_DICT = {};
VALID_URL_COMMAND_DICT[COMMAND_DISPLAY_STATE] = null;
VALID_URL_COMMAND_DICT[COMMAND_DISPLAY_STORED_STATE] = null;
......@@ -55,7 +55,7 @@
return window.location.replace(hash);
}
function timeoutUrlChange() {
function timeoutUrlChange(from_hash, to_hash) {
// prevent returning unexpected response
// wait for the hash change to occur
// fail if nothing happens
......@@ -63,14 +63,18 @@
.push(function () {
return RSVP.timeout(REDIRECT_TIMEOUT);
})
.push(undefined, function () {
throw new Error('URL handling timeout: ' + window.location.hash);
.push(undefined, function (error) {
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) {
var from_hash = window.location.hash;
changeState(hash);
return timeoutUrlChange();
return timeoutUrlChange(from_hash, hash);
}
//////////////////////////////////////////////////////////////////
......@@ -835,8 +839,9 @@
delete options.form_content;
return this.getCommandUrlFor(options)
.push(function (hash) {
var from_hash = window.location.hash;
window.location.replace(hash);
return timeoutUrlChange();
return timeoutUrlChange(from_hash, hash);
});
})
......
......@@ -66,7 +66,9 @@
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
<tuple>
<string>classification/collaborative/team</string>
</tuple>
</value>
</item>
<item>
......@@ -185,7 +187,7 @@
</tuple>
<state>
<tuple>
<float>1465381422.0</float>
<float>1447177687.37</float>
<string>UTC</string>
</tuple>
</state>
......@@ -230,7 +232,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>952.10286.2333.57753</string> </value>
<value> <string>952.11450.4967.32904</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>1467047937.65</float>
<float>1467212877.23</float>
<string>UTC</string>
</tuple>
</state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment