diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-15 10:32:57 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-15 10:33:36 +0200 |
| commit | 8aed815b6e646df52043867edfdfcf4f618c6a87 (patch) | |
| tree | 8a35099f1ddd42b0cb690e97d432fb221a018fa8 | |
| parent | d8563bd6c2408efb6890c536ed0852b99fa49423 (diff) | |
| download | gitlab-ce-13525-sane-defaults-for-merge-request-js-class-constructor.tar.gz | |
Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructor
Without this sane default you would get the following error when you
tried to instantiate a new MergeRequest object with no argument (i.e.
`new MergeRequest();`):
TypeError: undefined is not an object (evaluating 'this.opts.action')
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/merge_request_spec.js.coffee | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 1f46e331427..dabfd91cf14 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -9,7 +9,7 @@ class @MergeRequest # Options: # action - String, current controller action # - constructor: (@opts) -> + constructor: (@opts = {}) -> this.$el = $('.merge-request') this.$('.show-all-commits').on 'click', => diff --git a/spec/javascripts/merge_request_spec.js.coffee b/spec/javascripts/merge_request_spec.js.coffee index 22ebc7039d1..3cb67d51c85 100644 --- a/spec/javascripts/merge_request_spec.js.coffee +++ b/spec/javascripts/merge_request_spec.js.coffee @@ -6,7 +6,7 @@ describe 'MergeRequest', -> beforeEach -> fixture.load('merge_requests_show.html') - @merge = new MergeRequest({}) + @merge = new MergeRequest() it 'modifies the Markdown field', -> spyOn(jQuery, 'ajax').and.stub() |