Finished refactoring withing eslint rules. Switched on eslint in webpack config.

Author: anton-lunev

.eslintrc

@@ -34,7 +34,6 @@
     "no-empty": 2,
     "no-empty-pattern": 2,
     "no-eq-null": 2,
-    "no-eval": 2,
     "no-extend-native": 2,
     "no-fallthrough": 2,
     "no-floating-decimal": 2,
@@ -65,7 +64,6 @@
     "no-shadow-restricted-names": 2,
     "no-shadow": 2,
     "no-undef": [2, { "typeof": true }],
-    "no-undefined": 2,
     "no-use-before-define": [2, "nofunc"],
     "no-path-concat": 2,
     "brace-style": 2,

src/app/common/db/db.service.js

@@ -9,19 +9,11 @@ const deps = [
 export default angular.module('db', deps)
     .factory('dbService', function CollectionService($q, Loki) {
         'ngInject';
-        
+
         let _db;
-        let _collections;
+        let _collections = {};
         initDB();
 
-        return {
-            getCollections,
-            getCollection,
-            addCollection,
-            updateCollection,
-            deleteCollection
-        };
-
         /**
          * Init database
          */
@@ -33,60 +25,62 @@ export default angular.module('db', deps)
             });
         }
 
-        /**
-         * Returned all collections
-         * @returns {*}
-         */
-        function getCollections() {
-            return $q((resolve, reject) => {
-                let options = {
-                    collections: {
-                        proto: Object
-                    }
-                };
+        return {
+            /**
+             * Returned all collections
+             * @returns {*} promise
+             */
+            getCollections() {
+                return $q(resolve => {
+                    const options = {
+                        collections: {
+                            proto: Object
+                        }
+                    };
 
-                _db.loadDatabase(options, () => {
-                    _collections = _db.getCollection('collections');
+                    _db.loadDatabase(options, () => {
+                        _collections = _db.getCollection('collections');
 
-                    if (!_collections) {
-                        _collections = _db.addCollection('collections', {autoupdate: true});
-                    }
+                        if (!_collections) {
+                            _collections = _db.addCollection('collections', {autoupdate: true});
+                        }
 
-                    resolve(_collections.data);
+                        resolve(_collections.data);
+                    });
                 });
-            });
-        }
+            },
 
-        /**
-         * Returned collection by id
-         * @param {int} id
-         * @returns {*}
-         */
-        function getCollection(id) {
-            return _collections.get(id);
-        }
+            /**
+             * Returned collection by id
+             * @param {int} id Collection id
+             * @returns {object} Collection object
+             */
+            getCollection(id) {
+                return _collections.get(id);
+            },
 
-        /**
-         * Add new collection
-         * @param {object} collection
-         */
-        function addCollection(collection) {
-            _collections.insert(collection);
-        }
+            /**
+             * Add new collection
+             * @param {object} collection New collection
+             */
+            addCollection(collection) {
+                _collections.insert(collection);
+            },
 
-        /**
-         * Update collection data
-         * @param {object} collection
-         */
-        function updateCollection(collection) {
-            _collections.update(collection);
-        }
+            /**
+             * Update collection data
+             * @param {object} collection Collection object
+             */
+            updateCollection(collection) {
+                _collections.update(collection);
+            },
 
-        /**
-         * Delete collection
-         * @param {object} collection
-         */
-        function deleteCollection(collection) {
-            _collections.remove(collection);
-        }
+            /**
+             * Delete collection
+             * @param {object} collection Collection object
+             */
+            deleteCollection(collection) {
+                _collections.remove(collection);
+            }
+        };
     });

src/app/common/google-translate/google-translate.service.js

@@ -8,61 +8,59 @@ export default angular.module('googleTranslate', [])
         target: 'ru'
     })
 
-    .factory('googleTranslateService', function ($http, $timeout, googleTranslateConfig) {
+    .factory('googleTranslateService', function googleTranslateService($http, $timeout, googleTranslateConfig) {
         'ngInject';
-        
+
         return {
-            playAudio,
-            getTranslation
-        };
+            /**
+             * Play audio with word
+             * @param {string} word Word for playing
+             * @param {int} timeout Delay time
+             */
+            playAudio(word, timeout = 0) {
+                const audioUrl = `${googleTranslateConfig.domain}/translate_tts?client=gtx&tl=en&q=${decodeURI(word)}`;
+                const audio = new Audio(audioUrl);
+                $timeout(() => {
+                    audio.play();
+                }, timeout);
+            },
 
-        /**
-         * Play audio with word
-         * @param {string} word
-         * @param {int} timeout
-         */
-        function playAudio(word, timeout = 0) {
-            let audio = new Audio(`${googleTranslateConfig.domain}/translate_tts?client=gtx&tl=en&q=${decodeURI(word)}`);
-            $timeout(() => {
-                audio.play();
-            }, timeout);
-        }
+            /**
+             * Returned translation by query
+             * @param {string} query Word for translation
+             * @returns {*|Promise.<TResult>} Promise
+             */
+            getTranslation(query) {
+                const promise = $http({
+                    method: 'GET',
+                    url: `${googleTranslateConfig.domain}/translate_a/single`,
+                    crossDomain: true,
+                    params: {
+                        client: 'gtx',
+                        sl: googleTranslateConfig.source,
+                        tl: googleTranslateConfig.target,
+                        dt: 't',
+                        q: query
+                    },
+                    transformResponse(res) {
+                        try {
+                            return JSON.parse(res.replace(/,(?=,)/g, ',null'));
+                        } catch (e) {
+                            return eval(res);
+                        }
+                    }
+                });
 
-        /**
-         * Returned translation by query
-         * @param {string} query
-         * @returns {*|Promise.<TResult>}
-         */
-        function getTranslation(query) {
-            let promise = $http({
-                method: 'GET',
-                url: `${googleTranslateConfig.domain}/translate_a/single`,
-                crossDomain: true,
-                params: {
-                    client: 'gtx',
-                    sl: googleTranslateConfig.source,
-                    tl: googleTranslateConfig.target,
-                    dt: 't',
-                    q: query
-                },
-                transformResponse: res => {
+                return promise.then(res => {
+                    console.log(res);
+                    let result = null;
                     try {
-                        return JSON.parse(res.replace(/,(?=,)/g, ',null'));
+                        result = res.data[0][0][0];
                     } catch (e) {
-                        return eval(res);
+                        console.log('Can`t translate word');
                     }
-                }
-            });
-
-            return promise.then(res => {
-                console.log(res);
-                let result = null;
-                try {
-                    result = res.data[0][0][0];
-                } catch (e) {
-                    console.log('Can`t translate word');
-                }
-                return result;
-            });
-        }
+                    return result;
+                });
+            }
+        };
     });

src/app/common/notification/notification.service.js

@@ -2,18 +2,17 @@
 import angular from 'angular';
 
 export default angular.module('notification', [])
-    .factory('notificationService', function () {
+    .factory('notificationService', function notificationService() {
         return {
-            push
+            /**
+             * Show push notification
+             * @param {string} title Notification title
+             * @param {string} body Notification body
+             * @returns {object} Notification object
+             */
+            push(title, body) {
+                return new Notification(title, {body: body});
+            }
         };
-
-        /**
-         * Show push notification
-         * @param {string} title
-         * @param {string} body
-         */
-        function push(title, body) {
-            return new Notification(title, {body: body});
-        }
     });