diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-11-18 11:26:20 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-18 11:26:20 +0000 |
| commit | 53f7fcd0c19a5eb1245f4c0a3c0f953c63b5558f (patch) | |
| tree | b109cf471ddb952f71b4fbfe33a3fed6492164b8 | |
| parent | c76d7afdf6e2575e6170928570dc35d386842042 (diff) | |
| download | gitlab-ce-53f7fcd0c19a5eb1245f4c0a3c0f953c63b5558f.tar.gz | |
Remove slots
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_actions.js.es6 | 36 | ||||
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 6 |
2 files changed, 22 insertions, 20 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6 index 2bac40b3c6f..f3042bbc528 100644 --- a/app/assets/javascripts/environments/components/environment_actions.js.es6 +++ b/app/assets/javascripts/environments/components/environment_actions.js.es6 @@ -23,27 +23,29 @@ * */ mounted() { - // const playIcon = document.querySelector('.play-icon-svg.hidden svg'); - // - // const dropdownContainer = this.$el.querySelector('.dropdown-play-icon-container'); - // const actionContainers = this.$el.querySelectorAll('.action-play-icon-container'); - // // Phantomjs does not have support to iterate a nodelist. - // const actionsArray = [].slice.call(actionContainers); - // - // if (playIcon && actionsArray && dropdownContainer) { - // dropdownContainer.appendChild(playIcon.cloneNode(true)); - // - // actionsArray.forEach((element) => { - // element.appendChild(playIcon.cloneNode(true)); - // }); - // } + const playIcon = document.querySelector('.play-icon-svg.hidden svg'); + + const dropdownContainer = this.$el.querySelector('.dropdown-play-icon-container'); + const actionContainers = this.$el.querySelectorAll('.action-play-icon-container'); + // Phantomjs does not have support to iterate a nodelist. + const actionsArray = [].slice.call(actionContainers); + + if (playIcon && actionsArray && dropdownContainer) { + dropdownContainer.appendChild(playIcon.cloneNode(true)); + + actionsArray.forEach((element) => { + element.appendChild(playIcon.cloneNode(true)); + }); + } }, template: ` <div class="inline"> <div class="dropdown"> <a class="dropdown-new btn btn-default" data-toggle="dropdown"> - <slot name="actionplayicon"></slot> + <span class="dropdown-play-icon-container"> + <!-- svg goes here --> + </span> <i class="fa fa-caret-down"></i> </a> @@ -53,7 +55,9 @@ data-method="post" rel="nofollow" class="js-manual-action-link"> - <slot name="actionplayicon"></slot> + <span class="action-play-icon-container"> + <!-- svg goes here --> + </span> <span v-html="action.name"></span> </a> </li> diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index df94fa9cfb5..b641d2cec34 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -6,10 +6,8 @@ = page_specific_javascript_tag("environments/environments_bundle.js") .commit-icon-svg.hidden = custom_icon("icon_commit") - -.play-icon-svg{ slot: "actionplayicon" } - %span.hide - = custom_icon("icon_play") +.play-icon-svg.hidden + = custom_icon("icon_play") #environments-list-view{ data: { environments_data: environments_list_data, "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s, |