tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

loading on resize and update elements VC

Browse Source
This commit is contained in:
Daniel Barbero 2020-01-14 15:52:47 +01:00
parent e723c98275
commit 89b43f1aee
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/javascript/pandora.js
View File

@ -2083,6 +2083,13 @@ function load_modal(settings) {
} }
if (flagError === false) { if (flagError === false) {
if (
settings.onsubmitClose != undefined &&
settings.onsubmitClose == 1
) {
$(this).dialog("close");
}
$.ajax({ $.ajax({
method: "post", method: "post",
url: settings.url, url: settings.url,

8
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -325,13 +325,13 @@ function createVisualConsole(
// Resize the element to its initial Size. // Resize the element to its initial Size.
item.resize(e.prevSize.width, e.prevSize.height); item.resize(e.prevSize.width, e.prevSize.height);
done(); done();
return; // Stop task execution. return; // Stop task execution.
} }
} }
visualConsole.updateElement(data); visualConsole.updateElement(data);
item.setMeta({ isUpdating: false });
done(); done();
} }
@ -1397,8 +1397,8 @@ function createOrUpdateVisualConsoleItem(
return; return;
} }
$("#modalVCItemForm").dialog("close");
if (item.itemProps.id) { if (item.itemProps.id) {
item.setMeta({ isUpdating: false });
visualConsole.updateElement(data); visualConsole.updateElement(data);
} else { } else {
data["receivedAt"] = new Date(); data["receivedAt"] = new Date();
@ -1444,8 +1444,12 @@ function createOrUpdateVisualConsoleItem(
var label = tinyMCE.activeEditor.getContent(); var label = tinyMCE.activeEditor.getContent();
$("#textarea_label").val(label); $("#textarea_label").val(label);
} }
if (item.itemProps.id) {
item.setMeta({ isUpdating: true });
}
} }
}, },
onsubmitClose: 1,
beforeClose: function() { beforeClose: function() {
tinyMCE.remove("#textarea_label"); tinyMCE.remove("#textarea_label");
tinyMCE.execCommand("mceRemoveControl", true, "textarea_label"); tinyMCE.execCommand("mceRemoveControl", true, "textarea_label");

2
pandora_console/include/visual-console-client/vc.main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
pandora_console/include/visual-console-client/vc.main.min.js.map
View File

File diff suppressed because one or more lines are too long

7
visual_console_client/src/VisualConsole.ts
View File

@ -305,6 +305,13 @@ export default class VisualConsole {
y: props.y y: props.y
}; };
const meta = this.elementsById[itemId].meta;
this.elementsById[itemId].meta = {
...meta,
isUpdating: true
};
relations.forEach(relation => { relations.forEach(relation => {
if (relation.parentId === itemId) { if (relation.parentId === itemId) {
// Move the line start. // Move the line start.