From b9a2546a107a6fbbeee23c3d5165c9a2f62201a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 18 Jul 2016 15:41:06 +0200
Subject: [PATCH] fix(iframe): fixed issue with using full height of iframe,
 fixes #5605

---
 public/app/features/dashboard/viewStateSrv.js | 17 +++++++++++------
 public/app/features/panel/solo_panel_ctrl.js  |  7 ++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/public/app/features/dashboard/viewStateSrv.js b/public/app/features/dashboard/viewStateSrv.js
index 035bfb6ae6e..2ea365c3b49 100644
--- a/public/app/features/dashboard/viewStateSrv.js
+++ b/public/app/features/dashboard/viewStateSrv.js
@@ -107,9 +107,12 @@ function (angular, _, $) {
       this.dashboard.meta.fullscreen = this.state.fullscreen;
 
       if (!this.state.fullscreen) {
-        this.state.panelId = null;
         this.state.fullscreen = null;
         this.state.edit = null;
+        // clear panel id unless in solo mode
+        if (!this.dashboard.meta.soloMode) {
+          this.state.panelId = null;
+        }
       }
 
       $location.search(this.serializeToUrl());
@@ -193,11 +196,13 @@ function (angular, _, $) {
       var self = this;
       self.panelScopes.push(panelScope);
 
-      if (self.state.panelId === panelScope.ctrl.panel.id) {
-        if (self.state.edit) {
-          panelScope.ctrl.editPanel();
-        } else {
-          panelScope.ctrl.viewPanel();
+      if (!self.dashboard.meta.soloMode) {
+        if (self.state.panelId === panelScope.ctrl.panel.id) {
+          if (self.state.edit) {
+            panelScope.ctrl.editPanel();
+          } else {
+            panelScope.ctrl.viewPanel();
+          }
         }
       }
 
diff --git a/public/app/features/panel/solo_panel_ctrl.js b/public/app/features/panel/solo_panel_ctrl.js
index 0eb271675ee..de299d7f9fe 100644
--- a/public/app/features/panel/solo_panel_ctrl.js
+++ b/public/app/features/panel/solo_panel_ctrl.js
@@ -17,15 +17,12 @@ function (angular, $) {
       var params = $location.search();
       panelId = parseInt(params.panelId);
 
-      // add fullscreen param;
-      params.fullscreen = true;
-      $location.search(params);
+      $scope.onAppEvent("dashboard-initialized", $scope.initPanelScope);
 
       dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) {
+        result.meta.soloMode = true;
         $scope.initDashboard(result, $scope);
       });
-
-      $scope.onAppEvent("dashboard-initialized", $scope.initPanelScope);
     };
 
     $scope.initPanelScope = function() {