From 4d6c41206277ca93147bcb4c344fba36d8a463c0 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Nov 16 2018 18:09:07 +0000 Subject: Fix active classes on Markdown preview tabs When in editing mode, clicking the "edit" tab above the text box causes the editor to toggle the classes without checking whether or not the editor is already in edit mode. This fixes that by using add/removeClass instead of toggleClass. Fixes: #3991 Signed-off-by: Alexander Scheel --- diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 688bbd8..21fdb07 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -1245,8 +1245,8 @@ $( "#previewinmarkdown" ).click( success: function(res) { var preview = emojione.toImage(res); $( "#preview" ).html(preview); - $( "#previewinmarkdown" ).toggleClass("active"); - $( "#editinmarkdown" ).toggleClass("active"); + $( "#previewinmarkdown" ).addClass("active"); + $( "#editinmarkdown" ).removeClass("active"); $( "#comment" ).hide(); $( "#preview" ).show(); }, @@ -1260,8 +1260,8 @@ $( "#previewinmarkdown" ).click( $( "#editinmarkdown" ).click( function(event, ui) { - $( "#editinmarkdown" ).toggleClass("active"); - $( "#previewinmarkdown" ).toggleClass("active"); + $( "#editinmarkdown" ).addClass("active"); + $( "#previewinmarkdown" ).removeClass("active"); $( "#comment" ).show(); $( "#preview" ).hide(); } diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html index fbfba50..f2bdc0c 100644 --- a/pagure/templates/new_issue.html +++ b/pagure/templates/new_issue.html @@ -339,8 +339,8 @@ $(function() { success: function(res) { var preview = emojione.toImage(res); $( "#preview" ).html(preview); - $( "#previewinmarkdown" ).toggleClass("active"); - $( "#editinmarkdown" ).toggleClass("active"); + $( "#previewinmarkdown" ).addClass("active"); + $( "#editinmarkdown" ).removeClass("active"); $( "#issue_content" ).hide(); $( "#preview" ).show(); }, @@ -354,8 +354,8 @@ $(function() { $( "#editinmarkdown" ).click( function(event, ui) { - $( "#editinmarkdown" ).toggleClass("active"); - $( "#previewinmarkdown" ).toggleClass("active"); + $( "#editinmarkdown" ).addClass("active"); + $( "#previewinmarkdown" ).removeClass("active"); $( "#issue_content" ).show(); $( "#preview" ).hide(); } diff --git a/pagure/templates/repo_new_pull_request.html b/pagure/templates/repo_new_pull_request.html index 572cf69..4132620 100644 --- a/pagure/templates/repo_new_pull_request.html +++ b/pagure/templates/repo_new_pull_request.html @@ -456,8 +456,8 @@ $(document).ready(function() { success: function(res) { var preview = emojione.toImage(res); $( "#preview" ).html(preview); - $( "#previewinmarkdown" ).toggleClass("active"); - $( "#editinmarkdown" ).toggleClass("active"); + $( "#previewinmarkdown" ).addClass("active"); + $( "#editinmarkdown" ).removeClass("active"); $( "#initial_comment" ).hide(); $( "#preview" ).show(); }, @@ -472,8 +472,8 @@ $(document).ready(function() { $( "#editinmarkdown" ).click( function(event, ui) { - $( "#editinmarkdown" ).toggleClass("active"); - $( "#previewinmarkdown" ).toggleClass("active"); + $( "#editinmarkdown" ).addClass("active"); + $( "#previewinmarkdown" ).removeClass("active"); $( "#initial_comment" ).show(); $( "#preview" ).hide(); } diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html index 3092dcc..94889aa 100644 --- a/pagure/templates/repo_pull_request.html +++ b/pagure/templates/repo_pull_request.html @@ -1316,8 +1316,8 @@ $(document).ready(function () { success: function(res) { var preview = emojione.toImage(res); $( "#preview" ).html(preview); - $( "#previewinmarkdown" ).toggleClass("active"); - $( "#editinmarkdown" ).toggleClass("active"); + $( "#previewinmarkdown" ).addClass("active"); + $( "#editinmarkdown" ).removeClass("active"); _el.hide(); $( "#preview" ).show(); }, @@ -1339,8 +1339,8 @@ $(document).ready(function () { var _token = "{{ mergeform.csrf_token.current_token }}"; {% endif %} - $( "#editinmarkdown" ).toggleClass("active"); - $( "#previewinmarkdown" ).toggleClass("active"); + $( "#editinmarkdown" ).addClass("active"); + $( "#previewinmarkdown" ).removeClass("active"); _el.show(); $( "#preview" ).hide(); }