Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
2c8e35a9
Commit
2c8e35a9
authored
Mar 06, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(panel): fixed issues with png rendering, also fixed #4260
parent
7df18678
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
public/app/features/dashboard/shareModalCtrl.js
+1
-0
public/test/specs/shareModalCtrl-specs.js
+1
-1
vendor/phantomjs/render.js
+2
-1
No files found.
public/app/features/dashboard/shareModalCtrl.js
View file @
2c8e35a9
...
@@ -72,6 +72,7 @@ function (angular, _, require, config) {
...
@@ -72,6 +72,7 @@ function (angular, _, require, config) {
var
soloUrl
=
$scope
.
shareUrl
;
var
soloUrl
=
$scope
.
shareUrl
;
soloUrl
=
soloUrl
.
replace
(
'/dashboard/'
,
'/dashboard-solo/'
);
soloUrl
=
soloUrl
.
replace
(
'/dashboard/'
,
'/dashboard-solo/'
);
soloUrl
=
soloUrl
.
replace
(
"&fullscreen"
,
""
);
$scope
.
iframeHtml
=
'<iframe src="'
+
soloUrl
+
'" width="450" height="200" frameborder="0"></iframe>'
;
$scope
.
iframeHtml
=
'<iframe src="'
+
soloUrl
+
'" width="450" height="200" frameborder="0"></iframe>'
;
...
...
public/test/specs/shareModalCtrl-specs.js
View file @
2c8e35a9
...
@@ -38,7 +38,7 @@ define([
...
@@ -38,7 +38,7 @@ define([
ctx
.
scope
.
init
();
ctx
.
scope
.
init
();
var
base
=
'http://dashboards.grafana.com/render/dashboard-solo/db/my-dash'
;
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
);
expect
(
ctx
.
scope
.
imageUrl
).
to
.
be
(
base
+
params
);
});
});
...
...
vendor/phantomjs/render.js
View file @
2c8e35a9
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
var
tries
=
0
;
var
tries
=
0
;
page
.
open
(
params
.
url
,
function
(
status
)
{
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
()
{
function
checkIsReady
()
{
var
canvas
=
page
.
evaluate
(
function
()
{
var
canvas
=
page
.
evaluate
(
function
()
{
...
@@ -52,6 +52,7 @@
...
@@ -52,6 +52,7 @@
var
bb
=
page
.
evaluate
(
function
()
{
var
bb
=
page
.
evaluate
(
function
()
{
return
document
.
getElementsByClassName
(
"main-view"
)[
0
].
getBoundingClientRect
();
return
document
.
getElementsByClassName
(
"main-view"
)[
0
].
getBoundingClientRect
();
});
});
page
.
clipRect
=
{
page
.
clipRect
=
{
top
:
bb
.
top
,
top
:
bb
.
top
,
left
:
bb
.
left
,
left
:
bb
.
left
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment