IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 10:50:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(rendering): fixed issue with phantomjs panel rendering

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-26 07:45:53 +02:00
parent c9d6321f38
commit dd494e648a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/panel/partials/soloPanel.html
View File

@ -1,9 +1,5 @@
<div class="main"> <div class="panel nospace" ng-if="panel" style="width: 100%">
<div class="row-fluid"> <plugin-component type="panel">
<div class="span12"> </plugin-component>
<div class="panel nospace" ng-if="panel" style="width: 100%">
<plugin-component type="panel">
</plugin-component>
</div>
</div>
</div> </div>
<div class="clearfix"></div>

4
vendor/phantomjs/render.js vendored
View File

@ -39,7 +39,8 @@
var canvas = page.evaluate(function() { var canvas = page.evaluate(function() {
if (!window.angular) { return false; } if (!window.angular) { return false; }
var body = window.angular.element(document.body); var body = window.angular.element(document.body);
if (!body.scope) { return false; } if (!body.injector) { return false; }
if (!body.injector()) { return false; }
var rootScope = body.injector().get('$rootScope'); var rootScope = body.injector().get('$rootScope');
if (!rootScope) {return false;} if (!rootScope) {return false;}
@ -59,6 +60,7 @@
width: bb.width, width: bb.width,
height: bb.height height: bb.height
}; };
page.render(params.png); page.render(params.png);
phantom.exit(); phantom.exit();
} }