Commit cdc10498 authored by Prakhar Agarwal's avatar Prakhar Agarwal 🎯
Browse files

Merge branch 'emscripten' into rem_midi_alert

parents 904c0b6f fd4165ad
......@@ -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">
......@@ -85,7 +87,6 @@
<img src="./purr.png" alt="purr-data-logo" />
<h4>Purr Data</h4>
</div>
<hr />
<div id="sidebar-body-dialog"></div>
<hr />
<!-- DSP section -->
......@@ -138,7 +139,7 @@
</a>
</h5>
<div class="console-find-webapp" id="console_find" style="display: none;">
<div class="console-find-webapp mr-3" id="console_find" style="display: none;">
<div class="d-flex justify-content-end align-items-center">
<i class="fa fa-long-arrow-up text-primary" id="find_above" style="cursor: pointer;"></i>
<i class="fa fa-long-arrow-down text-primary" id="find_below" style="cursor: pointer;"></i>
......@@ -149,7 +150,7 @@
</label>
</div>
</div>
<div>
<div class="d-flex justify-content-end align-items-center">
<i class="fa fa-clone text-primary" id="cons_copy" unselectable="on" style="cursor: pointer;" data-toggle="tooltip" title="Copy Console"></i>
<i class='fa fa-trash ml-3 text-primary' style='cursor:pointer' id='clear' data-toggle="tooltip" title="Clear Console"></i>
</div>
......
......@@ -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",
......
......@@ -135,36 +135,6 @@ function load_menu_actions(){
}
});
// View entries
minit("view-fullscreen",{onclick:
function(){
if (!document.fullscreenElement &&
!document.mozFullScreenElement &&
!document.webkitFullscreenElement &&
!document.msFullscreenElement ) {
if (document.documentElement.requestFullscreen) {
document.documentElement.requestFullscreen();
} else if (document.documentElement.msRequestFullscreen) {
document.documentElement.msRequestFullscreen();
} else if (document.documentElement.mozRequestFullScreen) {
document.documentElement.mozRequestFullScreen();
} else if (document.documentElement.webkitRequestFullscreen) {
document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
}
} else {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}
}});
// Media entries
minit("media-test",{onclick: function(){pdbundle.pdgui.web_pd_doc_open("doc/7.stuff/tools", "testtone.pd")}});
minit("media-loadmeter",{onclick: function(){pdbundle.pdgui.web_pd_doc_open("doc/7.stuff/tools", "load-meter.pd")}});
......
......@@ -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>
......
......@@ -82,7 +82,7 @@ exports.menu = {
"undo_web": { key: "Z", modifiers: cmd_or_ctrl },
"redo_web": { key: "Z", modifiers: cmd_or_ctrl + "+Shift" },
"selectall_web":{ key: "Q", modifiers: cmd_or_ctrl + "+Shift"},
"cut_web": { key: "X", modifiers: cmd_or_ctrl + "+Shift" },
"cut_web": { key: "X", modifiers: cmd_or_ctrl },
"copy_web": { key: "C", modifiers: cmd_or_ctrl },
"paste_web": { key: "V", modifiers: cmd_or_ctrl },
"paste_clipboard_web": { key: "G", modifiers: cmd_or_ctrl + "+Shift" },
......@@ -94,7 +94,7 @@ exports.menu = {
"cordinspector_web": { key: "R", modifiers: cmd_or_ctrl + "+Shift" },
"find_web": { key: "F", modifiers: cmd_or_ctrl },
"findagain_web":{ key: "F", modifiers: cmd_or_ctrl + "+Shift"},
"editmode_web": { key: "E", modifiers: cmd_or_ctrl + "+Shift" },
"editmode_web": { key: "E", modifiers: cmd_or_ctrl },
"preferences_web": { key: (process.platform === "darwin") ? "," : "P",
modifiers: cmd_or_ctrl },
......
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