diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-15 09:58:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:17:39 +0100 |
| commit | 808dc2f27250bde3a6bdf45a136d1ff76fbcb295 (patch) | |
| tree | a61587c0c47b490e43e234fa2b1f123085c1fef1 | |
| parent | aa05b5ed8b69e90d1e9f38c13db3af2af85e8285 (diff) | |
| download | gitlab-ce-808dc2f27250bde3a6bdf45a136d1ff76fbcb295.tar.gz | |
Namespaced sortable default options function
3 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6 index 6f9f054f346..f872d7f4b3f 100644 --- a/app/assets/javascripts/boards/components/board.js.es6 +++ b/app/assets/javascripts/boards/components/board.js.es6 @@ -47,7 +47,7 @@ } }, ready () { - const options = gl.getBoardSortableDefaultOptions({ + const options = gl.issueBoards.getBoardSortableDefaultOptions({ disabled: this.disabled, group: 'boards', draggable: '.is-draggable', diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6 index f6675107afe..5a0b1caf51d 100644 --- a/app/assets/javascripts/boards/components/board_list.js.es6 +++ b/app/assets/javascripts/boards/components/board_list.js.es6 @@ -44,7 +44,7 @@ }, }, ready () { - const options = gl.getBoardSortableDefaultOptions({ + const options = gl.issueBoards.getBoardSortableDefaultOptions({ group: 'issues', sort: false, disabled: this.disabled, diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 index 9a5788790de..b7afe4897b6 100644 --- a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 +++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 @@ -1,9 +1,8 @@ ((w) => { - if (!window.gl) { - window.gl = {}; - } + window.gl = window.gl || {}; + window.gl.issueBoards = window.gl.issueBoards || {}; - gl.getBoardSortableDefaultOptions = (obj) => { + gl.issueBoards.getBoardSortableDefaultOptions = (obj) => { let defaultSortOptions = { forceFallback: true, fallbackClass: 'is-dragging', |