From 04065cff08279adbea1dbba92c09e804f8268749 Mon Sep 17 00:00:00 2001
From: Peter Piela <ppiela@cray.com>
Date: Fri, 16 Dec 2016 16:54:19 -0500
Subject: [PATCH] Action-list: Update for ui bootstrap changes

Change dropdown-toggle to uib-dropdown-toggle in the dropdown
caret button.

Correct structure of dropdown list action-list to include
uib-dropdown declaration.

Correct magic search dropdown to use new directive names.

Change-Id: Iee95ecf81e3c7802e76e90c4ee27ac0c4dcf171b
Co-Authored-By: Richard Jones <r1chardj0n3s@gmail.com>
---
 .../static/framework/widgets/action-list/actions.service.js | 2 +-
 .../static/framework/widgets/action-list/split-button.html  | 2 +-
 .../static/framework/widgets/magic-search/magic-search.html | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/horizon/static/framework/widgets/action-list/actions.service.js b/horizon/static/framework/widgets/action-list/actions.service.js
index 96760e0fc8..da5d7ca3e4 100644
--- a/horizon/static/framework/widgets/action-list/actions.service.js
+++ b/horizon/static/framework/widgets/action-list/actions.service.js
@@ -155,7 +155,7 @@
        * `menu-item` buttons
        */
       function renderList(actionList, splitButton, scope) {
-        var actionListElem = angular.element('<action-list>');
+        var actionListElem = angular.element('<action-list uib-dropdown>');
         actionListElem.attr('dropdown', 'true');
         actionListElem.append(splitButton);
         actionListElem.append(getMenu(actionList, scope));
diff --git a/horizon/static/framework/widgets/action-list/split-button.html b/horizon/static/framework/widgets/action-list/split-button.html
index d877dc5b5a..43e4d9beb1 100644
--- a/horizon/static/framework/widgets/action-list/split-button.html
+++ b/horizon/static/framework/widgets/action-list/split-button.html
@@ -6,7 +6,7 @@
   <ng-transclude></ng-transclude>
 </button><!--
 Dropdown caret button
---><button class="split-caret dropdown-toggle" dropdown-toggle
+--><button class="split-caret dropdown-toggle" uib-dropdown-toggle
   ng-class="actionClasses"
   aria-expanded="false" ng-click="$event.stopPropagation()">
   <span class="fa fa-caret-down"></span>
diff --git a/horizon/static/framework/widgets/magic-search/magic-search.html b/horizon/static/framework/widgets/magic-search/magic-search.html
index c96e67c859..5a2cc1aca8 100644
--- a/horizon/static/framework/widgets/magic-search/magic-search.html
+++ b/horizon/static/framework/widgets/magic-search/magic-search.html
@@ -18,9 +18,9 @@
       <span class="search-selected" ng-cloak="" ng-show="ctrl.facetSelected">
         {$ ctrl.facetSelected.label[0] $}:
       </span>
-      <!-- For bootstrap, the dropdown attribute is moved from input up to div. -->
-      <span class="search-entry" dropdown is-open="ctrl.isMenuOpen">
-        <input class="search-input" type="text" dropdown-toggle
+      <!-- For bootstrap, the uib-dropdown attribute is moved from input up to div. -->
+      <span class="search-entry" uib-dropdown is-open="ctrl.isMenuOpen">
+        <input class="search-input" type="text" uib-dropdown-toggle
                placeholder="{$ strings.prompt $}" autocomplete="off" />
         <ul class="facet-drop f-dropdown dropdown-menu" data-dropdown-content=""
             ng-if="ctrl.filteredObj.length > 0">