Просмотр исходного кода

fix(): fixed issue with series override color selector when using the mouse to select color option, fixes #4620

Torkel Ödegaard 9 лет назад
Родитель
Сommit
52e2091f2c

+ 4 - 1
public/app/core/services/popover_srv.ts

@@ -46,9 +46,12 @@ function popoverSrv($compile, $rootScope) {
     drop.on('close', () => {
     drop.on('close', () => {
       popoverScope.dismiss({fromDropClose: true});
       popoverScope.dismiss({fromDropClose: true});
       destroyDrop();
       destroyDrop();
+      if (options.onClose) {
+        options.onClose();
+      }
     });
     });
 
 
-    drop.open();
+    setTimeout(() => { drop.open(); }, 10);
   };
   };
 }
 }
 
 

+ 3 - 0
public/app/plugins/panel/graph/series_overrides_ctrl.js

@@ -60,6 +60,9 @@ define([
         template: '<gf-color-picker></gf-color-picker>',
         template: '<gf-color-picker></gf-color-picker>',
         model: {
         model: {
           colorSelected: $scope.colorSelected,
           colorSelected: $scope.colorSelected,
+        },
+        onClose: function() {
+          $scope.ctrl.seriesOverrideChanged();
         }
         }
       });
       });
     };
     };

+ 1 - 0
public/test/specs/seriesOverridesCtrl-specs.js

@@ -22,6 +22,7 @@ define([
       ctx.scope.ctrl = {
       ctx.scope.ctrl = {
         refresh: sinon.spy(),
         refresh: sinon.spy(),
         render: sinon.spy(),
         render: sinon.spy(),
+        seriesOverrideChanged: sinon.spy(),
         seriesList: []
         seriesList: []
       };
       };
       ctx.scope.render = function() {};
       ctx.scope.render = function() {};