Commit a8547ae3 by Patrick O'Carroll

added this:any to functions and changed functions to arrowfunctions

parent 80d6ef53
// Node.closest() polyfill // Node.closest() polyfill
if ('Element' in window && !Element.prototype.closest) { if ('Element' in window && !Element.prototype.closest) {
Element.prototype.closest = function(s) { Element.prototype.closest = function(this: any, s) {
const matches = (this.document || this.ownerDocument).querySelectorAll(s); const matches = (this.document || this.ownerDocument).querySelectorAll(s);
let el = this; let el = this;
let i; let i;
......
import _ from 'lodash'; import _ from 'lodash';
import coreModule from '../../core_module'; import coreModule from '../../core_module';
function typeaheadMatcher(item) { function typeaheadMatcher(this: any, item) {
var str = this.query; var str = this.query;
if (str === '') { if (str === '') {
return true; return true;
......
...@@ -33,7 +33,7 @@ export function queryPartEditorDirective($compile, templateSrv) { ...@@ -33,7 +33,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
$scope.partActions = []; $scope.partActions = [];
function clickFuncParam(paramIndex) { function clickFuncParam(this: any, paramIndex) {
/*jshint validthis:true */ /*jshint validthis:true */
const $link = $(this); const $link = $(this);
const $input = $link.next(); const $input = $link.next();
...@@ -53,7 +53,7 @@ export function queryPartEditorDirective($compile, templateSrv) { ...@@ -53,7 +53,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
} }
} }
function inputBlur(paramIndex) { function inputBlur(this: any, paramIndex) {
/*jshint validthis:true */ /*jshint validthis:true */
const $input = $(this); const $input = $(this);
const $link = $input.prev(); const $link = $input.prev();
...@@ -72,14 +72,14 @@ export function queryPartEditorDirective($compile, templateSrv) { ...@@ -72,14 +72,14 @@ export function queryPartEditorDirective($compile, templateSrv) {
$link.show(); $link.show();
} }
function inputKeyPress(paramIndex, e) { function inputKeyPress(this: any, paramIndex, e) {
/*jshint validthis:true */ /*jshint validthis:true */
if (e.which === 13) { if (e.which === 13) {
inputBlur.call(this, paramIndex); inputBlur.call(this, paramIndex);
} }
} }
function inputKeyDown() { function inputKeyDown(this: any) {
/*jshint validthis:true */ /*jshint validthis:true */
this.style.width = (3 + this.value.length) * 8 + 'px'; this.style.width = (3 + this.value.length) * 8 + 'px';
} }
......
...@@ -69,7 +69,7 @@ function bootstrapTagsinput() { ...@@ -69,7 +69,7 @@ function bootstrapTagsinput() {
}, },
}); });
select.on('itemAdded', function(event) { select.on('itemAdded', event => {
if (scope.model.indexOf(event.item) === -1) { if (scope.model.indexOf(event.item) === -1) {
scope.model.push(event.item); scope.model.push(event.item);
if (scope.onTagsUpdated) { if (scope.onTagsUpdated) {
...@@ -79,7 +79,7 @@ function bootstrapTagsinput() { ...@@ -79,7 +79,7 @@ function bootstrapTagsinput() {
const tagElement = select const tagElement = select
.next() .next()
.children('span') .children('span')
.filter(function() { .filter(() => {
return $(this).text() === event.item; return $(this).text() === event.item;
}); });
setColor(event.item, tagElement); setColor(event.item, tagElement);
......
...@@ -9,10 +9,10 @@ $.fn.place_tt = (function() { ...@@ -9,10 +9,10 @@ $.fn.place_tt = (function() {
offset: 5, offset: 5,
}; };
return function(x, y, opts) { return function(this: any, x, y, opts) {
opts = $.extend(true, {}, defaults, opts); opts = $.extend(true, {}, defaults, opts);
return this.each(function() { return this.each(() => {
const $tooltip = $(this); const $tooltip = $(this);
let width, height; let width, height;
......
...@@ -204,7 +204,7 @@ const reactComponent = function($injector) { ...@@ -204,7 +204,7 @@ const reactComponent = function($injector) {
attrs.props ? watchProps(attrs.watchDepth, scope, [attrs.props], renderMyComponent) : renderMyComponent(); attrs.props ? watchProps(attrs.watchDepth, scope, [attrs.props], renderMyComponent) : renderMyComponent();
// cleanup when scope is destroyed // cleanup when scope is destroyed
scope.$on('$destroy', function() { scope.$on('$destroy', () => {
if (!attrs.onScopeDestroy) { if (!attrs.onScopeDestroy) {
ReactDOM.unmountComponentAtNode(elem[0]); ReactDOM.unmountComponentAtNode(elem[0]);
} else { } else {
...@@ -280,7 +280,7 @@ const reactDirective = function($injector) { ...@@ -280,7 +280,7 @@ const reactDirective = function($injector) {
props.length ? watchProps(attrs.watchDepth, scope, propExpressions, renderMyComponent) : renderMyComponent(); props.length ? watchProps(attrs.watchDepth, scope, propExpressions, renderMyComponent) : renderMyComponent();
// cleanup when scope is destroyed // cleanup when scope is destroyed
scope.$on('$destroy', function() { scope.$on('$destroy', () => {
if (!attrs.onScopeDestroy) { if (!attrs.onScopeDestroy) {
ReactDOM.unmountComponentAtNode(elem[0]); ReactDOM.unmountComponentAtNode(elem[0]);
} else { } else {
......
...@@ -3,7 +3,7 @@ import coreModule from 'app/core/core_module'; ...@@ -3,7 +3,7 @@ import coreModule from 'app/core/core_module';
import Drop from 'tether-drop'; import Drop from 'tether-drop';
/** @ngInject **/ /** @ngInject **/
function popoverSrv($compile, $rootScope, $timeout) { function popoverSrv(this: any, $compile, $rootScope, $timeout) {
let openDrop = null; let openDrop = null;
this.close = function() { this.close = function() {
......
...@@ -2,10 +2,10 @@ import _ from 'lodash'; ...@@ -2,10 +2,10 @@ import _ from 'lodash';
import coreModule from '../core_module'; import coreModule from '../core_module';
/** @ngInject */ /** @ngInject */
export function uiSegmentSrv($sce, templateSrv) { export function uiSegmentSrv(this: any, $sce, templateSrv) {
const self = this; const self = this;
function MetricSegment(options) { function MetricSegment(this: any, options) {
if (options === '*' || options.value === '*') { if (options === '*' || options.value === '*') {
this.value = '*'; this.value = '*';
this.html = $sce.trustAsHtml('<i class="fa fa-asterisk"><i>'); this.html = $sce.trustAsHtml('<i class="fa fa-asterisk"><i>');
......
...@@ -140,15 +140,12 @@ export class DashboardMigrator { ...@@ -140,15 +140,12 @@ export class DashboardMigrator {
} }
// ensure query refIds // ensure query refIds
panelUpgrades.push(function(panel) { panelUpgrades.push(panel => {
_.each( _.each(panel.targets, target => {
panel.targets, if (!target.refId) {
function(target) { target.refId = this.dashboard.getNextQueryLetter(panel);
if (!target.refId) { }
target.refId = this.dashboard.getNextQueryLetter(panel); });
}
}.bind(this)
);
}); });
} }
......
...@@ -2,7 +2,7 @@ import angular from 'angular'; ...@@ -2,7 +2,7 @@ import angular from 'angular';
import { ChangeTracker } from './change_tracker'; import { ChangeTracker } from './change_tracker';
/** @ngInject */ /** @ngInject */
export function unsavedChangesSrv($rootScope, $q, $location, $timeout, contextSrv, dashboardSrv, $window) { export function unsavedChangesSrv(this: any, $rootScope, $q, $location, $timeout, contextSrv, dashboardSrv, $window) {
this.init = function(dashboard, scope) { this.init = function(dashboard, scope) {
this.tracker = new ChangeTracker(dashboard, scope, 1000, $location, $window, $timeout, contextSrv, $rootScope); this.tracker = new ChangeTracker(dashboard, scope, 1000, $location, $window, $timeout, contextSrv, $rootScope);
return this.tracker; return this.tracker;
......
...@@ -3,7 +3,7 @@ import { VariableSrv } from '../variable_srv'; ...@@ -3,7 +3,7 @@ import { VariableSrv } from '../variable_srv';
import moment from 'moment'; import moment from 'moment';
import $q from 'q'; import $q from 'q';
describe('VariableSrv', function() { describe('VariableSrv', function(this: any) {
const ctx = <any>{ const ctx = <any>{
datasourceSrv: {}, datasourceSrv: {},
timeSrv: { timeSrv: {
......
...@@ -4,7 +4,7 @@ import _ from 'lodash'; ...@@ -4,7 +4,7 @@ import _ from 'lodash';
import { VariableSrv } from '../variable_srv'; import { VariableSrv } from '../variable_srv';
import $q from 'q'; import $q from 'q';
describe('VariableSrv init', function() { describe('VariableSrv init', function(this: any) {
const templateSrv = { const templateSrv = {
init: vars => { init: vars => {
this.variables = vars; this.variables = vars;
......
...@@ -203,7 +203,7 @@ export class ElasticDatasource { ...@@ -203,7 +203,7 @@ export class ElasticDatasource {
this.timeSrv.setTime({ from: 'now-1m', to: 'now' }, true); this.timeSrv.setTime({ from: 'now-1m', to: 'now' }, true);
// validate that the index exist and has date field // validate that the index exist and has date field
return this.getFields({ type: 'date' }).then( return this.getFields({ type: 'date' }).then(
function(dateFields) { dateFields => {
const timeField = _.find(dateFields, { text: this.timeField }); const timeField = _.find(dateFields, { text: this.timeField });
if (!timeField) { if (!timeField) {
return { return {
...@@ -212,7 +212,7 @@ export class ElasticDatasource { ...@@ -212,7 +212,7 @@ export class ElasticDatasource {
}; };
} }
return { status: 'success', message: 'Index OK. Time field name OK.' }; return { status: 'success', message: 'Index OK. Time field name OK.' };
}.bind(this), },
function(err) { function(err) {
console.log(err); console.log(err);
if (err.data && err.data.error) { if (err.data && err.data.error) {
......
...@@ -5,7 +5,7 @@ import { ElasticDatasource } from '../datasource'; ...@@ -5,7 +5,7 @@ import { ElasticDatasource } from '../datasource';
import * as dateMath from 'app/core/utils/datemath'; import * as dateMath from 'app/core/utils/datemath';
describe('ElasticDatasource', function() { describe('ElasticDatasource', function(this: any) {
const backendSrv = { const backendSrv = {
datasourceRequest: jest.fn(), datasourceRequest: jest.fn(),
}; };
......
...@@ -90,7 +90,7 @@ export function graphiteAddFunc($compile) { ...@@ -90,7 +90,7 @@ export function graphiteAddFunc($compile) {
}; };
$(elem) $(elem)
.on('mouseenter', 'ul.dropdown-menu li', function() { .on('mouseenter', 'ul.dropdown-menu li', () => {
cleanUpDrop(); cleanUpDrop();
var funcDef; var funcDef;
......
...@@ -4,7 +4,7 @@ import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version'; ...@@ -4,7 +4,7 @@ import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version';
import gfunc from './gfunc'; import gfunc from './gfunc';
/** @ngInject */ /** @ngInject */
export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv) { export function GraphiteDatasource(this: any, instanceSettings, $q, backendSrv, templateSrv) {
this.basicAuth = instanceSettings.basicAuth; this.basicAuth = instanceSettings.basicAuth;
this.url = instanceSettings.url; this.url = instanceSettings.url;
this.name = instanceSettings.name; this.name = instanceSettings.name;
......
...@@ -28,7 +28,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) { ...@@ -28,7 +28,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
var paramCountAtLink = 0; var paramCountAtLink = 0;
var cancelBlur = null; var cancelBlur = null;
function clickFuncParam(paramIndex) { function clickFuncParam(this: any, paramIndex) {
/*jshint validthis:true */ /*jshint validthis:true */
const $link = $(this); const $link = $(this);
...@@ -108,7 +108,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) { ...@@ -108,7 +108,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
} }
// this = input element // this = input element
function inputBlur(paramIndex) { function inputBlur(this: any, paramIndex) {
/*jshint validthis:true */ /*jshint validthis:true */
const inputElem = this; const inputElem = this;
// happens long before the click event on the typeahead options // happens long before the click event on the typeahead options
...@@ -118,14 +118,14 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) { ...@@ -118,14 +118,14 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
}, 200); }, 200);
} }
function inputKeyPress(paramIndex, e) { function inputKeyPress(this: any, paramIndex, e) {
/*jshint validthis:true */ /*jshint validthis:true */
if (e.which === 13) { if (e.which === 13) {
$(this).blur(); $(this).blur();
} }
} }
function inputKeyDown() { function inputKeyDown(this: any) {
/*jshint validthis:true */ /*jshint validthis:true */
this.style.width = (3 + this.value.length) * 8 + 'px'; this.style.width = (3 + this.value.length) * 8 + 'px';
} }
......
...@@ -964,26 +964,23 @@ export class FuncInstance { ...@@ -964,26 +964,23 @@ export class FuncInstance {
render(metricExp) { render(metricExp) {
const str = this.def.name + '('; const str = this.def.name + '(';
const parameters = _.map( const parameters = _.map(this.params, (value, index) => {
this.params, var paramType;
function(value, index) { if (index < this.def.params.length) {
var paramType; paramType = this.def.params[index].type;
if (index < this.def.params.length) { } else if (_.get(_.last(this.def.params), 'multiple')) {
paramType = this.def.params[index].type; paramType = _.get(_.last(this.def.params), 'type');
} else if (_.get(_.last(this.def.params), 'multiple')) { }
paramType = _.get(_.last(this.def.params), 'type'); // param types that should never be quoted
} if (_.includes(['value_or_series', 'boolean', 'int', 'float', 'node'], paramType)) {
// param types that should never be quoted return value;
if (_.includes(['value_or_series', 'boolean', 'int', 'float', 'node'], paramType)) { }
return value; // param types that might be quoted
} if (_.includes(['int_or_interval', 'node_or_tag'], paramType) && _.isFinite(+value)) {
// param types that might be quoted return _.toString(+value);
if (_.includes(['int_or_interval', 'node_or_tag'], paramType) && _.isFinite(+value)) { }
return _.toString(+value); return "'" + value + "'";
} });
return "'" + value + "'";
}.bind(this)
);
// don't send any blank parameters to graphite // don't send any blank parameters to graphite
while (parameters[parameters.length - 1] === '') { while (parameters[parameters.length - 1] === '') {
...@@ -1017,12 +1014,9 @@ export class FuncInstance { ...@@ -1017,12 +1014,9 @@ export class FuncInstance {
// handle optional parameters // handle optional parameters
// if string contains ',' and next param is optional, split and update both // if string contains ',' and next param is optional, split and update both
if (this._hasMultipleParamsInString(strValue, index)) { if (this._hasMultipleParamsInString(strValue, index)) {
_.each( _.each(strValue.split(','), (partVal, idx) => {
strValue.split(','), this.updateParam(partVal.trim(), index + idx);
function(partVal, idx) { });
this.updateParam(partVal.trim(), index + idx);
}.bind(this)
);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment