fix(jsc): fixed javascript indenting

This commit is contained in:
Torkel Ödegaard 2015-08-21 16:28:01 +02:00
parent 292db86c9e
commit 960a4f71a3
2 changed files with 37 additions and 37 deletions

View File

@ -163,20 +163,6 @@ function($, _, moment) {
return info.sec * info.count; return info.sec * info.count;
}; };
kbn.getRelativeTimeInfo = function(str) {
var info = {value: str};
if (str === 'today') {
info.text = 'Today';
info.from = 'today';
info.to = 'now';
} else {
info.text = 'Last ' + str;
info.from = 'now-'+str;
info.to = 'now';
}
return info;
};
/* This is a simplified version of elasticsearch's date parser */ /* This is a simplified version of elasticsearch's date parser */
kbn.parseDate = function(text) { kbn.parseDate = function(text) {
if(_.isDate(text)) { if(_.isDate(text)) {
@ -219,6 +205,20 @@ function($, _, moment) {
return kbn.parseDateMath(mathString, time); return kbn.parseDateMath(mathString, time);
}; };
kbn.getRelativeTimeInfo = function(str) {
var info = {value: str};
if (str === 'today') {
info.text = 'Today';
info.from = 'today';
info.to = 'now';
} else {
info.text = 'Last ' + str;
info.from = 'now-'+str;
info.to = 'now';
}
return info;
};
kbn._timespanRegex = /^(\d+[h,m,M,w,s,H,d])|today$/; kbn._timespanRegex = /^(\d+[h,m,M,w,s,H,d])|today$/;
kbn.isValidTimeSpan = function(str) { kbn.isValidTimeSpan = function(str) {
return kbn._timespanRegex.test(str); return kbn._timespanRegex.test(str);
@ -229,8 +229,8 @@ function($, _, moment) {
for (var i = 0; i < mathString.length;) { for (var i = 0; i < mathString.length;) {
var c = mathString.charAt(i++), var c = mathString.charAt(i++),
type, type,
num, num,
unit; unit;
if (c === '/') { if (c === '/') {
type = 0; type = 0;
} else if (c === '+') { } else if (c === '+') {
@ -258,8 +258,8 @@ function($, _, moment) {
} }
unit = mathString.charAt(i++); unit = mathString.charAt(i++);
switch (unit) { switch (unit) {
case 'y': case 'y':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('year') : dateTime.startOf('year'); roundUp ? dateTime.endOf('year') : dateTime.startOf('year');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'years'); dateTime.add(num, 'years');
@ -267,8 +267,8 @@ function($, _, moment) {
dateTime.subtract(num, 'years'); dateTime.subtract(num, 'years');
} }
break; break;
case 'M': case 'M':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('month') : dateTime.startOf('month'); roundUp ? dateTime.endOf('month') : dateTime.startOf('month');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'months'); dateTime.add(num, 'months');
@ -276,8 +276,8 @@ function($, _, moment) {
dateTime.subtract(num, 'months'); dateTime.subtract(num, 'months');
} }
break; break;
case 'w': case 'w':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('week') : dateTime.startOf('week'); roundUp ? dateTime.endOf('week') : dateTime.startOf('week');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'weeks'); dateTime.add(num, 'weeks');
@ -285,8 +285,8 @@ function($, _, moment) {
dateTime.subtract(num, 'weeks'); dateTime.subtract(num, 'weeks');
} }
break; break;
case 'd': case 'd':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('day') : dateTime.startOf('day'); roundUp ? dateTime.endOf('day') : dateTime.startOf('day');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'days'); dateTime.add(num, 'days');
@ -294,9 +294,9 @@ function($, _, moment) {
dateTime.subtract(num, 'days'); dateTime.subtract(num, 'days');
} }
break; break;
case 'h': case 'h':
case 'H': case 'H':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('hour') : dateTime.startOf('hour'); roundUp ? dateTime.endOf('hour') : dateTime.startOf('hour');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'hours'); dateTime.add(num, 'hours');
@ -304,8 +304,8 @@ function($, _, moment) {
dateTime.subtract(num,'hours'); dateTime.subtract(num,'hours');
} }
break; break;
case 'm': case 'm':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('minute') : dateTime.startOf('minute'); roundUp ? dateTime.endOf('minute') : dateTime.startOf('minute');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'minutes'); dateTime.add(num, 'minutes');
@ -313,8 +313,8 @@ function($, _, moment) {
dateTime.subtract(num, 'minutes'); dateTime.subtract(num, 'minutes');
} }
break; break;
case 's': case 's':
if (type === 0) { if (type === 0) {
roundUp ? dateTime.endOf('second') : dateTime.startOf('second'); roundUp ? dateTime.endOf('second') : dateTime.startOf('second');
} else if (type === 1) { } else if (type === 1) {
dateTime.add(num, 'seconds'); dateTime.add(num, 'seconds');
@ -322,8 +322,8 @@ function($, _, moment) {
dateTime.subtract(num, 'seconds'); dateTime.subtract(num, 'seconds');
} }
break; break;
default: default:
return false; return false;
} }
} }
return dateTime.toDate(); return dateTime.toDate();
@ -523,9 +523,9 @@ function($, _, moment) {
kbn.slugifyForUrl = function(str) { kbn.slugifyForUrl = function(str) {
return str return str
.toLowerCase() .toLowerCase()
.replace(/[^\w ]+/g,'') .replace(/[^\w ]+/g,'')
.replace(/ +/g,'-'); .replace(/ +/g,'-');
}; };
kbn.exportSeriesListToCsv = function(seriesList) { kbn.exportSeriesListToCsv = function(seriesList) {

View File

@ -69,7 +69,7 @@ function (angular, _, kbn, $) {
} }
if (_.isString(scope.rangeUnparsed.from)) { if (_.isString(scope.rangeUnparsed.from)) {
var timeInfo = kbn.getRelativeTimeInfo(scope.panel.timeFrom) var timeInfo = kbn.getRelativeTimeInfo(scope.panel.timeFrom);
scope.panelMeta.timeInfo = timeInfo.text; scope.panelMeta.timeInfo = timeInfo.text;
scope.rangeUnparsed.from = timeInfo.from; scope.rangeUnparsed.from = timeInfo.from;
scope.rangeUnparsed.to = timeInfo.to; scope.rangeUnparsed.to = timeInfo.to;