htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into error-info

Browse Source
This commit is contained in:
Maximilian Grundke
2017-07-12 09:57:54 +02:00
parent 4d684a7a05 ae04a5adc5
commit d779849e4a
6 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/editor/editor.js.erb
View File

@ -182,6 +182,7 @@ configureEditors: function () {
},
initializeEditors: function () {
this.editors = [];
$('.editor').each(function (index, element) {
// Resize frame on load

1
app/assets/javascripts/editor/submissions.js.erb
View File

@ -196,6 +196,7 @@ CodeOceanEditorSubmissions = {
unloadAutoSave: function() {
if(this.autosaveTimer != null){
this.autosave();
clearTimeout(this.autosaveTimer);
}
},

3
app/assets/javascripts/file_templates.js.coffee
View File

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

6
app/views/application/_flash.html.slim
View File

@ -1,3 +1,5 @@
#flash.fixed_error_messages.clickthrough data-message-failure=t('shared.message_failure')
#flash.fixed_error_messages data-message-failure=t('shared.message_failure')
- %w[alert danger info notice success warning].each do |severity|
p.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}" id="flash-#{severity}" = flash[severity]
div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}" id="flash-#{severity}"
p = flash[severity]
span.fa.fa-times