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

Merge branch 'emscripten' into def_zoom_in

parents 0c9c42e4 ae0fb11a
......@@ -101,7 +101,7 @@
<div class="console-find-webapp" id="console_find" style="display: none;">
<div class="d-flex justify-content-end align-items-center">
<label><input type="text" id="console_find_text" name="console_find_text" defaultValue="Search in Console" style="width: 15em;" placeholder="Search in Console" /> </label>
<label class="highlight-find d-flex align-items-center" style = "color: #6c757d">
<label class="highlight-find d-flex align-items-center">
Highlight All
<input class="m-1" type="checkbox" id="console_find_highlight" name="console_find_highlight" onchange="console_find_highlight_all(this);" />
</label>
......
......@@ -46,6 +46,9 @@ function load_menu_actions(){
window.getSelection().empty();
window.getSelection().addRange(range);
}
// show sidebar
$("#console_bottom").collapse("show");
$("#open-icon").removeClass("rotate");
}
});
......@@ -88,6 +91,35 @@ 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")}});
......@@ -152,6 +184,8 @@ function add_shortcuts(cid){
switch(shortcut) {
case "Ctrl+=":
break;
case "F11":
break;
default:
e.preventDefault()
window.shortkeys[cid][shortcut].click();
......
......@@ -72,16 +72,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -176,16 +176,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -66,16 +66,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -183,16 +183,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -73,16 +73,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -74,16 +74,16 @@ body {
/* marks for matches to console_find */
mark {
background: #eee8d5;
background: #eee8d5 !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: #b58900;
background: #b58900 !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -74,16 +74,16 @@ body {
/* marks for matches to console_find */
mark {
background: #eee8d5;
background: #eee8d5 !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: #b58900;
background: #b58900 !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -72,16 +72,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -72,16 +72,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -66,16 +66,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
......@@ -72,16 +72,16 @@ body {
/* marks for matches to console_find */
mark {
background: white;
background: white !important;
}
mark.console_find_current.console_find_highlighted,
mark.console_find_current {
background: yellow;
background: yellow !important;
}
mark.console_find_highlighted {
background: #6bd4e6;
background: #6bd4e6 !important;
}
#console_find {
......
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