Merge pull request #669 from Cookiezaurs/guidelines-frontend-countly

Guidelines frontend countly

Author: ar2rsawseen

bin/scripts/device_list/generate.js

@@ -19,5 +19,5 @@ csv()
         }
     })
     .on('done', ()=>{
-        console.log("/**\n * Object with device models as keys and pretty/marketing device names as values\n * @name countlyDeviceList\n * @global\n * @namespace countlyDeviceList\n */\ncountlyDeviceList = " + JSON.stringify(devices) + ";\nif( typeof module !== 'undefined' && module.exports ) {\n    exports = module.exports = countlyDeviceList\n}");
+        console.log("/**\n * Object with device models as keys and pretty/marketing device names as values\n * @name countlyDeviceList\n * @global\n * @namespace countlyDeviceList\n */\nwindow.countlyDeviceList = " + JSON.stringify(devices) + ";\nif( typeof module !== 'undefined' && module.exports ) {\n    exports = module.exports = window.countlyDeviceList\n}");
     });

frontend/express/public/javascripts/countly/countly.common.js

@@ -1,3 +1,4 @@
+/*global CommonConstructor, countlyGlobal */
 (function(CommonConstructor) {
     var countlyCommon = CommonConstructor.prototype;
     /**

frontend/express/public/javascripts/countly/countly.config.sample.js

@@ -1,3 +1,4 @@
+/*global CountlyHelpers, countlyDeviceDetails, countlyAppVersion, countlyCommon, _*/
 (function() {
 
     window.countlyDeviceDetails = window.countlyDeviceDetails || {};
@@ -65,7 +66,7 @@
         var chartData = countlyCommon.extractTwoLevelData(countlyDeviceDetails.getDb(), countlyDeviceDetails.getMeta("os"), countlyDeviceDetails.clearObject, [
             {
                 name: "os_",
-                func: function(rangeArr, dataObj) {
+                func: function(rangeArr) {
                     if (countlyDeviceDetails.os_mapping[rangeArr.toLowerCase()]) {
                         return countlyDeviceDetails.os_mapping[rangeArr.toLowerCase()].name;
                     }
@@ -74,7 +75,7 @@
             },
             {
                 name: "origos_",
-                func: function(rangeArr, dataObj) {
+                func: function(rangeArr) {
                     return rangeArr;
                 }
             },
@@ -87,12 +88,11 @@
             platformTotal = _.pluck(chartData.chartData, 'u'),
             chartData2 = [];
 
-        var sum = _.reduce(platformTotal, function(memo, num) {
+        /*var sum = _.reduce(platformTotal, function(memo, num) {
             return memo + num;
-        }, 0);
+        }, 0);*/
 
         for (var i = 0; i < platformNames.length; i++) {
-            var percent = (platformTotal[i] / sum) * 100;
             chartData2[i] = {
                 data: [
                     [0, platformTotal[i]]
@@ -111,19 +111,19 @@
         var chartData = countlyCommon.extractTwoLevelData(countlyDeviceDetails.getDb(), countlyDeviceDetails.getMeta("resolutions"), countlyDeviceDetails.clearObject, [
             {
                 name: "resolution",
-                func: function(rangeArr, dataObj) {
+                func: function(rangeArr) {
                     return rangeArr;
                 }
             },
             {
                 name: "width",
-                func: function(rangeArr, dataObj) {
+                func: function(rangeArr) {
                     return "<a>" + rangeArr.split("x")[0] + "</a>";
                 }
             },
             {
                 name: "height",
-                func: function(rangeArr, dataObj) {
+                func: function(rangeArr) {
                     return "<a>" + rangeArr.split("x")[1] + "</a>";
                 }
             },
@@ -138,12 +138,12 @@
             chartData2 = [],
             chartData3 = [];
 
-        var sum = _.reduce(resolutionTotal, function(memo, num) {
+        /*var sum = _.reduce(resolutionTotal, function(memo, num) {
             return memo + num;
-        }, 0);
-
-        for (var i = 0; i < resolutions.length; i++) {
-            var percent = (resolutionTotal[i] / sum) * 100;
+        }, 0);*/
+        var i=0;
+        for (i = 0; i < resolutions.length; i++) {
+            //var percent = (resolutionTotal[i] / sum) * 100;
             chartData2[i] = {
                 data: [
                     [0, resolutionTotal[i]]
@@ -152,12 +152,12 @@
             };
         }
 
-        var sum2 = _.reduce(resolutionNew, function(memo, num) {
+        /*var sum2 = _.reduce(resolutionNew, function(memo, num) {
             return memo + num;
-        }, 0);
+        }, 0);*/
 
-        for (var i = 0; i < resolutions.length; i++) {
-            var percent = (resolutionNew[i] / sum) * 100;
+        for (i = 0; i < resolutions.length; i++) {
+            //var percent = (resolutionNew[i] / sum) * 100;
             chartData3[i] = {
                 data: [
                     [0, resolutionNew[i]]

frontend/express/public/javascripts/countly/countly.device.detail.js

@@ -1,6 +1,11 @@
+/*global CountlyHelpers, countlyDeviceList */
 (function() {
+    /** Function gets full device name
+    * @param {string} shortName  - short device name
+    * @returns{string} full device name
+    */
     function getDeviceFullName(shortName) {
-        if (shortName == "Unknown") {
+        if (shortName === "Unknown") {
             return jQuery.i18n.map["common.unknown"];
         }
         if (countlyDeviceList && countlyDeviceList[shortName]) {

frontend/express/public/javascripts/countly/countly.device.js

@@ -69,7 +69,6 @@ function check_name_list(filepath, myname, mandatory) {
 * @return {Promise} returns promise 
 */
 function check_package_file(my_path) {
-    console.log(my_path);
     return new Promise(function(resolve, reject) {
         if (!fs.existsSync(my_path + '/package.json')) {
             return reject(Error('package_missing'));