[gnome-maps/wip/mattiasb/eslint-2.0: 2/2] Lint: Fix leaking vars in case stmts



commit ff6d9108da565a87edbc62ec4adc9400a9eacc2e
Author: Mattias Bengtsson <mattias jc bengtsson gmail com>
Date:   Fri Feb 5 01:00:50 2016 +0100

    Lint: Fix leaking vars in case stmts
    
    The ESLint recommended settings disallows declaring new variables with
    let and const in case-statements. This is because a case statement
    doesn't produce a new scope, which might be confusing and be a source of
    bugs.
    
    When there is need to use variables inside a switch-statement it is just
    as easy to declare it outside or wrap the case-clause inside {}'s.

 src/mainWindow.js   |    4 ++--
 src/placeBubble.js  |    3 ++-
 src/translations.js |    6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/mainWindow.js b/src/mainWindow.js
index a59536a..8db219e 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -355,11 +355,11 @@ const MainWindow = new Lang.Class({
             Application.notificationManager.showMessage(message);
             break;
 
-        case Geoclue.State.OFF:
+        case Geoclue.State.OFF: {
             let notification = this._getLocationServiceNotification();
             Application.notificationManager.showNotification(notification);
             break;
-
+        }
         default:
             this._mapView.gotoUserLocation(true);
             break;
diff --git a/src/placeBubble.js b/src/placeBubble.js
index d4d41db..06dd900 100644
--- a/src/placeBubble.js
+++ b/src/placeBubble.js
@@ -177,7 +177,7 @@ const PlaceBubble = new Lang.Class({
         let response = osmEdit.showEditDialog(this.get_toplevel(), this._place);
 
         switch (response) {
-        case OSMEditDialog.Response.UPLOADED:
+        case OSMEditDialog.Response.UPLOADED: {
             // update place
             let object = osmEdit.object;
             OSMUtils.updatePlaceFromOSMObject(this._place, object);
@@ -185,6 +185,7 @@ const PlaceBubble = new Lang.Class({
             this._clearView();
             this._populate(this._place);
             break;
+        }
         default:
             break;
         }
diff --git a/src/translations.js b/src/translations.js
index 551a1a0..345a69d 100644
--- a/src/translations.js
+++ b/src/translations.js
@@ -189,7 +189,7 @@ function _translateOpeningHoursDayInterval(string) {
     switch (splitString.length) {
     case 1:
         return _translateOpeningHoursDay(splitString[0].trim());
-    case 2:
+    case 2: {
         let from = splitString[0].trim();
         let to = splitString[1].trim();
 
@@ -199,6 +199,7 @@ function _translateOpeningHoursDayInterval(string) {
         return C_("day range", "%s-%s").format(
             _translateOpeningHoursDay(from),
             _translateOpeningHoursDay(to));
+    }
     default:
         // unknown format, just return the input
         return string;
@@ -237,7 +238,7 @@ function _translateOpeningHoursTimeIntervalList(string) {
     switch (splitString.length) {
     case 1:
         return _translateOpeningHoursTimeInterval(splitString[0].trim());
-    case 2:
+    case 2: {
         let interval1 = splitString[0].trim();
         let interval2 = splitString[1].trim();
 
@@ -252,6 +253,7 @@ function _translateOpeningHoursTimeIntervalList(string) {
         return C_("time interval list", "%s, %s").format(
             _translateOpeningHoursTimeInterval(interval1),
             _translateOpeningHoursTimeInterval(interval2));
+    }
     default:
         // for other number of components, just return the input
         return string;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]