github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Backport PR #8371

Browse source 
---------

**Commit 1:**
fixing charts to not render twice

* Original sha: f7f0f12439
* Authored by ppisljar <peter.pisljar@gmail.com> on 2016-09-20T08:55:55Z

**Commit 2:**
fixing tests

* Original sha: 40234e8e41
* Authored by ppisljar <peter.pisljar@gmail.com> on 2016-09-21T07:21:01Z

**Commit 3:**
fixing based on Spencers comments

* Original sha: cdad7724bc
* Authored by ppisljar <peter.pisljar@gmail.com> on 2016-09-21T19:41:57Z
(cherry picked from commit 61d487c)
This commit is contained in:
ppisljar 2016-09-22 09:04:23 +02:00
parent 48725a379a
commit 481fcfff8f
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ui/public/vislib/lib/resize_checker.js
View file

@ -184,6 +184,10 @@ export default function ResizeCheckerFactory(Private, Notifier, $rootScope) {
}, ms));
};
ResizeChecker.prototype.stopSchedule = function () {
clearTimeout(this._timerId);
};
/**
* Signal that the ResizeChecker should shutdown.
*

10
src/ui/public/vislib/vis.js
View file

@ -68,7 +68,7 @@ export default function VisFactory(Private) {
}
this.handler = handlerTypes[chartType](this) || handlerTypes.column(this);
this._runOnHandler('render');
this._runWithoutResizeChecker('render');
};
/**
@ -89,6 +89,14 @@ export default function VisFactory(Private) {
}
};
Vis.prototype._runWithoutResizeChecker = function (method) {
this.resizeChecker.stopSchedule();
this._runOnHandler(method);
this.resizeChecker.saveSize();
this.resizeChecker.saveDirty(false);
this.resizeChecker.continueSchedule();
};
Vis.prototype._runOnHandler = function (method) {
try {
this.handler[method]();

9
src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
View file

@ -134,10 +134,11 @@ describe('renderbot', function exportWrapper() {
let buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
let renderStub = sinon.stub(renderbot.vislibVis, 'render');
renderbot.render('flat data', persistedState);
expect(renderStub.callCount).to.be(1);
expect(buildStub.callCount).to.be(1);
expect(renderStub.firstCall.args[0]).to.be(football);
return renderbot.render('flat data', persistedState).then(() => {
expect(renderStub.callCount).to.be(1);
expect(buildStub.callCount).to.be(1);
expect(renderStub.firstCall.args[0]).to.be(football);
});
});
});

7
src/ui/public/vislib_vis_type/vislib_renderbot.js
View file

@ -46,7 +46,12 @@ module.exports = function VislibRenderbotFactory(Private) {
VislibRenderbot.prototype.buildChartData = buildChartData;
VislibRenderbot.prototype.render = function (esResponse) {
this.chartData = this.buildChartData(esResponse);
this.vislibVis.render(this.chartData, this.uiState);
// to allow legend to render first (wait for angular digest cycle to complete)
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve(this.vislibVis.render(this.chartData, this.uiState));
});
});
};
VislibRenderbot.prototype.destroy = function () {