From 46b56fc7ecf7251195dcdba961c3b103664fdd73 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 13 Jan 2016 16:46:40 -0500
Subject: initial fix

---
 app/assets/javascripts/issuable_context.js.coffee | 11 ++++++++++-
 app/assets/javascripts/issue.js.coffee            |  1 -
 app/assets/javascripts/merge_request.js.coffee    |  5 ++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee
index 02232698bc2..bcc3e52bf9b 100644
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ b/app/assets/javascripts/issuable_context.js.coffee
@@ -15,7 +15,16 @@ class @IssuableContext
         $(@).width($(@).outerWidth())
       .on 'affixed-top.bs.affix affixed-bottom.bs.affix', ->
         $(@).width('')
-
+      $discussion = $('.issuable-discussion')
+      $sidebar = $('.issuable-sidebar')
+      discussionHeight = $discussion.height()
+      sidebarHeight = $sidebar.height()
+      console.log(sidebarHeight,discussionHeight)
+      if sidebarHeight > discussionHeight
+        $discussion.height(sidebarHeight + 50)
+        console.log('fixing issues')
+        return
+      # No affix if discussion is smaller than sidebar
       $('.issuable-affix').affix offset:
         top: ->
           @top = ($('.issuable-affix').offset().top - 70)
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee
index 0d26c58a81d..2297061a605 100644
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -6,7 +6,6 @@ class @Issue
   constructor: ->
     # Prevent duplicate event bindings
     @disableTaskList()
-
     if $('a.btn-close').length
       @initTaskList()
       @initIssueBtnEventListeners()
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee
index ed0bf2b3f48..d4fd4ed6003 100644
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -50,11 +50,10 @@ class @MergeRequest
       $this = $(this)
       if $this.data('submitted')
         return
-      e.preventDefault()
-      e.stopImmediatePropagation()
       shouldSubmit = $this.hasClass('btn-comment')
-      console.log("shouldSubmit")
       if shouldSubmit
+        e.preventDefault()
+        e.stopImmediatePropagation()
         _this.submitNoteForm($this.closest('form'),$this)
 
   submitNoteForm: (form, $button) =>
-- 
cgit v1.2.1