Commit aaf8b923 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'prakhar/purr-data-imp_prop_layout' into emscripten

parents 2237366d e06c02e2
Pipeline #3695 canceled with stage
...@@ -31,6 +31,20 @@ ...@@ -31,6 +31,20 @@
</div> </div>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="dialog-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document" style="width: fit-content;">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="dialog-title"></h5>
<button type="button" class="close" onClick="cancel()" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" id="dialog-body">
</div>
</div>
</div>
</div>
<div class="modal fade" id="message-modal" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal fade" id="message-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
......
...@@ -58,9 +58,17 @@ function create_window(cid, type, width, height, xpos, ypos, attr_array) { ...@@ -58,9 +58,17 @@ function create_window(cid, type, width, height, xpos, ypos, attr_array) {
// cleaning dialog div // cleaning dialog div
dialog_div.innerHTML = ""; dialog_div.innerHTML = "";
$("#sidebar-body-dialog").prepend(dialog_div.outerHTML) $("#dialog-body").prepend(dialog_div.outerHTML)
$("#dialog-div").prepend(data) $("#dialog-div").prepend(data)
var props_map = {
"dialog_canvas.html": "Canvas",
"dialog_iemgui.html": "Iemgui",
"dialog_gatom.html": "Atom",
"dialog_font.html": "Font"
};
$("#dialog-title").text(props_map[f] + " Properties");
$("#dialog-modal").modal("show");
// initialize the dialog window // initialize the dialog window
register_dialog(cid,attr_array); register_dialog(cid,attr_array);
}); });
......
...@@ -613,7 +613,7 @@ function cancel() { ...@@ -613,7 +613,7 @@ function cancel() {
var i, attrs, gfxstub; var i, attrs, gfxstub;
//window.close(true); //window.close(true);
if(pdgui.is_webapp()){ if(pdgui.is_webapp()){
remove_dialog(pd_object_callback) $("#dialog-modal").modal("hide");
} }
pdgui.pdsend(pd_object_callback, "cancel"); pdgui.pdsend(pd_object_callback, "cancel");
...@@ -803,6 +803,12 @@ function add_events(name) { ...@@ -803,6 +803,12 @@ function add_events(name) {
}); });
} }
pdgui.dialog_bindings(name); pdgui.dialog_bindings(name);
if (pdgui.is_webapp) {
$("#dialog-modal").on("hidden.bs.modal", function (e) {
remove_dialog(pd_object_callback)
$("#dialog-modal").off("hidden.bs.modal")
})
}
} }
</script> </script>
......
...@@ -118,7 +118,7 @@ function apply() { ...@@ -118,7 +118,7 @@ function apply() {
function cancel() { function cancel() {
//window.close(true); //window.close(true);
if(pdgui.is_webapp()){ if(pdgui.is_webapp()){
remove_dialog(pd_object_callback) $("#dialog-modal").modal("hide");
} }
pdgui.pdsend(pd_object_callback, "cancel"); pdgui.pdsend(pd_object_callback, "cancel");
...@@ -191,6 +191,12 @@ function add_events(name) { ...@@ -191,6 +191,12 @@ function add_events(name) {
}); });
} }
pdgui.dialog_bindings(name); pdgui.dialog_bindings(name);
if (pdgui.is_webapp) {
$("#dialog-modal").on("hidden.bs.modal", function (e) {
remove_dialog(pd_object_callback)
$("#dialog-modal").off("hidden.bs.modal")
})
}
} }
</script> </script>
</body> </body>
......
...@@ -259,7 +259,7 @@ function cancel(revert_changes) { ...@@ -259,7 +259,7 @@ function cancel(revert_changes) {
var dirty = false, attr; var dirty = false, attr;
//window.close(true); //window.close(true);
if(pdgui.is_webapp()){ if(pdgui.is_webapp()){
remove_dialog(pd_object_callback) $("#dialog-modal").modal("hide");
} }
if (revert_changes) { if (revert_changes) {
...@@ -394,6 +394,12 @@ function add_events(name) { ...@@ -394,6 +394,12 @@ function add_events(name) {
}); });
} }
pdgui.dialog_bindings(name); pdgui.dialog_bindings(name);
if (pdgui.is_webapp) {
$("#dialog-modal").on("hidden.bs.modal", function (e) {
remove_dialog(pd_object_callback)
$("#dialog-modal").off("hidden.bs.modal")
})
}
} }
</script> </script>
......
...@@ -531,7 +531,7 @@ function cancel(revert_changes) { ...@@ -531,7 +531,7 @@ function cancel(revert_changes) {
var dirty = false, attr; var dirty = false, attr;
//window.close(true); //window.close(true);
if(pdgui.is_webapp()){ if(pdgui.is_webapp()){
remove_dialog(pd_object_callback) $("#dialog-modal").modal("hide");
} }
if (revert_changes) { if (revert_changes) {
for (attr in old_attrs) { for (attr in old_attrs) {
...@@ -673,6 +673,12 @@ function add_events(name) { ...@@ -673,6 +673,12 @@ function add_events(name) {
}); });
} }
pdgui.dialog_bindings(name); pdgui.dialog_bindings(name);
if (pdgui.is_webapp) {
$("#dialog-modal").on("hidden.bs.modal", function (e) {
remove_dialog(pd_object_callback)
$("#dialog-modal").off("hidden.bs.modal")
})
}
} }
</script> </script>
......
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