From d002ef85d2c03e80edaca7412fe0b32e8b909e24 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 23 Jun 2016 07:16:45 -0500
Subject: Use instance property to enable/disable label assignment

---
 app/assets/javascripts/issuable.js.coffee               |  2 +-
 app/assets/javascripts/issues-bulk-assignment.js.coffee | 11 +----------
 app/assets/javascripts/labels_select.js.coffee          |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/issuable.js.coffee b/app/assets/javascripts/issuable.js.coffee
index 23c823942c7..6a108c033ea 100644
--- a/app/assets/javascripts/issuable.js.coffee
+++ b/app/assets/javascripts/issuable.js.coffee
@@ -91,6 +91,6 @@ issuable_created = false
       $('#update_issues_ids').val []
       $('.issues_bulk_update').hide()
       $('.issues-other-filters').show()
-      @issuableBulkActions.disableWillUpdate()
+      @issuableBulkActions.willUpdateLabels = false
 
     return true
diff --git a/app/assets/javascripts/issues-bulk-assignment.js.coffee b/app/assets/javascripts/issues-bulk-assignment.js.coffee
index 8ca7409f5b4..6b0e69dbae7 100644
--- a/app/assets/javascripts/issues-bulk-assignment.js.coffee
+++ b/app/assets/javascripts/issues-bulk-assignment.js.coffee
@@ -10,22 +10,13 @@ class @IssuableBulkActions
     # Save instance
     @form.data 'bulkActions', @
 
-    @disableWillUpdate()
+    @willUpdateLabels = false
 
     @bindEvents()
 
     # Fixes bulk-assign not working when navigating through pages
     Issuable.initChecks();
 
-  enableWillUpdate: ->
-    @toggleWillUpdate(true)
-
-  disableWillUpdate: ->
-    @toggleWillUpdate(false)
-
-  toggleWillUpdate: (enable)->
-    @willUpdateLabels = if enable? then enable else not @willUpdateLabels
-
   getElement: (selector) ->
     @container.find selector
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 0729d5d91ce..e95fd96a83f 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -383,4 +383,4 @@ class @LabelsSelect
   enableBulkLabelDropdown: ->
     if $('.selected_issue:checked').length
       issuableBulkActions = $('.bulk-update').data('bulkActions')
-      issuableBulkActions.enableWillUpdate()
+      issuableBulkActions.willUpdateLabels = true
-- 
cgit v1.2.1