From b506e7c26711082e8ca540070735355e7d4a3ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 25 Aug 2014 16:44:33 +0200
Subject: [PATCH] fixed submenu in fullscreen mode

---
 src/app/directives/bodyClass.js    |  10 +--
 src/app/panels/filtering/module.js |  57 ---------------
 src/css/less/submenu.less          | 110 +----------------------------
 3 files changed, 3 insertions(+), 174 deletions(-)

diff --git a/src/app/directives/bodyClass.js b/src/app/directives/bodyClass.js
index 6d3c6d32e15..86ff598d69e 100644
--- a/src/app/directives/bodyClass.js
+++ b/src/app/directives/bodyClass.js
@@ -12,20 +12,14 @@ function (angular, app, _) {
       return {
         link: function($scope, elem) {
 
-          var lastPulldownVal;
           var lastHideControlsVal;
 
-          $scope.$watchCollection('dashboard.pulldowns', function() {
+          $scope.$watch('submenuEnabled', function() {
             if (!$scope.dashboard) {
               return;
             }
 
-            var panel = _.find($scope.dashboard.pulldowns, function(pulldown) { return pulldown.enable; });
-            var panelEnabled = panel ? panel.enable : false;
-            if (lastPulldownVal !== panelEnabled) {
-              elem.toggleClass('submenu-controls-visible', panelEnabled);
-              lastPulldownVal = panelEnabled;
-            }
+            elem.toggleClass('submenu-controls-visible', $scope.submenuEnabled);
           });
 
           $scope.$watch('dashboard.hideControls', function() {
diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js
index a8f64cad6ed..eb89cebafa0 100644
--- a/src/app/panels/filtering/module.js
+++ b/src/app/panels/filtering/module.js
@@ -34,63 +34,6 @@ function (angular, app, _) {
       $scope.filter.removeTemplateParameter(templateParameter);
     };
 
-    $scope.filterOptionSelected = function(templateParameter, option, recursive) {
-      templateParameter.current = option;
-
-      $scope.filter.updateTemplateData();
-
-      return $scope.applyFilterToOtherFilters(templateParameter)
-        .then(function() {
-          // only refresh in the outermost call
-          if (!recursive) {
-            $scope.dashboard.emit_refresh();
-          }
-        });
-    };
-
-    $scope.applyFilterToOtherFilters = function(updatedTemplatedParam) {
-      var promises = _.map($scope.filter.templateParameters, function(templateParam) {
-        if (templateParam === updatedTemplatedParam) {
-          return;
-        }
-        if (templateParam.query.indexOf('[[' + updatedTemplatedParam.name + ']]') !== -1) {
-          return $scope.applyFilter(templateParam);
-        }
-      });
-
-      return $q.all(promises);
-    };
-
-    $scope.applyFilter = function(templateParam) {
-      return datasourceSrv.default.metricFindQuery($scope.filter, templateParam.query)
-        .then(function (results) {
-          templateParam.editing = undefined;
-          templateParam.options = _.map(results, function(node) {
-            return { text: node.text, value: node.text };
-          });
-
-          if (templateParam.includeAll) {
-            var allExpr = '{';
-            _.each(templateParam.options, function(option) {
-              allExpr += option.text + ',';
-            });
-            allExpr = allExpr.substring(0, allExpr.length - 1) + '}';
-            templateParam.options.unshift({text: 'All', value: allExpr});
-          }
-
-          // if parameter has current value
-          // if it exists in options array keep value
-          if (templateParam.current) {
-            var currentExists = _.findWhere(templateParam.options, { value: templateParam.current.value });
-            if (currentExists) {
-              return $scope.filterOptionSelected(templateParam, templateParam.current, true);
-            }
-          }
-
-          return $scope.filterOptionSelected(templateParam, templateParam.options[0], true);
-        });
-    };
-
     $scope.add = function() {
       $scope.filter.addTemplateParameter({
         type      : 'filter',
diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less
index 514ccf6e29b..247ffda5175 100644
--- a/src/css/less/submenu.less
+++ b/src/css/less/submenu.less
@@ -1,118 +1,10 @@
-.submenu-controls {
-  background: @submenuBackground;
-  font-size: inherit;
-  label {
-    margin: 0;
-    padding-right: 4px;
-    display: inline;
-  }
-  input[type=checkbox] {
-    margin: 0;
-  }
-}
-
 .submenu-controls-visible:not(.hide-controls) {
   .panel-fullscreen {
-    top: 82px;
+    top: 90px;
   }
 }
 
-.submenu-panel {
-  padding: 0 4px 0 8px;
-  border-right: 1px solid @submenuBorder;
-  float: left;
-}
-
-.submenu-panel:first-child {
-  padding-left: 17px;
-}
-
-.submenu-panel-title {
-  float: left;
-  text-transform: uppercase;
-  padding: 4px 10px 3px 0;
-}
-
-.submenu-panel-wrapper {
-  float: left;
-}
-
-.submenu-toggle {
-  padding: 4px 0 3px 8px;
-  float: left;
-  .annotation-color-icon {
-    position: relative;
-    top: 2px;
-  }
-}
-
-.submenu-toggle:first-child {
-  padding-left: 0;
-}
-
-.submenu-control-edit {
-  padding: 4px 4px 3px 8px;
-  float: right;
-  border-left: 1px solid @submenuBorder;
-  margin-left: 8px;
-}
-
 .annotation-disabled, .annotation-disabled a {
   color: darken(@textColor, 25%);
 }
 
-
-// Filter submenu
-.filtering-container {
-  float: left;
-}
-
-.filtering-container label {
-  float: left;
-}
-
-.filtering-container input[type=checkbox] {
-  margin: 0;
-}
-
-.filter-panel-filter {
-  display:inline-block;
-  vertical-align: top;
-  padding: 4px 10px 3px 10px;
-  border-right: 1px solid @submenuBorder;
-}
-
-.filter-panel-filter:first-child {
-  padding-left: 0;
-}
-
-.filter-panel-filter ul {
-  margin-bottom: 0px;
-}
-
-.filter-deselected {
-  opacity: 0.5;
-}
-
-.filtering-container .filter-action {
-  float:right;
-  padding-right: 2px;
-  margin-bottom: 0px !important;
-  margin-left: 0px;
-  margin-top: 4px;
-}
-
-.add-filter-action {
-  padding: 3px 5px 0px 5px;
-  position: relative;
-  top: 4px;
-}
-
-.filter-mandate {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.filter-apply {
-  float:right;
-}
\ No newline at end of file