From 98afb71ba97272a1fa465a41ed8f79f19ac3c372 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Tue, 3 May 2016 08:32:27 +0200 Subject: [PATCH] prevent request comment button to be shown on editors not beeing the first editor too early. --- app/assets/javascripts/editor.js.erb | 4 ++-- app/assets/stylesheets/editor.css.scss | 2 +- app/views/exercises/_editor_frame.html.slim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index 21afeec7..6b2ac3b5 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -478,7 +478,7 @@ $(function() { }; var initializeRequestForComments = function () { - var button = $('#requestCommentsButton'); + var button = $('.requestCommentsButton'); button.hide(); button.on('click', function() { $('#comment-modal').modal('show'); @@ -1171,7 +1171,7 @@ $(function() { }).error(ajaxError); $('#comment-modal').modal('hide'); - var button = $('#requestCommentsButton'); + var button = $('.requestCommentsButton'); button.fadeOut(); } diff --git a/app/assets/stylesheets/editor.css.scss b/app/assets/stylesheets/editor.css.scss index ef298c9e..e41153e2 100644 --- a/app/assets/stylesheets/editor.css.scss +++ b/app/assets/stylesheets/editor.css.scss @@ -89,7 +89,7 @@ button i.fa-spin { font-size: 0.8em; } -#requestCommentsButton { +.requestCommentsButton { position: relative; margin-top: -50px; margin-right: 25px; diff --git a/app/views/exercises/_editor_frame.html.slim b/app/views/exercises/_editor_frame.html.slim index 9c3cc738..eacc62a9 100644 --- a/app/views/exercises/_editor_frame.html.slim +++ b/app/views/exercises/_editor_frame.html.slim @@ -14,6 +14,6 @@ .editor-content.hidden data-file-id=file.ancestor_id = file.content .editor data-file-id=file.ancestor_id data-indent-size=file.file_type.indent_size data-mode=file.file_type.editor_mode data-read-only=file.read_only data-id=file.id - button.btn.btn-primary id='requestCommentsButton' type='button' + button.btn.btn-primary.requestCommentsButton type='button' i.fa.fa-comment-o = t('exercises.editor.requestComments') \ No newline at end of file