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
660ce3a6
Commit
660ce3a6
authored
Feb 04, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(row editor): row editor fix and cleanup of unused code
parent
edf5868c
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
52 deletions
+10
-52
public/app/core/core.ts
+0
-1
public/app/core/directives/config_modal.js
+0
-46
public/app/core/directives/misc.js
+0
-1
public/app/features/dashboard/rowCtrl.js
+7
-0
public/app/features/panel/panel_menu.js
+0
-1
public/app/partials/dashboard.html
+1
-1
public/app/plugins/datasource/influxdb/partials/query.editor.html
+1
-1
public/app/plugins/datasource/influxdb/query_ctrl.ts
+1
-1
No files found.
public/app/core/core.ts
View file @
660ce3a6
...
...
@@ -3,7 +3,6 @@
import
"./directives/annotation_tooltip"
;
import
"./directives/body_class"
;
import
"./directives/config_modal"
;
import
"./directives/confirm_click"
;
import
"./directives/dash_edit_link"
;
import
"./directives/dash_upload"
;
...
...
public/app/core/directives/config_modal.js
deleted
100644 → 0
View file @
edf5868c
define
([
'lodash'
,
'jquery'
,
'../core_module'
,
],
function
(
_
,
$
,
coreModule
)
{
'use strict'
;
coreModule
.
default
.
directive
(
'configModal'
,
function
(
$modal
,
$q
,
$timeout
)
{
return
{
restrict
:
'A'
,
link
:
function
(
scope
,
elem
,
attrs
)
{
var
partial
=
attrs
.
configModal
;
var
id
=
'#'
+
partial
.
replace
(
'.html'
,
''
).
replace
(
/
[\/
|
\.
|:
]
/g
,
'-'
)
+
'-'
+
scope
.
$id
;
elem
.
bind
(
'click'
,
function
()
{
if
(
$
(
id
).
length
)
{
elem
.
attr
(
'data-target'
,
id
).
attr
(
'data-toggle'
,
'modal'
);
scope
.
$apply
(
function
()
{
scope
.
$broadcast
(
'modal-opened'
);
});
return
;
}
var
panelModal
=
$modal
({
template
:
partial
,
persist
:
false
,
show
:
false
,
scope
:
scope
.
$new
(),
keyboard
:
false
});
$q
.
when
(
panelModal
).
then
(
function
(
modalEl
)
{
elem
.
attr
(
'data-target'
,
id
).
attr
(
'data-toggle'
,
'modal'
);
$timeout
(
function
()
{
if
(
!
modalEl
.
data
(
'modal'
).
isShown
)
{
modalEl
.
modal
(
'show'
);
}
},
50
);
});
scope
.
$apply
();
});
}
};
});
});
public/app/core/directives/misc.js
View file @
660ce3a6
...
...
@@ -90,7 +90,6 @@ function (angular, coreModule, kbn) {
var
li
=
'<li'
+
(
item
.
submenu
&&
item
.
submenu
.
length
?
' class="dropdown-submenu"'
:
''
)
+
'>'
+
'<a tabindex="-1" ng-href="'
+
(
item
.
href
||
''
)
+
'"'
+
(
item
.
click
?
' ng-click="'
+
item
.
click
+
'"'
:
''
)
+
(
item
.
target
?
' target="'
+
item
.
target
+
'"'
:
''
)
+
(
item
.
method
?
' data-method="'
+
item
.
method
+
'"'
:
''
)
+
(
item
.
configModal
?
' dash-editor-link="'
+
item
.
configModal
+
'"'
:
""
)
+
'>'
+
(
item
.
text
||
''
)
+
'</a>'
;
if
(
item
.
submenu
&&
item
.
submenu
.
length
)
{
...
...
public/app/features/dashboard/rowCtrl.js
View file @
660ce3a6
...
...
@@ -61,6 +61,13 @@ function (angular, _, config) {
});
};
$scope
.
editRow
=
function
()
{
$scope
.
appEvent
(
'show-dash-editor'
,
{
src
:
'public/app/partials/roweditor.html'
,
scope
:
$scope
.
$new
()
});
};
$scope
.
moveRow
=
function
(
direction
)
{
var
rowsList
=
$scope
.
dashboard
.
rows
;
var
rowIndex
=
_
.
indexOf
(
rowsList
,
$scope
.
row
);
...
...
public/app/features/panel/panel_menu.js
View file @
660ce3a6
...
...
@@ -53,7 +53,6 @@ function (angular, $, _) {
template
+=
'<a class="panel-menu-link" '
;
if
(
item
.
click
)
{
template
+=
' ng-click="'
+
item
.
click
+
'"'
;
}
if
(
item
.
editorLink
)
{
template
+=
' dash-editor-link="'
+
item
.
editorLink
+
'"'
;
}
template
+=
'>'
;
template
+=
item
.
text
+
'</a>'
;
});
...
...
public/app/partials/dashboard.html
View file @
660ce3a6
...
...
@@ -65,7 +65,7 @@
</ul>
</li>
<li>
<a
dash-editor-link=
"app/partials/roweditor.html
"
>
Row editor
</a>
<a
ng-click=
"editRow()
"
>
Row editor
</a>
</li>
<li>
<a
ng-click=
"deleteRow()"
>
Delete row
</a>
...
...
public/app/plugins/datasource/influxdb/partials/query.editor.html
View file @
660ce3a6
...
...
@@ -17,7 +17,7 @@
</li>
</ul>
<div
class=
"tight-form-flex-wrapper"
ng-show=
"target.rawQuery"
>
<div
class=
"tight-form-flex-wrapper"
ng-show=
"
ctrl.
target.rawQuery"
>
<input
type=
"text"
class=
"tight-form-clear-input"
ng-model=
"ctrl.target.query"
spellcheck=
"false"
style=
"width: 100%;"
ng-blur=
"ctrl.refresh()"
></input>
</div>
</query-editor-row>
...
...
public/app/plugins/datasource/influxdb/query_ctrl.ts
View file @
660ce3a6
...
...
@@ -153,7 +153,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
this
.
panelCtrl
.
refresh
();
}
toggle
Query
Mode
()
{
toggle
Editor
Mode
()
{
this
.
target
.
rawQuery
=
!
this
.
target
.
rawQuery
;
}
...
...
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