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
e507bb6d
Commit
e507bb6d
authored
Jul 18, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(iframe): fixed issue with using full height of iframe, fixes #5605
parent
c82d5f86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
public/app/features/dashboard/viewStateSrv.js
+11
-6
public/app/features/panel/solo_panel_ctrl.js
+2
-5
No files found.
public/app/features/dashboard/viewStateSrv.js
View file @
e507bb6d
...
@@ -107,9 +107,12 @@ function (angular, _, $) {
...
@@ -107,9 +107,12 @@ function (angular, _, $) {
this
.
dashboard
.
meta
.
fullscreen
=
this
.
state
.
fullscreen
;
this
.
dashboard
.
meta
.
fullscreen
=
this
.
state
.
fullscreen
;
if
(
!
this
.
state
.
fullscreen
)
{
if
(
!
this
.
state
.
fullscreen
)
{
this
.
state
.
panelId
=
null
;
this
.
state
.
fullscreen
=
null
;
this
.
state
.
fullscreen
=
null
;
this
.
state
.
edit
=
null
;
this
.
state
.
edit
=
null
;
// clear panel id unless in solo mode
if
(
!
this
.
dashboard
.
meta
.
soloMode
)
{
this
.
state
.
panelId
=
null
;
}
}
}
$location
.
search
(
this
.
serializeToUrl
());
$location
.
search
(
this
.
serializeToUrl
());
...
@@ -193,11 +196,13 @@ function (angular, _, $) {
...
@@ -193,11 +196,13 @@ function (angular, _, $) {
var
self
=
this
;
var
self
=
this
;
self
.
panelScopes
.
push
(
panelScope
);
self
.
panelScopes
.
push
(
panelScope
);
if
(
self
.
state
.
panelId
===
panelScope
.
ctrl
.
panel
.
id
)
{
if
(
!
self
.
dashboard
.
meta
.
soloMode
)
{
if
(
self
.
state
.
edit
)
{
if
(
self
.
state
.
panelId
===
panelScope
.
ctrl
.
panel
.
id
)
{
panelScope
.
ctrl
.
editPanel
();
if
(
self
.
state
.
edit
)
{
}
else
{
panelScope
.
ctrl
.
editPanel
();
panelScope
.
ctrl
.
viewPanel
();
}
else
{
panelScope
.
ctrl
.
viewPanel
();
}
}
}
}
}
...
...
public/app/features/panel/solo_panel_ctrl.js
View file @
e507bb6d
...
@@ -17,15 +17,12 @@ function (angular, $) {
...
@@ -17,15 +17,12 @@ function (angular, $) {
var
params
=
$location
.
search
();
var
params
=
$location
.
search
();
panelId
=
parseInt
(
params
.
panelId
);
panelId
=
parseInt
(
params
.
panelId
);
// add fullscreen param;
$scope
.
onAppEvent
(
"dashboard-initialized"
,
$scope
.
initPanelScope
);
params
.
fullscreen
=
true
;
$location
.
search
(
params
);
dashboardLoaderSrv
.
loadDashboard
(
$routeParams
.
type
,
$routeParams
.
slug
).
then
(
function
(
result
)
{
dashboardLoaderSrv
.
loadDashboard
(
$routeParams
.
type
,
$routeParams
.
slug
).
then
(
function
(
result
)
{
result
.
meta
.
soloMode
=
true
;
$scope
.
initDashboard
(
result
,
$scope
);
$scope
.
initDashboard
(
result
,
$scope
);
});
});
$scope
.
onAppEvent
(
"dashboard-initialized"
,
$scope
.
initPanelScope
);
};
};
$scope
.
initPanelScope
=
function
()
{
$scope
.
initPanelScope
=
function
()
{
...
...
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