Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180100
Change subject: more lint silence
......................................................................
more lint silence
Change-Id: I7ece354062b0a84012c3a84e926051489e1208e8
---
M gulpfile.js
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/components/utils/date-pickers/date-pickers.js
M src/components/widgets/ABTesting/ABTestingMain.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
8 files changed, 153 insertions(+), 156 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/00/180100/1
diff --git a/gulpfile.js b/gulpfile.js
index e334a46..b23a6b1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,8 +3,7 @@
var fs = require('fs'),
vm = require('vm'),
merge = require('deeply'),
- chalk = require('chalk'),
- es = require('event-stream');
+ chalk = require('chalk');
// Gulp and plugins
var gulp = require('gulp'),
@@ -38,13 +37,13 @@
'components/widgets/distance-to-goal-chart/distance-to-goal-chart',
'components/widgets/totals-earned-chart/totals-earned-chart',
'components/widgets/amt-per-second-chart/amt-per-second-chart',
- 'components/boards/bigEnglish/bigEnglishBoard',
+ 'components/boards/bigEnglish/bigEnglishBoard'
],
insertRequire: ['app/startup'],
bundles: {
// If you want parts of the site to load on demand, remove them
from the 'include' list
// above, and group them into bundles here.
- 'date-pickers': ['components/utils/date-pickers/date-pickers'],
+ 'date-pickers': ['components/utils/date-pickers/date-pickers']
// 'vega-timeseries':
['components/visualizers/vega-timeseries/vega-timeseries']
}
@@ -115,7 +114,7 @@
bundles.forEach(function (element, index, array) {
var l = element.length;
// we are trying to match "project-selector" (quotes-included)
- regex = regex + '\"(' + element.substr(0, element.length - 3) +
')\":|';
+ regex = regex + '\"(' + element.substr(0, l - 3) + ')\":|';
});
@@ -127,14 +126,14 @@
// remove quotes from match and add ".js"
// so we can key on the manifest with versions
match = match.substring(1, match.length - 2);
- match = match + ".js";
+ match = match + '.js';
var version = jsManifest[match];
version = '\"' + version + '\":';
return version;
}
- var regexObj = new RegExp(regex, "g");
+ var regexObj = new RegExp(regex, 'g');
gulp.src(['./dist/' + jsManifest['scripts.js']])
.pipe(replace(regexObj, replaceByVersion))
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 5209139..02f7d4d 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -9,7 +9,7 @@
function BigEnglishBoardViewModel( params ){
var self = this,
- timeFormat = "dddd, MMMM Do YYYY, h:mm:ss a";
+ timeFormat = 'dddd, MMMM Do YYYY, h:mm:ss a';
// Get the date
self.displayDate = ko.observable( moment().format( timeFormat ) );
@@ -61,7 +61,7 @@
self.dailyDataArray[d] = 0;
self.dailyCountArray[d] = 0;
if (!self.dayObj[d]) {
- self.dayObj[d] = Array(25);
+ self.dayObj[d] = new Array(25);
self.dayObj[d][0] = 'Hourly Totals';
for (var h = 0; h < 24; h++) {
self.dayObj[d][h + 1] = {
total: 0, count: 0 };
@@ -74,16 +74,16 @@
for (var i = 0; i < dataCount; i++ ) {
var el = decemberData[i],
- d = el.day,
- h = el.hour,
+ day = el.day,
+ hour = el.hour,
total = el.usd_total;
- self.dayObj[d][h + 1] = { total: total, count:
el.donations };
+ self.dayObj[day][hour + 1] = { total: total,
count: el.donations };
- self.secondsByHourDonationData[(d - 1) * 24 + h
+ 1] = el.usd_per_second;
+ self.secondsByHourDonationData[(day - 1) * 24 +
hour + 1] = el.usd_per_second;
runningTotal += total;
- self.dailyDataArray[d] += total;
- self.dailyCountArray[d] += el.donations;
- };
+ self.dailyDataArray[day] += total;
+ self.dailyCountArray[day] += el.donations;
+ }
self.raised(runningTotal);
};
diff --git a/src/components/utils/date-pickers/date-pickers.js
b/src/components/utils/date-pickers/date-pickers.js
index 9b6960c..842ddc6 100644
--- a/src/components/utils/date-pickers/date-pickers.js
+++ b/src/components/utils/date-pickers/date-pickers.js
@@ -28,11 +28,11 @@
var timePeriod;
if (self.dateBeginRange() && self.dateEndRange()){
- timePeriod = "from " + self.dateBeginRange() + " to " +
self.dateEndRange();
+ timePeriod = 'from ' + self.dateBeginRange() + ' to ' +
self.dateEndRange();
} else if(self.chosenTimePeriodPresetDate()){
timePeriod = self.chosenTimePeriodPresetDate();
} else if(self.chosenTimePeriodDate() &&
self.chosenTimePeriodFromTime() && self.chosenTimePeriodToTime()) {
- timePeriod = self.chosenTimePeriodDate() + " from " +
self.chosenTimePeriodFromTime() + " to " + self.chosenTimePeriodToTime();
+ timePeriod = self.chosenTimePeriodDate() + ' from ' +
self.chosenTimePeriodFromTime() + ' to ' + self.chosenTimePeriodToTime();
}
return timePeriod;
diff --git a/src/components/widgets/ABTesting/ABTestingMain.js
b/src/components/widgets/ABTesting/ABTestingMain.js
index eecfce7..88d646d 100644
--- a/src/components/widgets/ABTesting/ABTestingMain.js
+++ b/src/components/widgets/ABTesting/ABTestingMain.js
@@ -5,7 +5,7 @@
'bootstrap-datepicker'],
function( ko, template, datePickersTemplate ){
- function ABTestingViewModel( params ){
+ var ABTestingViewModel = function ( params ) {
var self = this;
self.title = 'A/B Test Results';
@@ -13,117 +13,117 @@
//get the data for the tests
self.table1 = ko.observableArray([
{
- "name":"leafy.green",
- "donations":147,
- "impressions":"502,813",
- "don/K bi":0.29,
- "$/K bi":"$6.98 ",
- "clicks":216,
- "amount":"$3,510 ",
- "amount20/K bi":"$4.84 ",
- "avgDonation":"$23.88 ",
- "avg20":"$16.56 ",
- "median":"$20 ",
- "max":"$100 ",
- "conversionrate":"0.68%",
- "mode":"$20 ",
- "mode_s":"$20 "
+ 'name':'leafy.green',
+ 'donations':147,
+ 'impressions':'502,813',
+ 'don/K bi':0.29,
+ '$/K bi':'$6.98 ',
+ 'clicks':216,
+ 'amount':'$3,510 ',
+ 'amount20/K bi':'$4.84 ',
+ 'avgDonation':'$23.88 ',
+ 'avg20':'$16.56 ',
+ 'median':'$20 ',
+ 'max':'$100 ',
+ 'conversionrate':'0.68%',
+ 'mode':'$20 ',
+ 'mode_s':'$20 '
},
{
- "name":"green",
- "donations":143,
- "impressions":"503,249",
- "don/K bi":0.28,
- "$/K bi":"$7.76 ",
- "clicks":201,
- "amount":"$3,905 ",
- "amount20/K bi":"$4.58 ",
- "avgDonation":"$27.31 ",
- "avg20":"$16.13 ",
- "median":"$20 ",
- "max":"$250 ",
- "conversionrate":"0.71%",
- "mode":"$20 ",
- "mode_s":"$20 "
+ 'name':'green',
+ 'donations':143,
+ 'impressions':'503,249',
+ 'don/K bi':0.28,
+ '$/K bi':'$7.76 ',
+ 'clicks':201,
+ 'amount':'$3,905 ',
+ 'amount20/K bi':'$4.58 ',
+ 'avgDonation':'$27.31 ',
+ 'avg20':'$16.13 ',
+ 'median':'$20 ',
+ 'max':'$250 ',
+ 'conversionrate':'0.71%',
+ 'mode':'$20 ',
+ 'mode_s':'$20 '
},
{
- "name":"Absolute change:",
- "donations":4,
- "impressions":"-436",
- "don/K bi":0.01,
- "$/K bi":"($0.78)",
- "clicks":15,
- "amount":"($395)",
- "amount20/K bi":"$0.26 ",
- "avgDonation":"($3.43)",
- "avg20":"$0.44 ",
- "median":"$0 ",
- "max":"($150)",
- "conversionrate":"-0.03%",
- "mode":"$0 ",
- "mode_s":"$0 "
+ 'name':'Absolute change:',
+ 'donations':4,
+ 'impressions':'-436',
+ 'don/K bi':0.01,
+ '$/K bi':'($0.78)',
+ 'clicks':15,
+ 'amount':'($395)',
+ 'amount20/K bi':'$0.26 ',
+ 'avgDonation':'($3.43)',
+ 'avg20':'$0.44 ',
+ 'median':'$0 ',
+ 'max':'($150)',
+ 'conversionrate':'-0.03%',
+ 'mode':'$0 ',
+ 'mode_s':'$0 '
}
]);
self.table2 = ko.observableArray([
{
- "winner":"leafy.green",
- "donations/impression":"2.89%",
- "Donation increase / 1000bi":0.01,
- "$/impression":"-10.05%",
- "Dollar increase / 1000bi":"($0.78)",
- "Impression Anomaly":"-0.09%",
- "a20diff":"$0.26 ",
- "p":0.85,
- "power":0.05,
- "lower 95% confidence (donation)":"-20.62%",
- "upper 95% confidence (donations)":"26.39%",
- "lower 95% confidence ($)":"-41.90%",
- "upper 95% confidence ($)":"21.80%"
+ 'winner':'leafy.green',
+ 'donations/impression':'2.89%',
+ 'Donation increase / 1000bi':0.01,
+ '$/impression':'-10.05%',
+ 'Dollar increase / 1000bi':'($0.78)',
+ 'Impression Anomaly':'-0.09%',
+ 'a20diff':'$0.26 ',
+ 'p':0.85,
+ 'power':0.05,
+ 'lower 95% confidence (donation)':'-20.62%',
+ 'upper 95% confidence (donations)':'26.39%',
+ 'lower 95% confidence ($)':'-41.90%',
+ 'upper 95% confidence ($)':'21.80%'
}
]);
self.table3 = ko.observableArray([
{
- "name":"leafy.green",
- "amount3/1000bi":"$0.88 ",
- "avg3":"$3 ",
- "amount5/1000bi":"$1.46 ",
- "avg5":"$5 ",
- "amount10/1000bi":"$2.80 ",
- "avg10":"$9.59 ",
- "amount50/1000bi":"$6.48 ",
- "avg50":"$22.18 "
+ 'name':'leafy.green',
+ 'amount3/1000bi':'$0.88 ',
+ 'avg3':'$3 ',
+ 'amount5/1000bi':'$1.46 ',
+ 'avg5':'$5 ',
+ 'amount10/1000bi':'$2.80 ',
+ 'avg10':'$9.59 ',
+ 'amount50/1000bi':'$6.48 ',
+ 'avg50':'$22.18 '
},
{
- "name":"green",
- "amount3/1000bi":"$0.85 ",
- "avg3":"$2.98 ",
- "amount5/1000bi":"$1.41 ",
- "avg5":"$4.95 ",
- "amount10/1000bi":"$2.69 ",
- "avg10":"$9.48 ",
- "amount50/1000bi":"$6.37 ",
- "avg50":"$22.41 "
+ 'name':'green',
+ 'amount3/1000bi':'$0.85 ',
+ 'avg3':'$2.98 ',
+ 'amount5/1000bi':'$1.41 ',
+ 'avg5':'$4.95 ',
+ 'amount10/1000bi':'$2.69 ',
+ 'avg10':'$9.48 ',
+ 'amount50/1000bi':'$6.37 ',
+ 'avg50':'$22.41 '
}
]);
- var table4 = ko.observableArray([
+ self.table4 = ko.observableArray([
{
- "name":"cc",
- "donations":123,
- "clicks":195,
- "conversion":"63.08%",
- "avg":"$30.90 ",
- "amount":"$3,801 "
+ 'name':'cc',
+ 'donations':123,
+ 'clicks':195,
+ 'conversion':'63.08%',
+ 'avg':'$30.90 ',
+ 'amount':'$3,801 '
},
{
- "name":"pp",
- "donations":167,
- "clicks":222,
- "conversion":"75.23%",
- "avg":"$21.64 ",
- "amount":"$3,614 "
+ 'name':'pp',
+ 'donations':167,
+ 'clicks':222,
+ 'conversion':'75.23%',
+ 'avg':'$21.64 ',
+ 'amount':'$3,614 '
}
]);
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index e606363..053fa73 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -36,8 +36,8 @@
}
var hoursLeft = ( 31 - d) * 24 + ( 24 -
h );
xs[index] = index;
- self.needPerSecond[index] = ( hoursLeft
> 0 )
- ? ( remainingNeeded / hoursLeft
) / 3600
+ self.needPerSecond[index] = ( hoursLeft
> 0 ) ?
+ ( remainingNeeded / hoursLeft )
/ 3600
: 0;
}
}
@@ -74,12 +74,12 @@
x: {
tick: {
count: 31,
- format: function(x){
return "Dec " + ( Math.floor( x / 24 ) + 1 ) }
+ format: function(x){
return 'Dec ' + ( Math.floor( x / 24 ) + 1 ); }
}
},
y: {
tick: {
- format: function(x){
return numeral(x).format('$0,0') }
+ format: function(x){
return numeral(x).format('$0,0'); }
}
}
},
@@ -89,7 +89,7 @@
var day = Math.floor( x
/ 24 ) + 1;
var hour = x % 24;
return 'Dec ' + day + '
' + hour + ':00 – ' + hour + ':59 UTC';
- },
+ }
}
}
} );
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
index 63af1fc..eb4d94d 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
@@ -42,7 +42,7 @@
axis: {
x: {
tick: {
- format: function(x){
return "Dec " + (x+1) }
+ format: function(x){
return 'Dec ' + (x+1); }
}
},
y: {
@@ -51,12 +51,12 @@
position: 'outer-middle'
},
tick: {
- format: function(x){
return '$' + x/1000000 + "m" }
+ format: function(x){
return '$' + x/1000000 + 'm'; }
}
}
- },
+ }
});
- }
+ };
params.dataChanged.subscribe(function() {
self.makeCharts();
});
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 554fee9..b503020 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -35,7 +35,7 @@
$.ajaxSetup({async:false});
- var widgetData = $.get( 'metadata/fraud', function(reqData){
+ $.get( 'metadata/fraud', function(reqData){
self.data = reqData;
});
@@ -51,7 +51,7 @@
self.queryStringSQL = ko.observable('This widget hasn\'t been set up
yet!');
//broken down data from above
- self.filters = ko.observableArray($.map(self.data.filters, function(val,
i){return[val]}));
+ self.filters = ko.observableArray($.map(self.data.filters, function(val,
i){return [val];}));
self.filterNames = ko.computed( function(){
var names = [];
$.each(self.filters(), function(el, i){
@@ -90,7 +90,7 @@
},{
value: 90,
color: '#000000'
- }, ];
+ }];
//draw chart
self.gaugeChart = new Chart(placeholderctx).Doughnut(ddata, {
@@ -98,8 +98,6 @@
segmentShowStroke: false,
onAnimationComplete: function() {
-
- var center = Math.round($(placeholder).width() / 2);
var cropHeight = Math.round(placeholder.height/2);
@@ -133,8 +131,8 @@
//there must be a chosen timeframe
if(!times){
- validation.errors.push('You must submit a valid time.')
- validation.validated = false;
+ validation.errors.push('You must submit a valid time.');
+ validation.validated = false;
} else {
validation.validated = true;
}
@@ -146,10 +144,10 @@
var qs = '',
ds = '',
- timePresets = [ "Last 15 Minutes",
- "Last Hour",
- "Last 24 Hours",
- "Last 5 Minutes"];
+ timePresets = [ 'Last 15 Minutes',
+ 'Last Hour',
+ 'Last 24 Hours',
+ 'Last 5 Minutes'];
//match subfilters to filters
//TODO: this is terrible and needs to be refactored when this piece gets
modularized.
@@ -161,7 +159,7 @@
if(!filterObj[filter]){
filterObj[filter] = subfilter;
} else {
- filterObj[filter] += " or " + subfilter;
+ filterObj[filter] += ' or ' + subfilter;
haveMultipleSubfilters.push(filter);
}
});
@@ -195,8 +193,8 @@
ds += 'DT gt \'' + lfvm.toISOString() + '\'';
break;
default:
- var lfm = new Date(currentDate.getTime() - (15 * 60 * 1000));
- ds += 'DT gt \'' + lfm.toISOString() + '\'';
+ var lfm2 = new Date(currentDate.getTime() - (15 * 60 * 1000));
+ ds += 'DT gt \'' + lfm2.toISOString() + '\'';
break;
}
@@ -224,7 +222,7 @@
self.renderGaugeChart();
//reset datepicker
- $("#timePeriodDropdown option:eq(0)").prop("selected", true);
+ $('#timePeriodDropdown option:eq(0)').prop('selected', true);
//reset filters
$('.subfilterSubnav').addClass('hide');
@@ -246,16 +244,16 @@
} else{
//gauge time period
- self.queryRequest['timespan'] = self.selectedTimePeriod();
+ self.queryRequest.timespan = self.selectedTimePeriod();
//gauge filters
- self.queryRequest['selectedFilters'] = self.selectedFilters();
+ self.queryRequest.selectedFilters = self.selectedFilters();
if(self.selectedFilters().length > 0){
self.filtersSelected(true);
- };
+ }
//gauge subfilters
- self.queryRequest['selectedSubFilters'] =
self.selectedSubFilters().sort();
+ self.queryRequest.selectedSubFilters =
self.selectedSubFilters().sort();
//put it all into a real query
//this will be a function call - TODO: make parsing function
@@ -278,14 +276,14 @@
['failure', self.gaugeValue()]
],
type: 'gauge',
- onclick: function (d, i) { console.log("onclick", d, i); },
//TODO: make these better
- onmouseover: function (d, i) { console.log("onmouseover", d,
i); },
- onmouseout: function (d, i) { console.log("onmouseout", d,
i); }
+ onclick: function (d, i) { console.log('onclick', d, i); },
//TODO: make these better
+ onmouseover: function (d, i) { console.log('onmouseover', d,
i); },
+ onmouseout: function (d, i) { console.log('onmouseout', d,
i); }
},
gauge: {
min: 0,
max: 100,
- units: 'failure rate',
+ units: 'failure rate'
},
color: {
pattern: ['#FF0000', '#F97600', '#F6C600', '#60B044'], //
the three color levels for the percentage values.
diff --git a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
index bf9ebd7..9d29382 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
@@ -18,13 +18,13 @@
return;
}
self.hourlyChart = function(d,i){
- var hourlyData = params.dayObj[d['x'] + 1 ],
+ var hourlyData = params.dayObj[d.x + 1 ],
hourlyCountArray = ['Hourly Count'],
hourlyTotalArray = ['Hourly Total'];
- for(var i=1; i<25; i++){
-
hourlyCountArray.push(hourlyData[i]['count']);
-
hourlyTotalArray.push(hourlyData[i]['total']);
- };
+ for(var j=1; j<25; j++){
+
hourlyCountArray.push(hourlyData[j].count);
+
hourlyTotalArray.push(hourlyData[j].total);
+ }
return {
bindto: '#totalsEarnedChart',
size: {
@@ -36,7 +36,7 @@
columns: [ hourlyTotalArray,
hourlyCountArray ],
type: 'bar',
colors: { 'Hourly Total':
'rgb(92,184,92)', 'Hourly Count': '#f0ad4e' },
- onclick: function (d, i) {
c3.generate(self.dailyChart()) },
+ onclick: function (d, i) {
c3.generate(self.dailyChart()); },
axes: {
'Hourly Total': 'y',
'Hourly Count': 'y2'
@@ -53,7 +53,7 @@
axis: {
x: {
label: {
- text: 'December
' + ( d['x'] + 1 ),
+ text: 'December
' + ( d.x + 1 ),
position:
'outer-left'
},
tick: {
@@ -62,12 +62,12 @@
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('$0,0') }
+ format:
function(x){ return numeral(x).format('$0,0'); }
}
},
y2: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('0,0'); }
},
show: true
}
@@ -78,9 +78,9 @@
value: function (value, ratio, id) {
var display;
if(id === 'Hourly Total'){
- display =
numeral(value).format('$0,0')
+ display =
numeral(value).format('$0,0');
} else {
- display =
numeral(value).format('0,0')
+ display =
numeral(value).format('0,0');
}
return display;
}
@@ -125,17 +125,17 @@
axis: {
x: {
tick: {
- format:
function(x){ return "Dec " + (x+1) }
+ format:
function(x){ return 'Dec ' + (x+1); }
}
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('$0,0') }
+ format:
function(x){ return numeral(x).format('$0,0'); }
}
},
y2: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('0,0'); }
},
show: true
}
@@ -146,9 +146,9 @@
value: function (value, ratio, id) {
var display;
if(id === 'Daily Total'){
- display =
numeral(value).format('$0,0')
+ display =
numeral(value).format('$0,0');
} else {
- display =
numeral(value).format('0,0')
+ display =
numeral(value).format('0,0');
}
return display;
}
--
To view, visit https://gerrit.wikimedia.org/r/180100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ece354062b0a84012c3a84e926051489e1208e8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
