Merge branch 'es6-class-issue' into 'master'

Convert Issue into ES6 class

See merge request !9636

app/assets/javascripts/dispatcher.js

@@ -5,7 +5,6 @@ import PrometheusGraph from './monitoring/prometheus_graph'; // TODO: Maybe Make
 /* global ShortcutsNavigation */
 /* global Build */
 /* global Issuable */
-/* global Issue */
 /* global ShortcutsIssuable */
 /* global ZenMode */
 /* global Milestone */
@@ -35,6 +34,7 @@ import PrometheusGraph from './monitoring/prometheus_graph'; // TODO: Maybe Make
 /* global ProjectShow */
 /* global Labels */
 /* global Shortcuts */
+import Issue from './issue';
 
 import BindInOut from './behaviors/bind_in_out';
 import GroupsList from './groups_list';

app/assets/javascripts/issue.js

@@ -5,12 +5,8 @@ require('./flash');
 require('vendor/jquery.waitforimages');
 require('./task_list');
 
-(function() {
-  var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
-
-  this.Issue = (function() {
-    function Issue() {
-      this.submitNoteForm = bind(this.submitNoteForm, this);
+class Issue {
+  constructor() {
     if ($('a.btn-close').length) {
       this.taskList = new gl.TaskList({
         dataType: 'issue',
@@ -21,16 +17,15 @@ require('./task_list');
           document.querySelector('#task_status_short').innerText = result.task_status_short;
         }
       });
-        this.initIssueBtnEventListeners();
+      Issue.initIssueBtnEventListeners();
     }
-      this.initMergeRequests();
-      this.initRelatedBranches();
-      this.initCanCreateBranch();
+    Issue.initMergeRequests();
+    Issue.initRelatedBranches();
+    Issue.initCanCreateBranch();
   }
 
-    Issue.prototype.initIssueBtnEventListeners = function() {
-      var _this, issueFailMessage;
-      _this = this;
+  static initIssueBtnEventListeners() {
+    var issueFailMessage;
     issueFailMessage = 'Unable to update this issue at this time.';
     return $('a.btn-close, a.btn-reopen').on('click', function(e) {
       var $this, isClose, shouldSubmit, url;
@@ -40,7 +35,7 @@ require('./task_list');
       isClose = $this.hasClass('btn-close');
       shouldSubmit = $this.hasClass('btn-comment');
       if (shouldSubmit) {
-          _this.submitNoteForm($this.closest('form'));
+        Issue.submitNoteForm($this.closest('form'));
       }
       $this.prop('disabled', true);
       url = $this.attr('href');
@@ -76,17 +71,17 @@ require('./task_list');
         }
       });
     });
-    };
+  }
 
-    Issue.prototype.submitNoteForm = function(form) {
+  static submitNoteForm(form) {
     var noteText;
     noteText = form.find("textarea.js-note-text").val();
     if (noteText.trim().length > 0) {
       return form.submit();
     }
-    };
+  }
 
-    Issue.prototype.initMergeRequests = function() {
+  static initMergeRequests() {
     var $container;
     $container = $('#merge-requests');
     return $.getJSON($container.data('url')).error(function() {
@@ -96,9 +91,9 @@ require('./task_list');
         return $container.html(data.html);
       }
     });
-    };
+  }
 
-    Issue.prototype.initRelatedBranches = function() {
+  static initRelatedBranches() {
     var $container;
     $container = $('#related-branches');
     return $.getJSON($container.data('url')).error(function() {
@@ -108,9 +103,9 @@ require('./task_list');
         return $container.html(data.html);
       }
     });
-    };
+  }
 
-    Issue.prototype.initCanCreateBranch = function() {
+  static initCanCreateBranch() {
     var $container;
     $container = $('#new-branch');
     // If the user doesn't have the required permissions the container isn't
@@ -128,8 +123,7 @@ require('./task_list');
         return $container.find('.unavailable').show();
       }
     });
-    };
+  }
+}
 
-    return Issue;
-  })();
-}).call(window);
+export default Issue;

changelogs/unreleased/es6-class-issue.yml

+---
+title: Convert Issue into ES6 class
+merge_request: 9636
+author: winniehell

spec/javascripts/issue_spec.js

 /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle, max-len */
-/* global Issue */
+import Issue from '~/issue';
 
 require('~/lib/utils/text_utility');
-require('~/issue');
 
-(function() {
+describe('Issue', function() {
   var INVALID_URL = 'http://goesnowhere.nothing/whereami';
   var $boxClosed, $boxOpen, $btnClose, $btnReopen;
 
@@ -59,7 +58,6 @@ require('~/issue');
     expect($btnReopen).toHaveText('Reopen issue');
   }
 
-  describe('Issue', function() {
   describe('task lists', function() {
     beforeEach(function() {
       loadFixtures('issues/issue-with-task-list.html.raw');
@@ -82,7 +80,6 @@ require('~/issue');
       $('.js-task-list-field').trigger('tasklist:changed');
     });
   });
-  });
 
   describe('close issue', function() {
     beforeEach(function() {
@@ -165,4 +162,4 @@ require('~/issue');
       expect($('.issue_counter')).toHaveText(1);
     });
   });
-}).call(window);
+});