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
09cec853
Commit
09cec853
authored
Jan 16, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'clipboard_js' of
https://github.com/mtanda/grafana
into mtanda-clipboard_js
parents
deff24d2
d683b037
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
1 deletions
+1
-1
public/app/core/components/grafana_app.ts
+1
-0
public/app/features/dashboard/shareModalCtrl.js
+0
-1
No files found.
public/app/core/components/grafana_app.ts
View file @
09cec853
...
@@ -72,6 +72,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
...
@@ -72,6 +72,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv) {
link
:
(
scope
,
elem
)
=>
{
link
:
(
scope
,
elem
)
=>
{
var
ignoreSideMenuHide
;
var
ignoreSideMenuHide
;
var
body
=
$
(
'body'
);
var
body
=
$
(
'body'
);
$
.
fn
.
modal
.
Constructor
.
prototype
.
enforceFocus
=
function
()
{};
// see https://github.com/zenorocha/clipboard.js/issues/155
// handle sidemenu open state
// handle sidemenu open state
scope
.
$watch
(
'contextSrv.sidemenu'
,
newVal
=>
{
scope
.
$watch
(
'contextSrv.sidemenu'
,
newVal
=>
{
...
...
public/app/features/dashboard/shareModalCtrl.js
View file @
09cec853
...
@@ -90,7 +90,6 @@ function (angular, _, $, require, config) {
...
@@ -90,7 +90,6 @@ function (angular, _, $, require, config) {
module
.
directive
(
'clipboardButton'
,
function
()
{
module
.
directive
(
'clipboardButton'
,
function
()
{
return
function
(
scope
,
elem
)
{
return
function
(
scope
,
elem
)
{
require
([
'vendor/clipboard/dist/clipboard'
],
function
(
Clipboard
)
{
require
([
'vendor/clipboard/dist/clipboard'
],
function
(
Clipboard
)
{
$
.
fn
.
modal
.
Constructor
.
prototype
.
enforceFocus
=
function
()
{};
// see https://github.com/zenorocha/clipboard.js/issues/155
scope
.
clipboard
=
new
Clipboard
(
elem
[
0
]);
scope
.
clipboard
=
new
Clipboard
(
elem
[
0
]);
});
});
...
...
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