diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
| commit | a18a58625751611dba4400c574fabfd4a4507a56 (patch) | |
| tree | 663342f70b17e674aee3add0d4b57028d03e8b1a /app/assets/javascripts/milestone_select.js.coffee | |
| parent | 0dba294f99e5ec672b4a8a97b5d51ac79a3efc8b (diff) | |
| parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip
Diffstat (limited to 'app/assets/javascripts/milestone_select.js.coffee')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee index e8d489dce9e..a5c5a349f10 100644 --- a/app/assets/javascripts/milestone_select.js.coffee +++ b/app/assets/javascripts/milestone_select.js.coffee @@ -93,7 +93,7 @@ class @MilestoneSelect $selectbox.hide() # display:block overrides the hide-collapse rule - $value.removeAttr('style') + $value.css('display', '') clicked: (selected) -> page = $('body').data 'page' isIssueIndex = page is 'projects:issues:index' @@ -128,7 +128,7 @@ class @MilestoneSelect $dropdown.trigger('loaded.gl.dropdown') $loading.fadeOut() $selectbox.hide() - $value.removeAttr('style') + $value.css('display', '') if data.milestone? data.milestone.namespace = _this.currentProject.namespace data.milestone.path = _this.currentProject.path |