diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-09 18:31:26 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-10-05 11:25:03 +0200 |
| commit | b3917d4868120c5a62e4e5525bd3321cb152e2fd (patch) | |
| tree | 1a5ec2fd6298a1bcde2487463e1a1a51f6cb36b6 | |
| parent | 7beb9f3483cf59a9717c2ccc6bd102cd9a97f906 (diff) | |
| download | gitlab-ce-b3917d4868120c5a62e4e5525bd3321cb152e2fd.tar.gz | |
Set defaults in constructor, in case opts are undefined.
| -rw-r--r-- | app/assets/javascripts/blob/blob_ci_yaml.js.es6 | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/issues-bulk-assignment.js.es6 (renamed from app/assets/javascripts/issues-bulk-assignment.js) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/profile/profile.js.es6 | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/search_autocomplete.js.es6 | 19 | ||||
| -rw-r--r-- | app/assets/javascripts/todos.js.es6 | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/user_tabs.js.es6 | 6 |
6 files changed, 15 insertions, 22 deletions
diff --git a/app/assets/javascripts/blob/blob_ci_yaml.js.es6 b/app/assets/javascripts/blob/blob_ci_yaml.js.es6 index 46496153d7c..bb9d0444a8c 100644 --- a/app/assets/javascripts/blob/blob_ci_yaml.js.es6 +++ b/app/assets/javascripts/blob/blob_ci_yaml.js.es6 @@ -14,9 +14,9 @@ global.BlobCiYamlSelector = BlobCiYamlSelector; class BlobCiYamlSelectors { - constructor({ editor, $dropdowns = $('.js-gitlab-ci-yml-selector') }) { + constructor({ editor, $dropdowns }) { this.editor = editor; - this.$dropdowns = $dropdowns; + this.$dropdowns = $dropdowns || $('.js-gitlab-ci-yml-selector'); this.initSelectors(); } diff --git a/app/assets/javascripts/issues-bulk-assignment.js b/app/assets/javascripts/issues-bulk-assignment.js.es6 index 62a7fc9a06c..62a7fc9a06c 100644 --- a/app/assets/javascripts/issues-bulk-assignment.js +++ b/app/assets/javascripts/issues-bulk-assignment.js.es6 diff --git a/app/assets/javascripts/profile/profile.js.es6 b/app/assets/javascripts/profile/profile.js.es6 index 5f674c36de5..c16eb93a2dd 100644 --- a/app/assets/javascripts/profile/profile.js.es6 +++ b/app/assets/javascripts/profile/profile.js.es6 @@ -1,9 +1,9 @@ ((global) => { class Profile { - constructor({ form = $('.edit-user') } = {}) { + constructor({ form }) { this.onSubmitForm = this.onSubmitForm.bind(this); - this.form = form; + this.form = form || $('.edit-user'); this.bindEvents(); this.initAvatarGlCrop(); } diff --git a/app/assets/javascripts/search_autocomplete.js.es6 b/app/assets/javascripts/search_autocomplete.js.es6 index 3d710d17ef3..b32199b9721 100644 --- a/app/assets/javascripts/search_autocomplete.js.es6 +++ b/app/assets/javascripts/search_autocomplete.js.es6 @@ -9,20 +9,13 @@ }; class SearchAutocomplete { - constructor({ - wrap = $('.search'), - optsEl = wrap.find('.search-autocomplete-opts'), - autocompletePath = optsEl.data('autocomplete-path'), - projectId = (optsEl.data('autocomplete-project-id') || ''), - projectRef = (optsEl.data('autocomplete-project-ref') || '') - } = {}) { - + constructor({ wrap, optsEl, autocompletePath, projectId, projectRef }) { this.bindEventContext(); - this.wrap = wrap; - this.optsEl = optsEl; - this.autocompletePath = autocompletePath; - this.projectId = projectId; - this.projectRef = projectRef; + this.wrap = wrap || $('.search'); + this.optsEl = optsEl || wrap.find('.search-autocomplete-opts'); + this.autocompletePath = autocompletePath || optsEl.data('autocomplete-path'); + this.projectId = projectId || (optsEl.data('autocomplete-project-id') || ''); + this.projectRef = projectRef || (optsEl.data('autocomplete-project-ref') || ''); this.dropdown = wrap.find('.dropdown'); this.dropdownContent = this.dropdown.find('.dropdown-content'); this.locationBadgeEl = this.getElement('.location-badge'); diff --git a/app/assets/javascripts/todos.js.es6 b/app/assets/javascripts/todos.js.es6 index d8dca490e3e..7e606196435 100644 --- a/app/assets/javascripts/todos.js.es6 +++ b/app/assets/javascripts/todos.js.es6 @@ -1,10 +1,10 @@ ((global) => { class Todos { - constructor({ el = $('.js-todos-options') }) { + constructor({ el }) { this.allDoneClicked = this.allDoneClicked.bind(this); this.doneClicked = this.doneClicked.bind(this); - this.el = el; + this.el = el || $('.js-todos-options'); this.perPage = el.data('perPage'); this.clearListeners(); this.initBtnListeners(); diff --git a/app/assets/javascripts/user_tabs.js.es6 b/app/assets/javascripts/user_tabs.js.es6 index 1ce0b31c01f..7cb38b8ec07 100644 --- a/app/assets/javascripts/user_tabs.js.es6 +++ b/app/assets/javascripts/user_tabs.js.es6 @@ -59,10 +59,10 @@ content on the Users#show page. */ ((global) => { class UserTabs { - constructor ({ defaultAction = 'activity', action = defaultAction, parentEl }) { + constructor ({ defaultAction, action, parentEl }) { this.loaded = {}; - this.defaultAction = defaultAction; - this.action = action; + this.defaultAction = defaultAction || 'activity'; + this.action = action || this.defaultAction; this.$parentEl = $(parentEl) || $(document); this._location = window.location; this.$parentEl.find('.nav-links a') |
