From 2a324cd6692d8fe0e38b5aa3d8c27fdfc0d72619 Mon Sep 17 00:00:00 2001
From: Spencer Alger <email@spalger.com>
Date: Fri, 27 Mar 2015 14:13:21 -0700
Subject: [PATCH] restore the toggle logic in a way that actually works

---
 src/kibana/plugins/dashboard/index.html       | 32 ++++++++++++++++---
 src/kibana/plugins/discover/index.html        | 22 +++++++++++--
 .../plugins/visualize/editor/editor.html      | 22 +++++++++++--
 src/kibana/utils/config_template.js           |  6 +++-
 4 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/src/kibana/plugins/dashboard/index.html b/src/kibana/plugins/dashboard/index.html
index 1630701ac03e..22664ab85055 100644
--- a/src/kibana/plugins/dashboard/index.html
+++ b/src/kibana/plugins/dashboard/index.html
@@ -34,16 +34,40 @@
         <button ng-click="newDashboard()" aria-label="New Dashboard"><i aria-hidden="true" class="fa fa-file-new-o"></i></button>
       </kbn-tooltip>
       <kbn-tooltip text="Save Dashboard" placement="bottom" append-to-body="1">
-        <button aria-label="Save Dashboard" aria-haspopup="true" aria-expanded="{{toggleSaveDashboard}}" ng-click="configTemplate.toggle('save'); toggleSaveDashboard = !toggleSaveDashboard"><i aria-hidden="true" class="fa fa-save"></i></button>
+        <button
+          aria-label="Save Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('save') }}"
+          ng-click="configTemplate.toggle('save');">
+          <i aria-hidden="true" class="fa fa-save"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Load Saved Dashboard" placement="bottom" append-to-body="1">
-        <button aria-label="Load Saved Dashboard" aria-haspopup="true" aria-expanded="{{toggleLoadSavedDashboard}}" ng-click="configTemplate.toggle('load'); toggleLoadSavedDashboard = !toggleLoadSavedDashboard"><i aria-hidden="true" class="fa fa-folder-open-o"></i></button>
+        <button
+          aria-label="Load Saved Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('load') }}"
+          ng-click="configTemplate.toggle('load');">
+          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Share" placement="bottom" append-to-body="1">
-        <button aria-label="Share Dashboard" aria-haspopup="true" aria-expanded="{{toggleShareDashboard}}" ng-click="configTemplate.toggle('share'); toggleShareDashboard = !toggleShareDashboard"><i aria-hidden="true" class="fa fa-external-link"></i></button>
+        <button
+          aria-label="Share Dashboard"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('share') }}"
+          ng-click="configTemplate.toggle('share');">
+          <i aria-hidden="true" class="fa fa-external-link"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Add Visualization" placement="bottom" append-to-body="1">
-        <button aria-label="Add Visualization" aria-haspopup="true" aria-expanded="{{toggleAddVisualization}}" ng-click="configTemplate.toggle('pickVis'); toggleAddVisualization = !toggleAddVisualization"><i aria-hidden="true" class="fa fa-plus-circle"></i></button>
+        <button
+          aria-label="Add Visualization"
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('pickVis') }}"
+          ng-click="configTemplate.toggle('pickVis');">
+          <i aria-hidden="true" class="fa fa-plus-circle"></i>
+        </button>
       </kbn-tooltip>
     </div>
   </navbar>
diff --git a/src/kibana/plugins/discover/index.html b/src/kibana/plugins/discover/index.html
index 8de55ea7f7aa..89bafb1a6c65 100644
--- a/src/kibana/plugins/discover/index.html
+++ b/src/kibana/plugins/discover/index.html
@@ -24,13 +24,29 @@
 
     <div class="button-group" role="toolbar">
       <kbn-tooltip text="New Search" placement="bottom" append-to-body="1">
-        <button ng-click="newQuery()" aria-label="New Search"><i aria-hidden="true" class="fa fa-file-new-o"></i></button>
+        <button
+          ng-click="newQuery()"
+          aria-label="New Search">
+          <i aria-hidden="true" class="fa fa-file-new-o"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Save Search" placement="bottom" append-to-body="1">
-        <button aria-haspopup="true" aria-expanded="{{toggleSaveSearch}}" ng-click="configTemplate.toggle('save');" aria-label="Save Search"><i aria-hidden="true" class="fa fa-save"></i></button>
+        <button
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('save') }}"
+          ng-click="configTemplate.toggle('save');"
+          aria-label="Save Search">
+          <i aria-hidden="true" class="fa fa-save"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Load Saved Search" placement="bottom" append-to-body="1">
-        <button aria-haspopup="true" aria-expanded="{{toggleLoadSavedSearch}}" ng-click="configTemplate.toggle('load');" aria-label="Load Saved Search"><i aria-hidden="true" class="fa fa-folder-open-o"></i></button>
+        <button
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('load') }}"
+          ng-click="configTemplate.toggle('load');"
+          aria-label="Load Saved Search">
+          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+        </button>
       </kbn-tooltip>
     </div>
   </navbar>
diff --git a/src/kibana/plugins/visualize/editor/editor.html b/src/kibana/plugins/visualize/editor/editor.html
index 6ffca8949971..89d2c68b3cdb 100644
--- a/src/kibana/plugins/visualize/editor/editor.html
+++ b/src/kibana/plugins/visualize/editor/editor.html
@@ -82,13 +82,29 @@
       </kbn-tooltip>
 
       <kbn-tooltip text="Load Saved Visualization" placement="bottom" append-to-body="1">
-        <button ng-click="configTemplate.toggle('load')" aria-label="Load Saved Visualization"><i aria-hidden="true" class="fa fa-folder-open-o"></i></button>
+        <button
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('load') }}"
+          ng-click="configTemplate.toggle('load')"
+          aria-label="Load Saved Visualization">
+          <i aria-hidden="true" class="fa fa-folder-open-o"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Share Visualization" placement="bottom" append-to-body="1">
-        <button ng-click="configTemplate.toggle('share')" aria-label="Share Visualization"><i aria-hidden="true" class="fa fa-external-link"></i></button>
+        <button
+          aria-haspopup="true"
+          aria-expanded="{{ configTemplate.is('share') }}"
+          ng-click="configTemplate.toggle('share')"
+          aria-label="Share Visualization">
+          <i aria-hidden="true" class="fa fa-external-link"></i>
+        </button>
       </kbn-tooltip>
       <kbn-tooltip text="Refresh" placement="bottom" append-to-body="1">
-        <button ng-click="fetch()" aria-label="Refresh"><i aria-hidden="true" class="fa fa-refresh"></i></button>
+        <button
+          ng-click="fetch()"
+          aria-label="Refresh">
+          <i aria-hidden="true" class="fa fa-refresh"></i>
+        </button>
       </kbn-tooltip>
     </div>
   </navbar>
diff --git a/src/kibana/utils/config_template.js b/src/kibana/utils/config_template.js
index 374688356f34..eff806a981a8 100644
--- a/src/kibana/utils/config_template.js
+++ b/src/kibana/utils/config_template.js
@@ -10,7 +10,7 @@ define(function (require) {
 
     function update(newState, name) {
       var toUpdate = templates[name];
-      var curState = template.current === toUpdate;
+      var curState = template.is(name);
       if (newState == null) newState = !curState;
 
       if (newState) {
@@ -22,6 +22,10 @@ define(function (require) {
       return newState;
     }
 
+    template.is = function (name) {
+      return template.current === templates[name];
+    };
+
     template.toString = function () {
       return template.current;
     };