some more code cleanup and UI optimizations
This commit is contained in:
@ -139,9 +139,7 @@ var CodeOceanEditor = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
handleKeyPress: function (event) {
|
handleKeyPress: function (event) {
|
||||||
if (event.which === this.ALT_1_KEY_CODE) {
|
if (event.which === this.ALT_R_KEY_CODE) {
|
||||||
this.showWorkspaceTab(event);
|
|
||||||
} else if (event.which === this.ALT_R_KEY_CODE) {
|
|
||||||
$('#run').trigger('click');
|
$('#run').trigger('click');
|
||||||
} else if (event.which === this.ALT_S_KEY_CODE) {
|
} else if (event.which === this.ALT_S_KEY_CODE) {
|
||||||
$('#assess').trigger('click');
|
$('#assess').trigger('click');
|
||||||
@ -276,7 +274,6 @@ var CodeOceanEditor = {
|
|||||||
$(document).on('click', '#results a', this.showOutput.bind(this));
|
$(document).on('click', '#results a', this.showOutput.bind(this));
|
||||||
$(document).on('keypress', this.handleKeyPress.bind(this));
|
$(document).on('keypress', this.handleKeyPress.bind(this));
|
||||||
this.initializeFileTreeButtons();
|
this.initializeFileTreeButtons();
|
||||||
this.initializeWorkflowButtons();
|
|
||||||
this.initializeWorkspaceButtons();
|
this.initializeWorkspaceButtons();
|
||||||
this.initializeRequestForComments()
|
this.initializeRequestForComments()
|
||||||
},
|
},
|
||||||
@ -324,12 +321,9 @@ var CodeOceanEditor = {
|
|||||||
$('[data-tooltip]').tooltip();
|
$('[data-tooltip]').tooltip();
|
||||||
},
|
},
|
||||||
|
|
||||||
initializeWorkflowButtons: function () {
|
|
||||||
$('#start').on('click', this.showWorkspaceTab.bind(this));
|
|
||||||
$('#submit').on('click', this.submitCode.bind(this));
|
|
||||||
},
|
|
||||||
|
|
||||||
initializeWorkspaceButtons: function () {
|
initializeWorkspaceButtons: function () {
|
||||||
|
$('#submit').on('click', this.submitCode.bind(this));
|
||||||
$('#assess').on('click', this.scoreCode.bind(this));
|
$('#assess').on('click', this.scoreCode.bind(this));
|
||||||
$('#dropdown-render, #render').on('click', this.renderCode.bind(this));
|
$('#dropdown-render, #render').on('click', this.renderCode.bind(this));
|
||||||
$('#dropdown-run, #run').on('click', this.runCode.bind(this));
|
$('#dropdown-run, #run').on('click', this.runCode.bind(this));
|
||||||
@ -452,8 +446,7 @@ var CodeOceanEditor = {
|
|||||||
var file = $(event.target).data('file');
|
var file = $(event.target).data('file');
|
||||||
var line = $(event.target).data('line');
|
var line = $(event.target).data('line');
|
||||||
|
|
||||||
this.showWorkspaceTab(null);
|
// set active file, only needed for codepilot, so skipped for now
|
||||||
// set active file ?!?!
|
|
||||||
|
|
||||||
var frame = $('div.frame[data-filename="' + file + '"]');
|
var frame = $('div.frame[data-filename="' + file + '"]');
|
||||||
this.showFrame(frame);
|
this.showFrame(frame);
|
||||||
|
@ -156,6 +156,7 @@ CodeOceanEditorSubmissions = {
|
|||||||
if ($('#test').is(':visible')) {
|
if ($('#test').is(':visible')) {
|
||||||
this.createSubmission('#test', null, function(response) {
|
this.createSubmission('#test', null, function(response) {
|
||||||
this.showSpinner($('#test'));
|
this.showSpinner($('#test'));
|
||||||
|
$('#score_div').addClass('hidden');
|
||||||
var url = response.test_url.replace(this.FILENAME_URL_PLACEHOLDER, this.active_file.filename);
|
var url = response.test_url.replace(this.FILENAME_URL_PLACEHOLDER, this.active_file.filename);
|
||||||
this.initializeSocketForTesting(url);
|
this.initializeSocketForTesting(url);
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
@ -107,10 +107,11 @@ button i.fa-spin {
|
|||||||
.sidebar-col-collapsed {
|
.sidebar-col-collapsed {
|
||||||
-webkit-transition: width 2s;
|
-webkit-transition: width 2s;
|
||||||
transition: width 2s;
|
transition: width 2s;
|
||||||
width:52px;
|
width:67px;
|
||||||
float:left;
|
float:left;
|
||||||
min-height: 1px;
|
min-height: 1px;
|
||||||
padding-left: 15px;
|
padding-left: 15px;
|
||||||
|
padding-right: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-col {
|
.sidebar-col {
|
||||||
@ -125,8 +126,6 @@ button i.fa-spin {
|
|||||||
|
|
||||||
.editor-col {
|
.editor-col {
|
||||||
min-height: 1px;
|
min-height: 1px;
|
||||||
padding-left: 15px;
|
|
||||||
padding-right: 15px;
|
|
||||||
width:auto;
|
width:auto;
|
||||||
height:100%;
|
height:100%;
|
||||||
overflow:hidden;
|
overflow:hidden;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
button.btn class=local_assigns.fetch(:classes, 'btn-primary') *local_assigns.fetch(:data, {}) disabled=local_assigns.fetch(:disabled, false) id=id title=local_assigns[:title] type='button'
|
button.btn class=local_assigns.fetch(:classes, 'btn-primary btn-sm') *local_assigns.fetch(:data, {}) disabled=local_assigns.fetch(:disabled, false) id=id title=local_assigns[:title] type='button'
|
||||||
i.fa.fa-circle-o-notch.fa-spin
|
i.fa.fa-circle-o-notch.fa-spin
|
||||||
i class=icon
|
i class=icon
|
||||||
= label
|
= label
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
div id='output_sidebar_collapsed'
|
div id='output_sidebar_collapsed'
|
||||||
= render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_output_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '')
|
= render('editor_button', classes: 'btn-block btn-primary btn-sm', data: {:'data-toggle' => 'tooltip', :'data-placement' => 'left'}, title: t('exercises.editor.expand_output_sidebar'), icon: 'fa fa-plus-square', id: 'toggle-sidebar-output-collapsed', label: '')
|
||||||
div id='output_sidebar_uncollapsed' class='hidden col-sm-12' data-message-no-output=t('exercises.implement.no_output')
|
div id='output_sidebar_uncollapsed' class='hidden col-sm-12 enforce-bottom-margin' data-message-no-output=t('exercises.implement.no_output')
|
||||||
.row
|
.row
|
||||||
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar'))
|
= render('editor_button', classes: 'btn-block btn-primary btn-sm', icon: 'fa fa-minus-square', id: 'toggle-sidebar-output', label: t('exercises.editor.collapse_output_sidebar'))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user