Commit c959b708 authored by Arnaud Fontaine's avatar Arnaud Fontaine

erp5_code_mirror: Refresh Component history revisions (used for merge mode)...

erp5_code_mirror: Refresh Component history revisions (used for merge mode) when saving with CTRL+s.
parent 06c09cbb
...@@ -201,6 +201,8 @@ ...@@ -201,6 +201,8 @@
* result as well\n * result as well\n
*/\n */\n
function successHandler(data) {\n function successHandler(data) {\n
generateHistorySelectElement();\n
\n
transition_message = $(\'#transition_message\');\n transition_message = $(\'#transition_message\');\n
transition_message.css(\'opacity\', 0.0);\n transition_message.css(\'opacity\', 0.0);\n
transition_message.html(data);\n transition_message.html(data);\n
...@@ -466,8 +468,14 @@ ...@@ -466,8 +468,14 @@
maximize();\n maximize();\n
}\n }\n
\n \n
function generateHistorySelectElement(data) {\n function generateHistorySelectElement() {\n
container_elem = $(\'<p style="margin: 0; padding: 0;"></p>\');\n function successHandler(data) {\n
container_elem = $(\'#history_select_container\');\n
if(container_elem.length == 0)\n
container_elem = $(\'<p style="margin: 0; padding: 0;" id="history_select_container"></p>\');\n
else\n
container_elem.empty();\n
\n
for(var i = 0; i < 2; i++)\n for(var i = 0; i < 2; i++)\n
{\n {\n
var is_right = (i == 1);\n var is_right = (i == 1);\n
...@@ -555,7 +563,10 @@ ...@@ -555,7 +563,10 @@
async: true,\n async: true,\n
dataType: \'json\',\n dataType: \'json\',\n
url: \'Component_getTextContentHistoryRevisionDictListAsJSON\',\n url: \'Component_getTextContentHistoryRevisionDictListAsJSON\',\n
success: generateHistorySelectElement});\n success: successHandler});\n
}\n
\n
generateHistorySelectElement();\n
</script>\n </script>\n
......
2014-12-26 arnaud.fontaine
* Refresh Component history revisions when saving with CTRL+s.
2014-12-26 arnaud.fontaine 2014-12-26 arnaud.fontaine
* Fix layout of warnings/errors div to make it consistent with maximize info div. * Fix layout of warnings/errors div to make it consistent with maximize info div.
......
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