Skip to content

erp5
erp5
Commit 2de04c43 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

erp5_xhtml_style/erp5_web_renderjs_ui: renderjs 0.29.0

parent babc4ce6
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 32 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.js
View file @ 2de04c43
...@@ -300,25 +300,29 @@ ...@@ -300,25 +300,29 @@
postMessage({ id: id, callback: cbName, params: v}); postMessage({ id: id, callback: cbName, params: v});
}, },
error: function(error, message) { error: function(error, message) {
completed = true;
// verify in table // verify in table
if (!inTbl[id]) throw "error called for nonexistent message: " + id; if (!inTbl[id]) throw "error called for nonexistent message: " + id;
// remove transaction from table
delete inTbl[id];
// send error // send error
postMessage({ id: id, error: error, message: message }); postMessage({ id: id, error: error, message: message });
completed = true;
// remove transaction from table
delete inTbl[id];
}, },
complete: function(v) { complete: function(v) {
completed = true;
// verify in table // verify in table
if (!inTbl[id]) throw "complete called for nonexistent message: " + id; if (!inTbl[id]) throw "complete called for nonexistent message: " + id;
// remove transaction from table
delete inTbl[id];
// send complete // send complete
postMessage({ id: id, result: v }); postMessage({ id: id, result: v });
},
completed = true;
// remove transaction from table
delete inTbl[id];
},
delayReturn: function(delay) { delayReturn: function(delay) {
if (typeof delay === 'boolean') { if (typeof delay === 'boolean') {
shouldDelayReturn = (delay === true); shouldDelayReturn = (delay === true);
...@@ -2785,10 +2789,11 @@ if (typeof document.contains !== 'function') { ...@@ -2785,10 +2789,11 @@ if (typeof document.contains !== 'function') {
local_transaction_dict[transaction_id] = local_transaction_dict[transaction_id] =
root_gadget[v[0]].apply(root_gadget, v[1]) root_gadget[v[0]].apply(root_gadget, v[1])
.push(function handleMethodCallSuccess() { .push(function handleMethodCallSuccess() {
trans.complete.apply(trans, arguments);
// drop the promise reference, to allow garbage collection // drop the promise reference, to allow garbage collection
delete local_transaction_dict[transaction_id]; delete local_transaction_dict[transaction_id];
trans.complete.apply(trans, arguments); })
}, function handleMethodCallError(e) { .push(undefined, function handleMethodCallError(e) {
var error_type = convertObjectToErrorType(e), var error_type = convertObjectToErrorType(e),
message; message;
if (e instanceof Error) { if (e instanceof Error) {
...@@ -2800,12 +2805,19 @@ if (typeof document.contains !== 'function') { ...@@ -2800,12 +2805,19 @@ if (typeof document.contains !== 'function') {
} else { } else {
message = e; message = e;
} }
try {
trans.error({
type: error_type,
msg: message
});
} catch (new_error) {
trans.error({
type: convertObjectToErrorType(new_error),
msg: new_error.toString()
});
}
// drop the promise reference, to allow garbage collection // drop the promise reference, to allow garbage collection
delete local_transaction_dict[transaction_id]; delete local_transaction_dict[transaction_id];
trans.error({
type: error_type,
msg: message
});
}); });
trans.delayReturn(true); trans.delayReturn(true);
}); });
...@@ -2876,4 +2888,4 @@ if (typeof document.contains !== 'function') { ...@@ -2876,4 +2888,4 @@ if (typeof document.contains !== 'function') {
); );
}(document, window, RSVP, DOMParser, Channel, MutationObserver, Node, }(document, window, RSVP, DOMParser, Channel, MutationObserver, Node,
FileReader, Blob, navigator, Event, URL)); FileReader, Blob, navigator, Event, URL));
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_renderjs_js.xml
View file @ 2de04c43
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1004.26548.30757.41045</string> </value> <value> <string>1005.39922.11123.57429</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1673362285.2</float> <float>1701788447.11</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/renderjs.js.js
View file @ 2de04c43
...@@ -300,25 +300,29 @@ ...@@ -300,25 +300,29 @@
postMessage({ id: id, callback: cbName, params: v}); postMessage({ id: id, callback: cbName, params: v});
}, },
error: function(error, message) { error: function(error, message) {
completed = true;
// verify in table // verify in table
if (!inTbl[id]) throw "error called for nonexistent message: " + id; if (!inTbl[id]) throw "error called for nonexistent message: " + id;
// remove transaction from table
delete inTbl[id];
// send error // send error
postMessage({ id: id, error: error, message: message }); postMessage({ id: id, error: error, message: message });
completed = true;
// remove transaction from table
delete inTbl[id];
}, },
complete: function(v) { complete: function(v) {
completed = true;
// verify in table // verify in table
if (!inTbl[id]) throw "complete called for nonexistent message: " + id; if (!inTbl[id]) throw "complete called for nonexistent message: " + id;
// remove transaction from table
delete inTbl[id];
// send complete // send complete
postMessage({ id: id, result: v }); postMessage({ id: id, result: v });
},
completed = true;
// remove transaction from table
delete inTbl[id];
},
delayReturn: function(delay) { delayReturn: function(delay) {
if (typeof delay === 'boolean') { if (typeof delay === 'boolean') {
shouldDelayReturn = (delay === true); shouldDelayReturn = (delay === true);
...@@ -2785,10 +2789,11 @@ if (typeof document.contains !== 'function') { ...@@ -2785,10 +2789,11 @@ if (typeof document.contains !== 'function') {
local_transaction_dict[transaction_id] = local_transaction_dict[transaction_id] =
root_gadget[v[0]].apply(root_gadget, v[1]) root_gadget[v[0]].apply(root_gadget, v[1])
.push(function handleMethodCallSuccess() { .push(function handleMethodCallSuccess() {
trans.complete.apply(trans, arguments);
// drop the promise reference, to allow garbage collection // drop the promise reference, to allow garbage collection
delete local_transaction_dict[transaction_id]; delete local_transaction_dict[transaction_id];
trans.complete.apply(trans, arguments); })
}, function handleMethodCallError(e) { .push(undefined, function handleMethodCallError(e) {
var error_type = convertObjectToErrorType(e), var error_type = convertObjectToErrorType(e),
message; message;
if (e instanceof Error) { if (e instanceof Error) {
...@@ -2800,12 +2805,19 @@ if (typeof document.contains !== 'function') { ...@@ -2800,12 +2805,19 @@ if (typeof document.contains !== 'function') {
} else { } else {
message = e; message = e;
} }
try {
trans.error({
type: error_type,
msg: message
});
} catch (new_error) {
trans.error({
type: convertObjectToErrorType(new_error),
msg: new_error.toString()
});
}
// drop the promise reference, to allow garbage collection // drop the promise reference, to allow garbage collection
delete local_transaction_dict[transaction_id]; delete local_transaction_dict[transaction_id];
trans.error({
type: error_type,
msg: message
});
}); });
trans.delayReturn(true); trans.delayReturn(true);
}); });
...@@ -2876,4 +2888,4 @@ if (typeof document.contains !== 'function') { ...@@ -2876,4 +2888,4 @@ if (typeof document.contains !== 'function') {
); );
}(document, window, RSVP, DOMParser, Channel, MutationObserver, Node, }(document, window, RSVP, DOMParser, Channel, MutationObserver, Node,
FileReader, Blob, navigator, Event, URL)); FileReader, Blob, navigator, Event, URL));
\ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7