IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(panel): fixed issues with png rendering, also fixed #4260

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-06 12:51:36 +01:00
parent 7df18678a4
commit 2c8e35a933
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/dashboard/shareModalCtrl.js
View File

@@ -72,6 +72,7 @@ function (angular, _, require, config) {
var soloUrl = $scope.shareUrl;
soloUrl = soloUrl.replace('/dashboard/', '/dashboard-solo/');
soloUrl = soloUrl.replace("&fullscreen", "");
$scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';

2
public/test/specs/shareModalCtrl-specs.js
View File

@@ -38,7 +38,7 @@ define([
ctx.scope.init();
var base = 'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash';
var params = '?from=1000&to=2000&panelId=22&fullscreen&width=1000&height=500';
var params = '?from=1000&to=2000&panelId=22&width=1000&height=500';
expect(ctx.scope.imageUrl).to.be(base + params);
});

9
vendor/phantomjs/render.js vendored
View File

@@ -33,7 +33,7 @@
var tries = 0;
page.open(params.url, function (status) {
console.log('Loading a web page: ' + params.url + ' status: ' + status);
// console.log('Loading a web page: ' + params.url + ' status: ' + status);
function checkIsReady() {
var canvas = page.evaluate(function() {
@@ -49,10 +49,11 @@
});
if (canvas || tries === 1000) {
var bb = page.evaluate(function () {
return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
var bb = page.evaluate(function () {
return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
});
page.clipRect = {
page.clipRect = {
top: bb.top,
left: bb.left,
width: bb.width,