Skip to content

Commit 792b84b

Browse files
ar2rsawseenar2rsawseen
authored
Merge pull request #671 from Cookiezaurs/guidelines-frontend-countly
guidelines fixes: countly.event.js, countly.location.js, countly.map.helper.js, countly.session.js, countly.task.manager.js, countly.token.manager.js
2 parents f054c59 + bc274cf commit 792b84b

File tree

6 files changed

+116
-100
lines changed

6 files changed

+116
-100
lines changed

‎frontend/express/public/javascripts/countly/countly.event.js

+52-54
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*global countlyCommon, countlyGlobal, _*/
12
(function(countlyEvent, $, undefined) {
23

34
//Private Properties
@@ -11,12 +12,11 @@
1112
_activeAppKey = 0,
1213
_initialized = false,
1314
_period = null;
14-
_overviewList = [];
1515
var _activeLoadedEvent = "";
1616
var _activeLoadedSegmentation = "";
1717

1818
countlyEvent.hasLoadedData = function() {
19-
if (_activeLoadedEvent && _activeLoadedEvent == _activeEvent && _activeLoadedSegmentation == _activeSegmentation) {
19+
if (_activeLoadedEvent && _activeLoadedEvent === _activeEvent && _activeLoadedSegmentation === _activeSegmentation) {
2020
return true;
2121
}
2222
return false;
@@ -25,7 +25,7 @@
2525
//Public Methods
2626
countlyEvent.initialize = function(forceReload) {
2727

28-
if (!forceReload && _initialized && _period == countlyCommon.getPeriodForAjax() && _activeAppKey == countlyCommon.ACTIVE_APP_KEY) {
28+
if (!forceReload && _initialized && _period === countlyCommon.getPeriodForAjax() && _activeAppKey === countlyCommon.ACTIVE_APP_KEY) {
2929
return countlyEvent.refresh();
3030
}
3131
if (forceReload && countlyEvent.hasLoadedData()) {
@@ -75,7 +75,7 @@
7575
},
7676
dataType: "jsonp",
7777
success: function(json) {
78-
if (currentActiveEvent == _activeEvent && currentActiveSegmentation == _activeSegmentation) {
78+
if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
7979
_activeLoadedEvent = _activeEvent;
8080
_activeLoadedSegmentation = _activeSegmentation;
8181
_activeEventDb = json;
@@ -108,9 +108,9 @@
108108
var _overviewData = [];
109109

110110
if (_activeEvents.overview) {
111-
for (var i = 0; i < _activeEvents.overview.length; i++) {
112-
if (my_events.indexOf(_activeEvents.overview[i].eventKey) == -1) {
113-
my_events.push(_activeEvents.overview[i].eventKey);
111+
for (var z = 0; z < _activeEvents.overview.length; z++) {
112+
if (my_events.indexOf(_activeEvents.overview[z].eventKey) === -1) {
113+
my_events.push(_activeEvents.overview[z].eventKey);
114114
}
115115
}
116116
}
@@ -178,10 +178,10 @@
178178
"event_overview": event_overview,
179179
"omitted_segments": omitted_segments
180180
},
181-
success: function(result) {
181+
success: function() {
182182
callback(true);
183183
},
184-
error: function(xhr, status, error) {
184+
error: function() {
185185
callback(false);
186186
}
187187
});
@@ -197,10 +197,10 @@
197197
"set_visibility": visibility,
198198
"events": JSON.stringify(my_events)
199199
},
200-
success: function(result) {
200+
success: function() {
201201
callback(true);
202202
},
203-
error: function(xhr, status, error) {
203+
error: function() {
204204
callback(false);
205205
}
206206
});
@@ -216,10 +216,10 @@
216216
"app_id": countlyCommon.ACTIVE_APP_ID,
217217
"events": JSON.stringify(my_events)
218218
},
219-
success: function(result) {
219+
success: function() {
220220
callback(true);
221221
},
222-
error: function(xhr, status, error) {
222+
error: function() {
223223
callback(false);
224224
}
225225
});
@@ -263,7 +263,7 @@
263263
},
264264
dataType: "jsonp",
265265
success: function(json) {
266-
if (currentActiveEvent == _activeEvent && currentActiveSegmentation == _activeSegmentation) {
266+
if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
267267
_activeLoadedEvent = _activeEvent;
268268
_activeLoadedSegmentation = _activeSegmentation;
269269
countlyCommon.extendDbObj(_activeEventDb, json);
@@ -358,7 +358,7 @@
358358
countlyEvent.getEventData = function() {
359359

360360
var eventData = {},
361-
mapKey = _activeEvent.replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e"),
361+
mapKey = _activeEvent.replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e"),
362362
eventMap = (_activeEvents) ? ((_activeEvents.map) ? _activeEvents.map : {}) : {},
363363
countString = (eventMap[mapKey] && eventMap[mapKey].count) ? eventMap[mapKey].count : jQuery.i18n.map["events.table.count"],
364364
sumString = (eventMap[mapKey] && eventMap[mapKey].sum) ? eventMap[mapKey].sum : jQuery.i18n.map["events.table.sum"],
@@ -370,7 +370,7 @@
370370
var tmpEventData = countlyCommon.extractTwoLevelData(_activeEventDb, _activeSegmentationValues, countlyEvent.clearEventsObject, [
371371
{
372372
name: "curr_segment",
373-
func: function(rangeArr, dataObj) {
373+
func: function(rangeArr) {
374374
return rangeArr.replace(/:/g, ".").replace(/\[CLY\]/g, "").replace(/.\/\//g, "://");
375375
}
376376
},
@@ -391,13 +391,13 @@
391391

392392
if (_.reduce(segmentsSum, function(memo, num) {
393393
return memo + num;
394-
}, 0) == 0) {
394+
}, 0) === 0) {
395395
segmentsSum = [];
396396
}
397397

398398
if (_.reduce(segmentsDur, function(memo, num) {
399399
return memo + num;
400-
}, 0) == 0) {
400+
}, 0) === 0) {
401401
segmentsDur = [];
402402
}
403403

@@ -475,11 +475,11 @@
475475
return memo + num;
476476
}, 0);
477477

478-
if (reducedSum != 0 || reducedDur != 0) {
479-
if (reducedSum != 0) {
478+
if (reducedSum !== 0 || reducedDur !== 0) {
479+
if (reducedSum !== 0) {
480480
eventData.tableColumns[eventData.tableColumns.length] = sumString;
481481
}
482-
if (reducedDur != 0) {
482+
if (reducedDur !== 0) {
483483
eventData.tableColumns[eventData.tableColumns.length] = durString;
484484
}
485485
}
@@ -528,7 +528,7 @@
528528
eventsWithoutOrder = [];
529529
for (var i = 0; i < events.length; i++) {
530530
var arrayToUse = eventsWithoutOrder;
531-
var mapKey = events[i].replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e");
531+
var mapKey = events[i].replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e");
532532
if (eventOrder.indexOf(events[i]) !== -1) {
533533
arrayToUse = eventsWithOrder;
534534
}
@@ -549,7 +549,7 @@
549549
"sum": eventMap[mapKey].sum || "",
550550
"dur": eventMap[mapKey].dur || "",
551551
"is_visible": eventMap[mapKey].is_visible,
552-
"is_active": (_activeEvent == events[i]),
552+
"is_active": (_activeEvent === events[i]),
553553
"segments": eventSegments[mapKey] || [],
554554
"omittedSegments": _activeEvents.omitted_segments[mapKey] || []
555555
});
@@ -564,7 +564,7 @@
564564
"sum": "",
565565
"dur": "",
566566
"is_visible": true,
567-
"is_active": (_activeEvent == events[i]),
567+
"is_active": (_activeEvent === events[i]),
568568
"segments": eventSegments[mapKey] || [],
569569
"omittedSegments": _activeEvents.omitted_segments[mapKey] || []
570570
});
@@ -587,7 +587,7 @@
587587
eventNames = [];
588588

589589
for (var event in eventSegmentations) {
590-
var mapKey = event.replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e");
590+
var mapKey = event.replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e");
591591
if (eventMap[mapKey] && eventMap[mapKey].name) {
592592
eventNames.push({
593593
"key": event,
@@ -633,7 +633,7 @@
633633

634634
countlyEvent.getEventLongName = function(eventKey) {
635635
var eventMap = (_activeEvents) ? ((_activeEvents.map) ? _activeEvents.map : {}) : {};
636-
var mapKey = eventKey.replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e");
636+
var mapKey = eventKey.replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e");
637637
if (eventMap[mapKey] && eventMap[mapKey].name) {
638638
return eventMap[mapKey].name;
639639
}
@@ -667,7 +667,7 @@
667667

668668
countlyEvent.getEventSummary = function() {
669669
//Update the current period object in case selected date is changed
670-
_periodObj = countlyCommon.periodObj;
670+
var _periodObj = countlyCommon.periodObj;
671671

672672
var dataArr = {},
673673
tmp_x,
@@ -678,7 +678,13 @@
678678
previousSum = 0,
679679
currentDur = 0,
680680
previousDur = 0;
681-
681+
var segment = "";
682+
var tmpCurrCount = 0,
683+
tmpCurrSum = 0,
684+
tmpCurrDur = 0,
685+
tmpPrevCount = 0,
686+
tmpPrevSum = 0,
687+
tmpPrevDur = 0;
682688
if (_periodObj.isSpecialPeriod) {
683689
for (var i = 0; i < (_periodObj.currentPeriodArr.length); i++) {
684690
tmp_x = countlyCommon.getDescendantProp(_activeEventDb, _periodObj.currentPeriodArr[i]);
@@ -687,13 +693,8 @@
687693
tmp_y = countlyEvent.clearEventsObject(tmp_y);
688694

689695
if (_activeSegmentation) {
690-
var tmpCurrCount = 0,
691-
tmpCurrSum = 0,
692-
tmpCurrDur = 0,
693-
tmpPrevCount = 0,
694-
tmpPrevSum = 0,
695-
tmpPrevDur = 0;
696-
for (var segment in tmp_x) {
696+
697+
for (segment in tmp_x) {
697698
tmpCurrCount += tmp_x[segment].c || 0;
698699
tmpCurrSum += tmp_x[segment].s || 0;
699700
tmpCurrDur += tmp_x[segment].dur || 0;
@@ -733,13 +734,7 @@
733734
tmp_y = countlyEvent.clearEventsObject(tmp_y);
734735

735736
if (_activeSegmentation) {
736-
var tmpCurrCount = 0,
737-
tmpCurrSum = 0,
738-
tmpCurrDur = 0,
739-
tmpPrevCount = 0,
740-
tmpPrevSum = 0,
741-
tmpPrevDur = 0;
742-
for (var segment in tmp_x) {
737+
for (segment in tmp_x) {
743738
tmpCurrCount += tmp_x[segment].c || 0;
744739
tmpCurrSum += tmp_x[segment].s || 0;
745740
tmpCurrDur += tmp_x[segment].dur || 0;
@@ -798,7 +793,7 @@
798793
};
799794

800795
var eventMap = (_activeEvents) ? ((_activeEvents.map) ? _activeEvents.map : {}) : {},
801-
mapKey = _activeEvent.replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e"),
796+
mapKey = _activeEvent.replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e"),
802797
countString = (eventMap[mapKey] && eventMap[mapKey].count) ? eventMap[mapKey].count.toUpperCase() : jQuery.i18n.map["events.count"],
803798
sumString = (eventMap[mapKey] && eventMap[mapKey].sum) ? eventMap[mapKey].sum.toUpperCase() : jQuery.i18n.map["events.sum"],
804799
durString = (eventMap[mapKey] && eventMap[mapKey].dur) ? eventMap[mapKey].dur.toUpperCase() : jQuery.i18n.map["events.dur"];
@@ -815,7 +810,7 @@
815810
]
816811
};
817812

818-
if (currentSum != 0 && currentDur == 0) {
813+
if (currentSum !== 0 && currentDur === 0) {
819814
bigNumbers.class = "two-column";
820815
bigNumbers.items[bigNumbers.items.length] = {
821816
"title": sumString,
@@ -824,7 +819,7 @@
824819
"trend": dataArr.usage["event-sum"].trend
825820
};
826821
}
827-
else if (currentSum == 0 && currentDur != 0) {
822+
else if (currentSum === 0 && currentDur !== 0) {
828823
bigNumbers.class = "two-column";
829824
bigNumbers.items[bigNumbers.items.length] = {
830825
"title": durString,
@@ -833,7 +828,7 @@
833828
"trend": dataArr.usage["event-dur"].trend
834829
};
835830
}
836-
else if (currentSum != 0 && currentDur != 0) {
831+
else if (currentSum !== 0 && currentDur !== 0) {
837832
bigNumbers.class = "threes-column";
838833
bigNumbers.items[bigNumbers.items.length] = {
839834
"title": sumString,
@@ -868,11 +863,14 @@
868863
}
869864
});
870865

871-
866+
/** function extracts data for graph and chart
867+
* @param {object} dataFromDb - extracted data from db
868+
* @returns {object} graph and chart data
869+
*/
872870
function extractDataForGraphAndChart(dataFromDb) {
873871
var eventData = {},
874872
eventMap = (_activeEvents) ? ((_activeEvents.map) ? _activeEvents.map : {}) : {},
875-
mapKey = _activeEvent.replace("\\", "\\\\").replace("\$", "\\u0024").replace(".", "\\u002e"),
873+
mapKey = _activeEvent.replace("\\", "\\\\").replace("$", "\\u0024").replace(".", "\\u002e"),
876874
countString = (eventMap[mapKey] && eventMap[mapKey].count) ? eventMap[mapKey].count : jQuery.i18n.map["events.table.count"],
877875
sumString = (eventMap[mapKey] && eventMap[mapKey].sum) ? eventMap[mapKey].sum : jQuery.i18n.map["events.table.sum"],
878876
durString = (eventMap[mapKey] && eventMap[mapKey].dur) ? eventMap[mapKey].dur : jQuery.i18n.map["events.table.dur"];
@@ -904,11 +902,11 @@
904902
return memo + num;
905903
}, 0);
906904

907-
if (reducedSum != 0 || reducedDur != 0) {
908-
if (reducedSum != 0) {
905+
if (reducedSum !== 0 || reducedDur !== 0) {
906+
if (reducedSum !== 0) {
909907
eventData.tableColumns[eventData.tableColumns.length] = sumString;
910908
}
911-
if (reducedDur != 0) {
909+
if (reducedDur !== 0) {
912910
eventData.tableColumns[eventData.tableColumns.length] = durString;
913911
}
914912
}
@@ -947,7 +945,7 @@
947945
return eventData;
948946
}
949947
};
950-
948+
/** function set meta */
951949
function setMeta() {
952950
_activeSegmentationObj = _activeEventDb.meta || {};
953951
_activeSegmentations = _activeSegmentationObj.segments || [];
@@ -956,10 +954,10 @@
956954
}
957955
_activeSegmentationValues = (_activeSegmentationObj[_activeSegmentation]) ? _activeSegmentationObj[_activeSegmentation] : [];
958956
}
959-
957+
/** function extend meta */
960958
function extendMeta() {
961959
for (var metaObj in _activeEventDb.meta) {
962-
if (_activeSegmentationObj[metaObj] && _activeEventDb.meta[metaObj] && _activeSegmentationObj[metaObj].length != _activeEventDb.meta[metaObj].length) {
960+
if (_activeSegmentationObj[metaObj] && _activeEventDb.meta[metaObj] && _activeSegmentationObj[metaObj].length !== _activeEventDb.meta[metaObj].length) {
963961
_activeSegmentationObj[metaObj] = countlyCommon.union(_activeSegmentationObj[metaObj], _activeEventDb.meta[metaObj]);
964962
}
965963
}

0 commit comments

Comments
 (0)