mirror of
https://github.com/grafana/grafana.git
synced 2026-07-29 15:59:50 -05:00
prettier: ran on all files again, sorry. now settings are defined in package.json
This commit is contained in:
@@ -118,14 +118,7 @@ function editorCheckbox($compile, $interpolate) {
|
||||
var model = $interpolate(attrs.model)(scope);
|
||||
var ngchange = attrs.change ? ' ng-change="' + attrs.change + '"' : '';
|
||||
var tip = attrs.tip ? ' <tip>' + attrs.tip + '</tip>' : '';
|
||||
var label =
|
||||
'<label for="' +
|
||||
scope.$id +
|
||||
model +
|
||||
'" class="checkbox-label">' +
|
||||
text +
|
||||
tip +
|
||||
'</label>';
|
||||
var label = '<label for="' + scope.$id + model + '" class="checkbox-label">' + text + tip + '</label>';
|
||||
|
||||
var template =
|
||||
'<input class="cr1" id="' +
|
||||
@@ -155,12 +148,7 @@ function editorCheckbox($compile, $interpolate) {
|
||||
function gfDropdown($parse, $compile, $timeout) {
|
||||
function buildTemplate(items, placement?) {
|
||||
var upclass = placement === 'top' ? 'dropup' : '';
|
||||
var ul = [
|
||||
'<ul class="dropdown-menu ' +
|
||||
upclass +
|
||||
'" role="menu" aria-labelledby="drop1">',
|
||||
'</ul>',
|
||||
];
|
||||
var ul = ['<ul class="dropdown-menu ' + upclass + '" role="menu" aria-labelledby="drop1">', '</ul>'];
|
||||
|
||||
for (let index = 0; index < items.length; index++) {
|
||||
let item = items[index];
|
||||
@@ -172,9 +160,7 @@ function gfDropdown($parse, $compile, $timeout) {
|
||||
|
||||
var li =
|
||||
'<li' +
|
||||
(item.submenu && item.submenu.length
|
||||
? ' class="dropdown-submenu"'
|
||||
: '') +
|
||||
(item.submenu && item.submenu.length ? ' class="dropdown-submenu"' : '') +
|
||||
'>' +
|
||||
'<a tabindex="-1" ng-href="' +
|
||||
(item.href || '') +
|
||||
@@ -205,9 +191,7 @@ function gfDropdown($parse, $compile, $timeout) {
|
||||
items = getter(scope);
|
||||
$timeout(function() {
|
||||
var placement = iElement.data('placement');
|
||||
var dropdown = angular.element(
|
||||
buildTemplate(items, placement).join('')
|
||||
);
|
||||
var dropdown = angular.element(buildTemplate(items, placement).join(''));
|
||||
dropdown.insertAfter(iElement);
|
||||
$compile(iElement.next('ul.dropdown-menu'))(scope);
|
||||
});
|
||||
|
||||
@@ -47,10 +47,7 @@ function rebuildOnChange($animate) {
|
||||
}
|
||||
}
|
||||
|
||||
scope.$watch(attrs.property, function rebuildOnChangeAction(
|
||||
value,
|
||||
oldValue
|
||||
) {
|
||||
scope.$watch(attrs.property, function rebuildOnChangeAction(value, oldValue) {
|
||||
if (childScope && value !== oldValue) {
|
||||
cleanUp();
|
||||
}
|
||||
@@ -58,9 +55,7 @@ function rebuildOnChange($animate) {
|
||||
if (!childScope && (value || attrs.showNull)) {
|
||||
transclude(function(clone, newScope) {
|
||||
childScope = newScope;
|
||||
clone[clone.length++] = document.createComment(
|
||||
' end rebuild on change '
|
||||
);
|
||||
clone[clone.length++] = document.createComment(' end rebuild on change ');
|
||||
block = { clone: clone };
|
||||
$animate.enter(clone, elem.parent(), elem);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user