From a5dd4ceb992a030da34ded502397776fcf53b7b9 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Tue, 5 Nov 2019 09:30:03 +0100
Subject: [PATCH] diffs: toggle race condition on sticky vs wide-diff-mode that
 caused some display artifacts

---
 rhodecode/templates/codeblocks/diffs.mako | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
index ec79c6aa..af37eaf1 100644
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -1106,12 +1106,6 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
                 ]
             };
 
-            // get stored diff mode and pre-enable it
-            if (templateContext.session_attrs.wide_diff_mode === "true") {
-                Rhodecode.comments.toggleWideMode(null);
-                $('.toggle-wide-diff').addClass('btn-active');
-            }
-
             var diffMenuId = "#diff_menu_" + "${diffset_container_id}";
             $(diffMenuId).select2({
                 minimumResultsForSearch: -1,
@@ -1144,6 +1138,13 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
                         _gettext('Expand all files'));
                 }
                 updateSticky()
+            };
+
+            // get stored diff mode and pre-enable it
+            if (templateContext.session_attrs.wide_diff_mode === "true") {
+                Rhodecode.comments.toggleWideMode(null);
+                $('.toggle-wide-diff').addClass('btn-active');
+                updateSticky();
             }
         });
     </script>