Commit 025650af authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

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

parents b27ad529 ac9dca4a
Pipeline #3708 canceled with stage
......@@ -16,7 +16,7 @@
</head>
<body id="container">
<!-- Modal -->
<!-- Loading Modal -->
<div class="modal fade" id="loading-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
......@@ -30,7 +30,7 @@
</div>
</div>
<!-- Modal -->
<!-- Dialog 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">
......@@ -44,7 +44,9 @@
</div>
</div>
</div>
</div>
</div>
<!-- Message Modal -->
<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-content">
......
......@@ -61,6 +61,7 @@ function create_window(cid, type, width, height, xpos, ypos, attr_array) {
$("#dialog-body").prepend(dialog_div.outerHTML)
$("#dialog-div").prepend(data)
var props_map = {
"dialog_prefs.html": "Pd-L20rk",
"dialog_canvas.html": "Canvas",
"dialog_iemgui.html": "Iemgui",
"dialog_gatom.html": "Atom",
......
......@@ -421,7 +421,7 @@
<label data-i18n="[title]prefs.startup.paths_tt">
<span data-i18n="prefs.startup.paths"></span>
</label>
<div style="height:24vh; width:89vw; background:white; border: 1px solid #bbb; overflow-y:auto; overflow-x:auto; padding:0px;">
<div style="height:24vh; width:100%; background:white; border: 1px solid #bbb; overflow-y:auto; overflow-x:auto; padding:0px;">
<table id="startup_paths" style="width:100%; background:white;">
</table>
</div>
......@@ -439,7 +439,7 @@
<label data-i18n="[title]prefs.startup.libs_tt">
<span data-i18n="prefs.startup.libs"></span>
</label>
<div style="height:24vh; width:89vw; background:white; border: 1px solid #bbb; overflow-y:auto; overflow-x:auto; padding:0px;">
<div style="height:24vh; width:100%; background:white; border: 1px solid #bbb; overflow-y:auto; overflow-x:auto; padding:0px;">
<table id="startup_libs" style="width:100%; background:white;">
</table>
</div>
......@@ -454,13 +454,13 @@
<span data-i18n="prefs.startup.del"></span>
</button>
</div>
<label data-i18n="[title]prefs.startup.flags_tt">
<label data-i18n="[title]prefs.startup.flags_tt" style="width:100%; text-align: left;">
<span data-i18n="prefs.startup.flags"></span>
<br/>
<input type="text"
id="startup_flags"
name="startup_flags"
style="width:89vw">
style="width:100%">
</label>
</div>
</div>
......@@ -773,7 +773,7 @@ function cancel() {
// if you can open the Prefs dialog after clicking "Ok".
pdgui.remove_dialogwin(pd_object_callback);
if(pdgui.is_webapp()){
remove_dialog(pd_object_callback)
$("#dialog-modal").modal("hide");
}else{
window.close(true);
}
......@@ -1327,6 +1327,12 @@ function add_events(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>
......
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