Merge pull request #550 from tsmgeek/optimise-ifs

Minor optimisations

6 files changed, 161 insertions, 72 deletions

diff --git a/.gitignore b/.gitignore
index 026bb534..c0913c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .settings
 .DS_Store
 nbproject/
+web/app.min.js
+sencha-error-*
diff --git a/web/.eslintignore b/web/.eslintignore
new file mode 100644
index 00000000..3e0fc5c5
--- /dev/null
+++ b/web/.eslintignore
@@ -0,0 +1 @@
+simple/app.js
\ No newline at end of file
diff --git a/web/.eslintrc.json b/web/.eslintrc.json
new file mode 100644
index 00000000..03de8088
--- /dev/null
+++ b/web/.eslintrc.json
@@ -0,0 +1,89 @@
+{

+    "extends": "crockford",

+    "env": {

+        "browser": true,

+        "node": true

+    },

+      

+    // Custom Globals

+    "globals"       : {

+        "Ext"       : false,

+        "ol"        : false,

+        "Traccar"   : false,

+        "Strings"   : false,

+        "Locale"    : false,

+        "proj4"     : false

+    },

+

+    "rules": {

+        "indent": ["error", 4, 

+            {

+                "SwitchCase":1

+            }

+        ],

+        "comma-spacing": [2,

+            {

+                "after": true

+            }

+        ],

+        "no-bitwise": 0,

+        "camelcase": 2,

+        "curly": 2,

+        "eqeqeq": 2,

+        "guard-for-in": 2,

+        "no-extend-native": 2,

+        "wrap-iife": [

+                2,

+          "any"

+        ],

+        "no-use-before-define": [

+            2,

+            {

+                "functions": false

+            }

+        ],

+        "new-cap": 2,

+        "no-caller": 2,

+        "no-empty": 2,

+        "no-irregular-whitespace": 2,

+        "no-new": 2,

+        "no-plusplus": 0,

+        "quotes": [

+            2,

+            "single"

+        ],

+        "no-undef": 2,

+        "no-unused-vars": 2,

+        "strict": 0,

+        "max-params": 0,

+        "max-depth": 0,

+        "max-statements": 0,

+        "complexity": 0,

+        "max-len": 0,

+        "no-var": 0,

+        "semi": 0,

+        "no-cond-assign": 0,

+        "no-debugger": 0,

+        "no-eq-null": 0,

+        "no-eval": 0,

+        "no-unused-expressions": 0,

+        "block-scoped-var": 0,

+        "no-iterator": 0,

+        "linebreak-style": 0,

+        "comma-style": [

+            2,

+            "last"

+        ],

+        "no-loop-func": 0,

+        "no-multi-str": 0,

+        "require-yield": 0,

+        "valid-typeof": 0,

+        "no-proto": 0,

+        "no-script-url": 0,

+        "no-shadow": 2,

+        "dot-notation": 0,

+        "no-new-func": 0,

+        "no-new-wrappers": 0,

+        "no-invalid-this": 0

+    }

+}
\ No newline at end of file
diff --git a/web/.jscsrc b/web/.jscsrc
index 546e6a58..c20bcf08 100644
--- a/web/.jscsrc
+++ b/web/.jscsrc
@@ -2,5 +2,6 @@
     "preset": "crockford",
     "maxErrors": 100,
     "excludeFiles": ["simple/app.js"],
-    "requireDotNotation": false
+    "requireDotNotation": false,
+    "requireSpaceAfterComma": true
 }
