Merge branch 'v3.0.x'

public/app/features/dashboard/rowCtrl.js

@@ -142,12 +142,18 @@ function (angular, _, config) {
   });
   });
 
 
   module.directive('panelWidth', function() {
   module.directive('panelWidth', function() {
+    var fullscreen = false;
+
     return function(scope, element) {
     return function(scope, element) {
       function updateWidth() {
       function updateWidth() {
-        element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%';
+        if (!fullscreen) {
+          element[0].style.width = ((scope.panel.span / 1.2) * 10) + '%';
+        }
       }
       }
 
 
       scope.onAppEvent('panel-fullscreen-enter', function(evt, info) {
       scope.onAppEvent('panel-fullscreen-enter', function(evt, info) {
+        fullscreen = true;
+
         if (scope.panel.id !== info.panelId) {
         if (scope.panel.id !== info.panelId) {
           element.hide();
           element.hide();
         } else {
         } else {
@@ -156,14 +162,20 @@ function (angular, _, config) {
       });
       });
 
 
       scope.onAppEvent('panel-fullscreen-exit', function(evt, info) {
       scope.onAppEvent('panel-fullscreen-exit', function(evt, info) {
+        fullscreen = false;
+
         if (scope.panel.id !== info.panelId) {
         if (scope.panel.id !== info.panelId) {
           element.show();
           element.show();
-        } else {
-          updateWidth();
         }
         }
+
+        updateWidth();
       });
       });
 
 
       scope.$watch('panel.span', updateWidth);
       scope.$watch('panel.span', updateWidth);
+
+      if (fullscreen) {
+        element.hide();
+      }
     };
     };
   });
   });