Skip to content

remove variable width editor #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

remove variable width editor #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a6e25
remove variable width editor
eduxstad May 9, 2022
ee0384d
remove variable width resize bar
eduxstad May 9, 2022
0b91198
remove css references to resize bar
eduxstad May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions assets/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ body {

#editor-workspace {
min-width: 400px;
max-width: 100%;
max-width: 850px;
flex: 1;
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -1179,22 +1179,6 @@ Apple screws everything up for everyone who tries to develop on its platforms */
color: var(--tutorial-btn-hover);
}

#resize-editor {
height: 200px;
width: 10px;
cursor: w-resize;
background-color: transparent;
border-left: 3px solid var(--display-4-color);
transition: border 0.2s;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}

#resize-editor:hover {
border-left: 9px solid var(--display-4-color);
}


/* sorry not sorry */

#nevergonnagiveyouup:hover {
Expand Down
1 change: 0 additions & 1 deletion assets/js/simulator_backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,6 @@ function display_info(sect) {

window.onbeforeunload = function() {
window.localStorage.evalboardtheme = document.getElementById("evalthemeselector").value;
window.localStorage.editor_width = $("#editor-workspace").width();
localStorage.ace_options = JSON.stringify(editor.getOptions());
if (localStorage.ice40DarkMode == "true")
localStorage.ace_dark_theme = editor.getOption("theme");
Expand Down
46 changes: 1 addition & 45 deletions assets/js/workspaces.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,12 +527,6 @@ function switchTabHandler (e) {
}

window.onload = function () {
if (window.localStorage.editor_width) {
$("#editor-workspace").css("flex", "none")
$('#editor-workspace').width (window.localStorage.editor_width || '65%')
$('#outputview').width (window.localStorage.editor_width || '65%')
}
var last_page_x = $('#resize-editor').position().left;

window.addEventListener("mousewheel", codescroll, { passive: false })
// load_button.innerHTML = load_btn_text
Expand Down Expand Up @@ -754,14 +748,6 @@ window.onload = function () {
).on ('click', '#mainview > div,nav', () => {
if ($(".notifications").css("opacity") == "1")
toggleNotifs(true);
}).on ('mousedown', '#resize-editor', e => {
e.preventDefault();
if (term) {
term.resize (parseInt ($("#editor-workspace").width() / 10.5), parseInt ($("#editor-workspace").height() / 22.5))
}
$(e.target).addClass ('dragging')
last_page_x = e.pageX
return false;
}).on ('click', '.module_check', e => {
var icon = e.currentTarget;
var mod = icon.parentNode.querySelector('label').innerHTML;
Expand Down Expand Up @@ -804,37 +790,7 @@ window.onload = function () {
localStorage.switchsim = 'workspace'
$('#switchsim')[0].innerHTML = 'Workspace Simulation'
}

$(document).mousemove (e => {
if ($('#resize-editor')[0].classList.contains ("dragging")) {
if (last_page_x == 0) { //first time adjusting the editor
last_page_x = $('#resize-editor').position().left;
}
if (e.pageX < last_page_x) {
// left
var diff = (last_page_x - e.pageX)*2; //doubled to try to match width diff to fast cursor movement
$("#editor-workspace").width($("#editor-workspace").width() - diff)
$("#outputview").width($("#editor-workspace").width() - diff)
}
else {
// right - make sure not to drag it larger than the width of the window!
var diff = (e.pageX - last_page_x)*2; //doubled to try to match width diff to fast cursor movement
if ($("#status-navbar").width() - $("#editor-workspace").width() - diff >= 700
|| ($("#status-navbar").width() < 1675 && $("#editor-workspace").width() + diff < 1600)) {
$("#editor-workspace").width($("#editor-workspace").width() + diff)
$("#outputview").width($("#editor-workspace").width() + diff)
}
}
last_page_x = e.pageX
$("#editor-workspace").css("flex", "none")
}
})

$(document).mouseup (e => {
$('#resize-editor').removeClass ('dragging')
return false;
})


// When the simulator starts for the first time, load template and set up tabs:
promised_code = new Promise((resolve, reject) => {
try {
Expand Down
3 changes: 1 addition & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,6 @@ <h1 class="desc display-4 text-center text-muted" style="border-right: 0;">Sourc
View</button>
</div>
</div>
<div id="resize-editor" draggable="true"></div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1086,4 +1085,4 @@ <h4 class="display-4 text-muted" id="loading" style="display: none; font-size: 2
<script src="assets/js/plotly-latest.min.js"></script> -->
</body>

</html>
</html>