diff --git a/web/app/view/dialog/CommandController.js b/web/app/view/dialog/CommandController.js
index 8c566da4..485d994d 100644
--- a/web/app/view/dialog/CommandController.js
+++ b/web/app/view/dialog/CommandController.js
@@ -43,66 +43,60 @@ Ext.define('Traccar.view.dialog.CommandController', {
         form.updateRecord();
         record = form.getRecord();
 
-        if (record.get('type') === 'positionPeriodic') {
-            attributes = this.lookupReference('paramPositionPeriodic');
-            value = attributes.down('numberfield[name="frequency"]').getValue();
-            value *= attributes.down('combobox[name="unit"]').getValue();
-
-            record.set('attributes', {
-                frequency: value
-            });
-        }
-
-        if (record.get('type') === 'outputControl') {
-            attributes = this.lookupReference('paramOutputControl');
-            index = attributes.down('numberfield[name="index"]').getValue();
-            value = attributes.down('textfield[name="data"]').getValue();
-
-            record.set('attributes', {
-                index: index,
-                data: value
-            });
-        }
-
-        if (record.get('type') === 'sendUssd') {
-            attributes = this.lookupReference('paramSendSmsUssd');
-            phone = attributes.down('textfield[name="phone"]').getValue();
-            record.set('attributes', {
-                phone: phone
-            });
-        }
-
-        if (record.get('type') === 'sendSms') {
-            attributes = this.lookupReference('paramSendSmsUssd');
-            phone = attributes.down('textfield[name="phone"]').getValue();
-            value = attributes.down('textfield[name="message"]').getValue();
-            record.set('attributes', {
-                phone: phone,
-                message: value
-            });
-        }
-
-        if (record.get('type') === 'setTimezone') {
-            attributes = this.lookupReference('paramSetTimezone');
-            value = attributes.down('numberfield[name="timezone"]').getValue();
-            record.set('attributes', {
-                timezone: value * 3600
-            });
-        }
-
-        if (record.get('type') === 'setIndicator') {
-            attributes = this.lookupReference('paramSetIndicator');
-            value = attributes.down('numberfield[name="data"]').getValue();
-            record.set('attributes', {
-                data: value
-            });
-        }
-
-        if (record.get('type') === 'custom') {
-            value = this.lookupReference('paramCustom').getValue();
-            record.set('attributes', {
-                data: value
-            });
+        switch (record.get('type')) {
+            case 'positionPeriodic':
+                attributes = this.lookupReference('paramPositionPeriodic');
+                value = attributes.down('numberfield[name="frequency"]').getValue();
+                value *= attributes.down('combobox[name="unit"]').getValue();
+                record.set('attributes', {
+                    frequency: value
+                });
+                break;
+            case 'outputControl':
+                attributes = this.lookupReference('paramOutputControl');
+                index = attributes.down('numberfield[name="index"]').getValue();
+                value = attributes.down('textfield[name="data"]').getValue();
+                record.set('attributes', {
+                    index: index,
+                    data: value
+                });
+                break;
+            case 'sendUssd':
+                attributes = this.lookupReference('paramSendSmsUssd');
+                phone = attributes.down('textfield[name="phone"]').getValue();
+                record.set('attributes', {
+                    phone: phone
+                });
+                break;
+            case 'sendSms':
+                attributes = this.lookupReference('paramSendSmsUssd');
+                phone = attributes.down('textfield[name="phone"]').getValue();
+                value = attributes.down('textfield[name="message"]').getValue();
+                record.set('attributes', {
+                    phone: phone,
+                    message: value
+                });
+                break;
+            case 'setTimezone':
+                attributes = this.lookupReference('paramSetTimezone');
+                value = attributes.down('numberfield[name="timezone"]').getValue();
+                record.set('attributes', {
+                    timezone: value * 3600
+                });
+                break;
+            case 'setIndicator':
+                attributes = this.lookupReference('paramSetIndicator');
+                value = attributes.down('numberfield[name="data"]').getValue();
+                record.set('attributes', {
+                    data: value
+                });
+                break;
+            case 'custom':
+                value = this.lookupReference('paramCustom').getValue();
+                record.set('attributes', {
+                    data: value
+                });
+                break;
         }
 
         Ext.Ajax.request({
diff --git a/web/app/view/dialog/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js
index 7233562b..ce66371b 100644
--- a/web/app/view/dialog/ReportConfigController.js
+++ b/web/app/view/dialog/ReportConfigController.js
@@ -26,23 +26,25 @@ Ext.define('Traccar.view.dialog.ReportConfigController', {
     ],
 
     onSaveClick: function (button) {
-        var eventType;
-        this.getView().callingPanel.deviceId = this.lookupReference('deviceField').getValue();
-        this.getView().callingPanel.groupId = this.lookupReference('groupField').getValue();
+        var eventType, callingPanel;
+        callingPanel = this.getView().callingPanel;
+
+        callingPanel.deviceId = this.lookupReference('deviceField').getValue();
+        callingPanel.groupId = this.lookupReference('groupField').getValue();
         eventType = this.lookupReference('eventTypeField').getValue();
         if (eventType.indexOf(Traccar.store.ReportEventTypes.allEvents) > -1) {
             eventType = [Traccar.store.ReportEventTypes.allEvents];
         } else if (eventType.length === this.lookupReference('eventTypeField').getStore().getCount() - 1) {
             eventType = [Traccar.store.ReportEventTypes.allEvents];
         }
-        this.getView().callingPanel.eventType = eventType;
-        this.getView().callingPanel.chartType = this.lookupReference('chartTypeField').getValue();
-        this.getView().callingPanel.showMarkers = this.lookupReference('showMarkersField').getValue();
-        this.getView().callingPanel.fromDate = this.lookupReference('fromDateField').getValue();
-        this.getView().callingPanel.fromTime = this.lookupReference('fromTimeField').getValue();
-        this.getView().callingPanel.toDate = this.lookupReference('toDateField').getValue();
-        this.getView().callingPanel.toTime = this.lookupReference('toTimeField').getValue();
-        this.getView().callingPanel.updateButtons();
+        callingPanel.eventType = eventType;
+        callingPanel.chartType = this.lookupReference('chartTypeField').getValue();
+        callingPanel.showMarkers = this.lookupReference('showMarkersField').getValue();
+        callingPanel.fromDate = this.lookupReference('fromDateField').getValue();
+        callingPanel.fromTime = this.lookupReference('fromTimeField').getValue();
+        callingPanel.toDate = this.lookupReference('toDateField').getValue();
+        callingPanel.toTime = this.lookupReference('toTimeField').getValue();
+        callingPanel.updateButtons();
         button.up('window').close();
     }
 });