adjust UI to new text styles

With the new text styles, some UI needs to adjusted, primarily to accommodate larger heading text.
theme: Standardise text styles
2019-06-27 13:52:40 +01:00 · 2019-06-27 13:51:14 +01:00 · 2019-06-27 13:51:14 +01:00
131 changed files with 2218 additions and 2229 deletions
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -99,6 +99,7 @@
      </description>
    </key>
    <child name="keybindings" schema="org.gnome.shell.keybindings"/>
+    <child name="keyboard" schema="org.gnome.shell.keyboard"/>
  </schema>

  <schema id="org.gnome.shell.keybindings" path="/org/gnome/shell/keybindings/"
@@ -182,6 +183,17 @@
    </key>
  </schema>

+  <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="keyboard-type" type="s">
+      <default>'touch'</default>
+      <summary>Which keyboard to use</summary>
+      <description>
+        The type of keyboard to use.
+      </description>
+    </key>
+  </schema>
+
  <schema id="org.gnome.shell.app-switcher"
          path="/org/gnome/shell/app-switcher/"
          gettext-domain="@GETTEXT_PACKAGE@">
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -25,10 +25,8 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";

 /* GLOBALS */

-
-$modal_radius: 9px;
-$button_radius: 5px;
-$panel-corner-radius: $button_radius + 1;
+$panel-corner-radius: 6px;
+$medium_radius: 9px;

 $_trough_color: transparentize($fg_color, 0.9);
 $_bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
@@ -48,7 +46,7 @@ stage {

 /* Buttons */
 .button, %button {
-  border-radius: $button_radius;
+  border-radius: 5px;
  border-width: 1px;
  min-height: 22px;
  padding: 4px 32px;
@@ -70,21 +68,21 @@ stage {
  border-top: 1px solid $_bubble_borders_color;

  &:first-child {
-    border-radius: 0px 0px 0px $modal_radius;
+    border-radius: 0px 0px 0px $medium_radius;
  }
  &:last-child {
    border-right-width: 0px;
-    border-radius: 0px 0px $modal_radius 0px;
+    border-radius: 0px 0px $medium_radius 0px;
  }
  &:first-child:last-child {
    border-right-width: 0px;
-    border-radius: 0px 0px $modal_radius $modal_radius;
+    border-radius: 0px 0px $medium_radius $medium_radius;
  }
 }

 /* Entries */
 StEntry {
-  border-radius: $button_radius;
+  border-radius: 5px;
  padding: 4px;
  border-width: 1px;
  color: $fg_color;
@@ -189,12 +187,12 @@ StScrollBar {

 /* Modal Dialogs */

-.headline { font-size: 110%; }
+.headline { @extend %heading; }
 .lightbox { background-color: black; }
 .flashspot { background-color: white; }

 .modal-dialog {
-  border-radius: $modal_radius;
+  border-radius: 9px;
  @extend %bubble-panel;
  .modal-dialog-content-box {
    padding: 24px;
@@ -206,8 +204,7 @@ StScrollBar {
  }
  .run-dialog-button-box { padding-top: 1em; }
  .run-dialog-label {
-    @include fontsize($font-size + 1.1);
-    font-weight: normal;
+    @extend %title-4;
    color: $fg_color;
    padding-bottom: .4em;
  }
@@ -215,8 +212,8 @@ StScrollBar {
 }

  .mount-dialog-subject,
-  .end-session-dialog-subject { //this should be a generic header class
-    @include fontsize($font-size * 1.3);
+  .end-session-dialog-subject {
+    @extend %title-2;
  }

 /* Message Dialog */
@@ -236,12 +233,12 @@ StScrollBar {
  }

  .message-dialog-title {
-    font-weight: bold;
+    @extend %title-2;
  }

  .message-dialog-subtitle {
+    @extend %heading;
    color: $fg_color;
-    font-weight: bold;
  }

 /* End Session Dialog */
@@ -255,6 +252,7 @@ StScrollBar {
  }

  .end-session-dialog-layout {
+    spacing: 12px;
    padding-left: 17px;
    &:rtl { padding-right: 17px; }
  }
@@ -302,7 +300,7 @@ StScrollBar {
  }

  .end-session-dialog-list-header {
-    font-weight: bold;
+    @extend %heading;
    &:rtl { text-align: right; }
  }

@@ -313,12 +311,11 @@ StScrollBar {

  .end-session-dialog-app-list-item-name,
  .end-session-dialog-session-list-item-name {
-    font-weight: bold;
+    @extend %heading;
  }

  .end-session-dialog-app-list-item-description {
    color: darken($fg_color,5%);
-    font-size: 10pt;
  }

 /* ShellMountOperation Dialogs */
@@ -374,11 +371,6 @@ StScrollBar {
    &:rtl { padding-left: 17px; }
  }

-  .mount-dialog-app-list-item-name {
-    font-size: 10pt;
-  }
-
-
 /* Password or Authentication Dialog */

 .prompt-dialog {
@@ -388,7 +380,7 @@ StScrollBar {

  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
  .message-dialog-content { spacing: 16px; }
-  .message-dialog-title { color: lighten($fg_color,15%); }
+  .message-dialog-title { @extend %title-2; color: lighten($fg_color,15%); }
 }

  .prompt-dialog-description:rtl {
@@ -401,13 +393,11 @@ StScrollBar {
  }

  .prompt-dialog-error-label {
-    font-size: 10pt;
    color: $warning_color;
    padding-bottom: 8px;
  }

  .prompt-dialog-info-label {
-    font-size: 10pt;
    padding-bottom: 8px;
  }

@@ -416,7 +406,6 @@ StScrollBar {
  }

  .prompt-dialog-null-label {
-    font-size: 10pt;
    padding-bottom: 8px;
  }

@@ -472,7 +461,7 @@ StScrollBar {
  }

  .audio-selection-title {
-    font-weight: bold;
+    @extend %title-2;
    text-align: center;
  }

@@ -515,7 +504,7 @@ StScrollBar {
 .extension-dialog {
  @extend %bubble-panel;
  .message-dialog-main-layout { spacing: 24px; padding: 10px; }
-  .message-dialog-title { font-weight: normal; color: $fg_color; }
+  .message-dialog-title { @extend %title-2; }
 }

 /* Inhibit-Shortcuts Dialog */
@@ -556,9 +545,9 @@ StScrollBar {
    &:ltr { padding: .4em 1.75em .4em 0em; }
    &:rtl { padding: .4em 0em .4em 1.75em; }
    &:checked {
+      @extend %heading;
      background-color: $bg_color;
      box-shadow: inset 0 -1px 0px $_bubble_borders_color;
-      font-weight: bold;
    }
    &.selected {
      background-color: transparentize(white, if($variant=='light', 0.2, 0.9));
@@ -591,7 +580,7 @@ StScrollBar {
  }
  .popup-menu-boxpointer,
  .candidate-popup-boxpointer {
-    -arrow-border-radius: $button_radius+4;
+    -arrow-border-radius: $medium_radius;
    -arrow-background-color: $bg_color;
    -arrow-border-width: 1px;
    -arrow-border-color: if($variant=='light', transparentize(black, 0.6), $borders_color);
@@ -629,7 +618,7 @@ StScrollBar {
  min-width: 64px;
  min-height: 64px;

-  .osd-monitor-label { font-size: 3em; }
+  .osd-monitor-label { @extend %title-1; }
  .level {
    height: 0.6em;
    -barlevel-height: 0.6em;
@@ -802,8 +791,8 @@ StScrollBar {
 /* TOP BAR */

 #panel {
+  @extend %heading;
  background-color: black;
-  font-weight: bold;
  height: 1.86em;
  font-feature-settings: "tnum";

@@ -835,9 +824,9 @@ StScrollBar {
  }

  .panel-button {
+    @extend %heading;
    -natural-hpadding: 12px;
    -minimum-hpadding: 6px;
-    font-weight: bold;
    color: #ccc;

    .app-menu-icon {
@@ -934,28 +923,28 @@ StScrollBar {
    }

    .datemenu-today-button .day-label {
+      @extend %heading;
    }

    .datemenu-today-button .date-label {
-      font-size: 1.5em;
-      font-weight: 300;
+      @extend %large-title;
    }

    .world-clocks-header,
    .weather-header,
-    .events-section-title {
+    .events-section-title,
+    .calendar-month-label {
+      @extend %heading;
      color: darken($fg_color,40%);
-      font-weight: bold;
    }

    .weather-header.location {
-      font-weight: normal;
-      font-size: 0.9em;
+      @extend %caption;
    }

    .world-clocks-grid,
    .weather-grid {
-      spacing-rows: 0.4em;
+      spacing-rows: 0.8em;
      spacing-columns: 0.8em;
    }

@@ -963,35 +952,26 @@ StScrollBar {
      spacing: 0.4em;
    }

-    .world-clocks-city {
-      font-weight: bold;
-      font-size: 0.9em;
-    }
-
    .world-clocks-time {
-      color: darken($fg_color,20%);
        font-feature-settings: "tnum";
-      font-size: 1.2em;
    }

    .world-clocks-timezone {
-      color: $fg_color;
+      color: darken($fg_color,40%);
      font-feature-settings: "tnum";
-      font-size: 0.9em;
+      @extend %caption;
    }

    .weather-forecast-icon {
-      icon-size: 2.18em;
+      icon-size: 32px;
    }

    .weather-forecast-time {
+      @extend %caption;
      color: darken($fg_color,40%);
-      font-size: 0.8em;
    }

    .calendar-month-label {
-      color: lighten($fg_color,5%);
-      font-weight: bold;
      padding: 8px 0;
      &:focus {}
    }
@@ -1009,7 +989,7 @@ StScrollBar {
      }

    .calendar-day-base {
-      font-size: 80%;
+      @extend %caption;
      text-align: center;
      width: 2.4em; height: 2.4em;
      padding: 0.1em;
@@ -1023,9 +1003,8 @@ StScrollBar {
        border-color: transparent; //avoid jumparound due to today
      }
      &.calendar-day-heading {  //day of week heading
-        color: lighten($fg_color,5%);
-        margin-top: 1em;
-        font-size: 70%;
+        color: darken($fg_color,40%);
+//        margin-top: 1em;
      }
    }
      .calendar-day { //border collapse hack - see calendar.js
@@ -1040,14 +1019,15 @@ StScrollBar {
        color: $insensitive_fg_color;
      }
      .calendar-today {
-        font-weight: bold;
+        @extend %caption-heading;
        //color: lighten($fg_color,10%);
        //background-color: darken($bg_color,5%);
        border: 1px solid $_bubble_borders_color;
      }
      .calendar-day-with-events {
+        @extend %caption-heading;
        color: lighten($fg_color,10%);
-        font-weight: bold;
+
        background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
      }
      .calendar-other-month-day {
@@ -1055,8 +1035,7 @@ StScrollBar {
        opacity: 0.5;
      }
      .calendar-week-number {
-        font-size: 70%;
-        font-weight: bold;
+        @extend %caption-heading;
        width: 2.3em; height: 1.8em;
        border-radius: 2px;
        padding: 0.5em 0 0;
@@ -1113,11 +1092,11 @@ StScrollBar {
          }

          .message-secondary-bin > .event-time {
-            color: $fg_color;
-            font-size: 0.7em;
+            @extend %caption;
+            color: darken($fg_color,40%);
            /* HACK: the label should be baseline-aligned with a 1em label,
                     fake this with some bottom padding */
-            padding-bottom: 0.13em;
+           padding-bottom: 1px;
          }

          .message-secondary-bin > StIcon {
@@ -1157,6 +1136,11 @@ StScrollBar {

  // a little unstructured mess:

+  .system-switch-user-submenu-icon {
+    icon-size: 16px;
+    padding: 0 4px;
+  }
+
  #appMenu {
    spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg");
    spacing: 4px;
@@ -1280,17 +1264,16 @@ StScrollBar {
  .nm-dialog-airplane-box { spacing: 12px; }

  .nm-dialog-airplane-headline {
-    font-weight: bold;
+    @extend %heading;
    text-align: center;
  }

  .nm-dialog-airplane-text { color: $fg_color; }
  .nm-dialog-header-icon { icon-size: 32px; }
  .nm-dialog-scroll-view { border: 2px solid $borders_color; }
-  .nm-dialog-header { font-weight: bold; }
+  .nm-dialog-header { @extend %title-2; }

  .nm-dialog-item {
-    font-size: 110%;
    border-bottom: 1px solid $borders_color;
    padding: 12px;
    spacing: 20px;
@@ -1397,7 +1380,7 @@ StScrollBar {

  #dash {
    @extend %overview-panel;
-    font-size: 9pt;
+    @extend %caption;
    padding: 4px 0;
    border-radius: 0px 9px 9px 0px;

@@ -1520,7 +1503,7 @@ StScrollBar {

  %icon_tile {
    color: $osd_fg_color;
-    border-radius: $button_radius+4;
+    border-radius: $medium_radius;
    padding: 6px;
    border: 1px solid transparent;
    transition-duration: 100ms;
@@ -1612,9 +1595,9 @@ StScrollBar {
  border: none;
 }

+// Search status, like "Searching..." and "No results"
 %status_text {
-  font-size: 2em;
-  font-weight: bold;
+  @extend %large-title;
  color: $osd_fg_color;
 }

@@ -1623,18 +1606,22 @@ StScrollBar {
  .url-highlighter { link-color: lighten($selected_bg_color,10%); }

  // Banners
+  .message-body {
+    @extend %caption;
+    padding-top: 2px;
+  }
+
  .notification-banner {
-    font-size: 11pt;
    width: 34em;
    margin: 5px;
-    border-radius: $modal_radius;
+    border-radius: $medium-radius;
    border: if($variant == 'light', none, $_bubble_borders_color);
    min-height: 64px;
    box-shadow: 0 1px 2px transparentize(black, 0.7);
    &:hover { background: $bg_color; }
    &, &:focus, &:active {
      background-color: $bg_color;
-      .message-title { color: $fg_color }
+      .message-title { color: $fg_color; }
      .message-content { color: $fg_color; }
    }

@@ -1661,20 +1648,6 @@ StScrollBar {
      border: none;
    }
  }
-  .summary-source-counter {
-    font-size: 10pt;
-    font-weight: bold;
-    height: 1.6em; width: 1.6em;
-    -shell-counter-overlap-x: 3px;
-    -shell-counter-overlap-y: 3px;
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    border: 2px solid $fg_color;
-    box-shadow: 0 2px 2px rgba(0,0,0,0.5);
-    border-radius: 0.9em; // should be 0.8 but whatever; wish I could do 50%;
-  }
-
-  .secondary-icon { icon-size: 1.09em; }

  //chat bubbles
  .chat-body { spacing: 5px; }
@@ -1691,9 +1664,8 @@ StScrollBar {
    &:rtl { padding-left: 0; padding-right: 18pt; }
  }
  .chat-meta-message {
+    @extend %caption-heading;
    padding-left: 4px;
-    font-size: 9pt;
-    font-weight: bold;
    color: lighten($fg_color,18%);
    &:rtl { padding-left: 0; padding-right: 4px; }
  }
@@ -1779,36 +1751,30 @@ StScrollBar {
  }

  .keyboard-key {
-    $_key_bg: opacify(lighten($osd_bg_color, 9%), 1);
-    background-color: $_key_bg;
+    background-color: #393f3f;
    min-height: 1.2em;
    min-width: 1.2em;
    font-size: 16pt;
-    border-radius: $button_radius;
-    border: 1px solid $osd_outer_borders_color;
-    color: $osd_fg_color;
+    border-radius: 3px;
+    border: 1px solid #464d4d;
+    color: #e5e5e5;
    &:focus { @include button(focus); }
-    &:hover, &:checked { background-color: lighten($_key_bg, 3%); }
-    &:active { background-color: darken($_key_bg, 2%); }
+    &:hover,&:checked { @include button(hover); }
+    &:active { @include button(active);}
    &:grayed { //FIXME
      background-color: $osd_bg_color;
      color: $osd_fg_color;
      border-color: $osd_borders_color;
    }
    &.default-key {
-      $_default_key_bg: opacify($osd_bg_color, 1);
-      border-color: $osd_outer_borders_color;
-      background-color: $_default_key_bg;
+      border-color: #2d3232;
+      background-color: #1d2020;
      background-size: 20px;
-      &:hover, &:checked { background-color: lighten($_default_key_bg, 3%); }
-      &:active { background-color: darken($_default_key_bg, 2%); }
    }
    &.enter-key {
-      border-color: lighten($selected_bg_color, 5%);
-      background-color: $selected_bg_color;
+      border-color: #005684;
+      background-color: #006098;
      background-image: url("resource:///org/gnome/shell/theme/key-enter.svg");
-      &:hover, &:checked { background-color: lighten($selected_bg_color, 3%); }
-      &:active { background-color: darken($selected_bg_color, 2%); }
    }
    &.shift-key-lowercase {
      background-image: url("resource:///org/gnome/shell/theme/key-shift.svg");
@@ -1847,8 +1813,8 @@ StScrollBar {

 .emoji-panel {
  .keyboard-key:latched {
-    border-color: lighten($selected_bg_color, 5%);
-    background-color: $selected_bg_color;
+    border-color: #005684;
+    background-color: #006098;
  }
 }

@@ -1912,7 +1878,7 @@ StScrollBar {

  StEntry {
    @extend %search_entry;
-    border-radius: $button_radius;
+    border-radius: 5px;
    @if $variant=='dark' {
      $_gdm_entry_bg: transparentize(lighten(desaturate(#241f31, 20%), 2%), 0.5);
      background-color: $_gdm_entry_bg;
@@ -1985,8 +1951,7 @@ StScrollBar {
    }
  }
  .login-dialog-not-listed-label {
-    font-size: 90%;
-    font-weight: bold;
+    @extend %heading;
    color: darken($osd_fg_color,30%);
    padding-top: 1em;
  }
@@ -2015,8 +1980,7 @@ StScrollBar {
  .login-dialog-username,
  .user-widget-label {
    color: $osd_fg_color;
-    font-size: 120%;
-    font-weight: bold;
+    @extend %title-3;
    text-align: left;
    padding-left: 15px;
  }
@@ -2034,7 +1998,6 @@ StScrollBar {

  .login-dialog-prompt-label {
      color: darken($osd_fg_color, 20%);
-      font-size: 110%;
      padding-top: 1em;
  }

@@ -2106,7 +2069,7 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);


 .screen-shield-notification-label {
-  font-weight: bold;
+  @extend %heading;
  padding: 0px 0px 0px 12px;
 }

@@ -2146,9 +2109,9 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
  }
  .labels { spacing: 4px; }
  .notebook-tab {
+    @extend %heading;
    -natural-hpadding: 12px;
    -minimum-hpadding: 6px;
-    font-weight: bold;
    color: #ccc;
    transition-duration: 100ms;
    padding-left: .3em;
@@ -2209,7 +2172,7 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
  }

  .lg-extension-name {
-      font-weight: bold;
+      @extend %heading;
  }

  .lg-extension-meta {
@@ -2222,3 +2185,39 @@ $_screenshield_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
    border-radius: 4px;
    padding: 6px;
  }
+
+// text styles
+
+%large-title {
+  font-weight: 300;
+  font-size: 24pt;
+// letter-spacing: 0.2rem; this breaks the style
+}
+%title-1 {
+  font-weight: 800;
+  font-size: 20pt;
+}
+%title-2 {
+  font-weight: 800;
+  font-size: 15pt;
+}
+%title-3 {
+  font-weight: 700;
+  font-size: 15pt;
+}
+%title-4 {
+  font-weight: 700;
+  font-size: 13pt;
+}
+%heading {
+  font-weight: 700;
+  font-size: 11pt;
+}
+%caption-heading {
+  font-weight: 700;
+  font-size: 9pt;
+}
+%caption {
+  font-weight: 400;
+  font-size: 9pt;
+}
--- a/js/extensionPrefs/main.js
+++ b/js/extensionPrefs/main.js
@@ -168,20 +168,13 @@ var Application = class {

        copyButton.connect('clicked', w => {
            let clipboard = Gtk.Clipboard.get_default(w.get_display());
+            let backticks = '```';
+            clipboard.set_text(
                // markdown for pasting in gitlab issues
-            let lines = [
-                `The settings of extension ${extension.uuid} had an error:`,
-                '```',
-                `${exc}`,
-                '```',
-                '',
-                'Stack trace:',
-                '```',
-                exc.stack.replace(/\n$/, ''), // stack without trailing newline
-                '```',
-                ''
-            ];
-            clipboard.set_text(lines.join('\n'), -1);
+                `The settings of extension ${extension.uuid} had an error:\n${
+                backticks}\n${exc}\n${backticks}\n\nStack trace:\n${
+                backticks}\n${exc.stack}${backticks}\n`, -1
+            );
        });

        let spacing = new Gtk.SeparatorToolItem({ draw: false });
@@ -589,12 +582,12 @@ class ExtensionRow extends Gtk.ListBoxRow {

    _isEnabled() {
        let extensions = this._settings.get_strv('enabled-extensions');
-        return extensions.includes(this.uuid);
+        return extensions.indexOf(this.uuid) != -1;
    }

    _enable() {
        let extensions = this._settings.get_strv('enabled-extensions');
-        if (extensions.includes(this.uuid))
+        if (extensions.indexOf(this.uuid) != -1)
            return;

        extensions.push(this.uuid);
@@ -618,12 +611,12 @@ function initEnvironment() {
    // Monkey-patch in a "global" object that fakes some Shell utilities
    // that ExtensionUtils depends on.
    window.global = {
-        log(...args) {
-            print(args.join(', '));
+        log() {
+            print([].join.call(arguments, ', '));
        },

        logError(s) {
-            log(`ERROR: ${s}`);
+            log('ERROR: ' + s);
        },

        userdatadir: GLib.build_filenamev([GLib.get_user_data_dir(), 'gnome-shell'])
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -138,7 +138,7 @@ var AuthPrompt = class {
                                            reactive: true,
                                            can_focus: true,
                                            label: _("Cancel") });
-        this.cancelButton.connect('clicked', () => this.cancel());
+        this.cancelButton.connect('clicked', () => { this.cancel(); });
        this._buttonBox.add(this.cancelButton,
                            { expand: false,
                              x_fill: false,
@@ -157,7 +157,7 @@ var AuthPrompt = class {
                                          reactive: true,
                                          can_focus: true,
                                          label: _("Next") });
-        this.nextButton.connect('clicked', () => this.emit('next'));
+        this.nextButton.connect('clicked', () => { this.emit('next'); });
        this.nextButton.add_style_pseudo_class('default');
        this._buttonBox.add(this.nextButton,
                            { expand: false,
@@ -295,7 +295,8 @@ var AuthPrompt = class {
                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
                                   transition: 'linear',
-                                   onComplete: () => {
+                                   onCompleteScope: this,
+                                   onComplete() {
                                      if (wasSpinner) {
                                          if (this._spinner)
                                              this._spinner.stop();
--- a/js/gdm/batch.js
+++ b/js/gdm/batch.js
@@ -44,7 +44,6 @@
 * replaced by something else.
 */

-const { GObject } = imports.gi;
 const Signals = imports.signals;

 var Task = class {
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -24,7 +24,7 @@ function FprintManager() {
    try {
        self.init(null);
    } catch(e) {
-        log(`Failed to connect to Fprint service: ${e.message}`);
+        log('Failed to connect to Fprint service: ' + e.message);
        return null;
    }

--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -187,6 +187,8 @@ var UserList = class {
    }

    updateStyle(isExpanded) {
+        let tasks = [];
+
        if (isExpanded)
            this._box.add_style_pseudo_class('expanded');
        else
@@ -259,7 +261,7 @@ var UserList = class {
        item.connect('activate', this._onItemActivated.bind(this));

        // Try to keep the focused item front-and-center
-        item.actor.connect('key-focus-in', () => this.scrollToItem(item));
+        item.actor.connect('key-focus-in', () => { this.scrollToItem(item); });

        this._moveFocusToItems();

@@ -327,7 +329,7 @@ var SessionMenuButton = class {
                                                       { actionMode: Shell.ActionMode.NONE });
        this._manager.addMenu(this._menu);

-        this._button.connect('clicked', () => this._menu.toggle());
+        this._button.connect('clicked', () => { this._menu.toggle(); });

        this._items = {};
        this._activeSessionId = null;
@@ -401,18 +403,18 @@ var LoginDialog = GObject.registerClass({
        this.connect('destroy', this._onDestroy.bind(this));
        parentActor.add_child(this);

-        this._userManager = AccountsService.UserManager.get_default();
+        this._userManager = AccountsService.UserManager.get_default()
        this._gdmClient = new Gdm.Client();

        this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA });

-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_KEY,
                               this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.BANNER_MESSAGE_TEXT_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.BANNER_MESSAGE_TEXT_KEY,
                               this._updateBanner.bind(this));
-        this._settings.connect(`changed::${GdmUtil.DISABLE_USER_LIST_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.DISABLE_USER_LIST_KEY,
                               this._updateDisableUserList.bind(this));
-        this._settings.connect(`changed::${GdmUtil.LOGO_KEY}`,
+        this._settings.connect('changed::' + GdmUtil.LOGO_KEY,
                               this._updateLogo.bind(this));

        this._textureCache = St.TextureCache.get_default();
@@ -573,15 +575,19 @@ var LoginDialog = GObject.registerClass({
        // First find out what space the children require
        let bannerAllocation = null;
        let bannerHeight = 0;
+        let bannerWidth = 0;
        if (this._bannerView.visible) {
            bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);
            bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;
+            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;
        }

        let authPromptAllocation = null;
+        let authPromptHeight = 0;
        let authPromptWidth = 0;
        if (this._authPrompt.actor.visible) {
            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);
+            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;
            authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;
        }

@@ -913,7 +919,7 @@ var LoginDialog = GObject.registerClass({
                         { opacity: 255,
                           time: _FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
-                           onUpdate: () => {
+                           onUpdate() {
                               let children = Main.layoutManager.uiGroup.get_children();

                               for (let i = 0; i < children.length; i++) {
@@ -921,10 +927,12 @@ var LoginDialog = GObject.registerClass({
                                       children[i].opacity = this.opacity;
                               }
                           },
-                           onComplete: () => {
+                           onUpdateScope: this,
+                           onComplete() {
                               if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
                                   this._authPrompt.reset();
-                           } });
+                           },
+                           onCompleteScope: this });
    }

    _gotGreeterSessionProxy(proxy) {
@@ -941,7 +949,7 @@ var LoginDialog = GObject.registerClass({
                         { opacity: 0,
                           time: _FADE_ANIMATION_TIME,
                           transition: 'easeOutQuad',
-                           onUpdate: () => {
+                           onUpdate() {
                               let children = Main.layoutManager.uiGroup.get_children();

                               for (let i = 0; i < children.length; i++) {
@@ -949,13 +957,15 @@ var LoginDialog = GObject.registerClass({
                                       children[i].opacity = this.opacity;
                               }
                           },
-                           onComplete: () => {
+                           onUpdateScope: this,
+                           onComplete() {
                               this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
-                           } });
+                           },
+                           onCompleteScope: this });
    }

    _onSessionOpened(client, serviceName) {
-        this._authPrompt.finish(() => this._startSession(serviceName));
+        this._authPrompt.finish(() => { this._startSession(serviceName); });
    }

    _waitForItemForUser(userName) {
@@ -973,7 +983,7 @@ var LoginDialog = GObject.registerClass({
                    hold.release();
            });

-        hold.connect('release', () => this._userList.disconnect(signalId));
+        hold.connect('release', () => { this._userList.disconnect(signalId); });

        return hold;
    }
@@ -1037,7 +1047,6 @@ var LoginDialog = GObject.registerClass({
                             return this._blockTimedLoginUntilIdle();
                         } else {
                             animationTime = delay;
-                             return null;
                         }
                     },

--- a/js/gdm/realmd.js
+++ b/js/gdm/realmd.js
@@ -19,7 +19,7 @@ var Manager = class {
        this._aggregateProvider = Provider(Gio.DBus.system,
                                           'org.freedesktop.realmd',
                                           '/org/freedesktop/realmd',
-                                           this._reloadRealms.bind(this));
+                                           this._reloadRealms.bind(this))
        this._realms = {};

        this._signalId = this._aggregateProvider.connect('g-properties-changed',
@@ -36,7 +36,7 @@ var Manager = class {
            return;

        for (let i = 0; i < realmPaths.length; i++) {
-            Realm(Gio.DBus.system,
+            let realm = Realm(Gio.DBus.system,
                              'org.freedesktop.realmd',
                              realmPaths[i],
                              this._onRealmLoaded.bind(this));
@@ -98,10 +98,10 @@ var Manager = class {
        Service(Gio.DBus.system,
                'org.freedesktop.realmd',
                '/org/freedesktop/realmd',
-                service => service.ReleaseRemote());
+                service => { service.ReleaseRemote(); });
        this._aggregateProvider.disconnect(this._signalId);
        this._realms = { };
        this._updateLoginFormat();
    }
 };
-Signals.addSignalMethods(Manager.prototype);
+Signals.addSignalMethods(Manager.prototype)
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -30,7 +30,7 @@ var LOGO_KEY = 'logo';
 var DISABLE_USER_LIST_KEY = 'disable-user-list';

 // Give user 48ms to read each character of a PAM message
-var USER_READ_TIME = 48;
+var USER_READ_TIME = 48

 var MessageType = {
    NONE: 0,
@@ -423,7 +423,10 @@ var ShellUserVerifier = class {
    _startService(serviceName) {
        this._hold.acquire();
        if (this._userName) {
-            this._userVerifier.call_begin_verification_for_user(serviceName, this._userName, this._cancellable, (obj, result) => {
+           this._userVerifier.call_begin_verification_for_user(serviceName,
+                                                               this._userName,
+                                                               this._cancellable,
+                                                               (obj, result) => {
               try {
                   obj.call_begin_verification_for_user_finish(result);
               } catch(e) {
@@ -436,7 +439,9 @@ var ShellUserVerifier = class {
               this._hold.release();
           });
        } else {
-            this._userVerifier.call_begin_verification(serviceName, this._cancellable, (obj, result) => {
+           this._userVerifier.call_begin_verification(serviceName,
+                                                      this._cancellable,
+                                                      (obj, result) => {
               try {
                   obj.call_begin_verification_finish(result);
               } catch(e) {
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -31,7 +31,7 @@ function getCurrentExtension() {
    // Search for an occurrence of an extension stack frame
    // Start at 1 because 0 is the stack frame of this function
    for (let i = 1; i < stack.length; i++) {
-        if (stack[i].includes('/gnome-shell/extensions/')) {
+        if (stack[i].indexOf('/gnome-shell/extensions/') > -1) {
            extensionStackLine = stack[i];
            break;
        }
@@ -162,6 +162,8 @@ function isOutOfDate(extension) {
 }

 function createExtensionObject(uuid, dir, type) {
+    let info;
+
    let metadataFile = dir.get_child('metadata.json');
    if (!metadataFile.query_exists(null)) {
        throw new Error('Missing metadata.json');
@@ -173,25 +175,25 @@ function createExtensionObject(uuid, dir, type) {
        if (metadataContents instanceof Uint8Array)
            metadataContents = imports.byteArray.toString(metadataContents);
    } catch (e) {
-        throw new Error(`Failed to load metadata.json: ${e}`);
+        throw new Error('Failed to load metadata.json: ' + e);
    }
    let meta;
    try {
        meta = JSON.parse(metadataContents);
    } catch (e) {
-        throw new Error(`Failed to parse metadata.json: ${e}`);
+        throw new Error('Failed to parse metadata.json: ' + e);
    }

    let requiredProperties = ['uuid', 'name', 'description', 'shell-version'];
    for (let i = 0; i < requiredProperties.length; i++) {
        let prop = requiredProperties[i];
        if (!meta[prop]) {
-            throw new Error(`missing "${prop}" property in metadata.json`);
+            throw new Error('missing "' + prop + '" property in metadata.json');
        }
    }

    if (uuid != meta.uuid) {
-        throw new Error(`uuid "${meta.uuid}" from metadata.json does not match directory name "${uuid}"`);
+        throw new Error('uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + uuid + '"');
    }

    let extension = {};
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -36,7 +36,7 @@ function recursivelyDeleteDir(dir, deleteParent) {
    let children = dir.enumerate_children('standard::name,standard::type',
                                          Gio.FileQueryInfoFlags.NONE, null);

-    let info;
+    let info, child;
    while ((info = children.next_file(null)) != null) {
        let type = info.get_file_type();
        let child = dir.get_child(info.get_name());
@@ -57,7 +57,7 @@ function recursivelyMoveDir(srcDir, destDir) {
    if (!destDir.query_exists(null))
        destDir.make_directory_with_parents(null);

-    let info;
+    let info, child;
    while ((info = children.next_file(null)) != null) {
        let type = info.get_file_type();
        let srcChild = srcDir.get_child(info.get_name());
@@ -86,11 +86,11 @@ function loadInterfaceXML(iface) {
    try {
        let [ok, bytes] = f.load_contents(null);
        if (bytes instanceof Uint8Array)
-            xml = imports.byteArray.toString(bytes);
+            xml = imports.byteArray.toString(bytes)
        else
            xml = bytes.toString();
    } catch (e) {
-        log(`Failed to load D-Bus interface ${iface}`);
+        log('Failed to load D-Bus interface ' + iface);
    }

    return xml;
--- a/js/misc/history.js
+++ b/js/misc/history.js
@@ -18,7 +18,7 @@ var HistoryManager = class {
        this._historyIndex = 0;
        if (this._key) {
            this._history = global.settings.get_strv(this._key);
-            global.settings.connect(`changed::${this._key}`,
+            global.settings.connect('changed::' + this._key,
                                    this._historyChanged.bind(this));

        } else {
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -42,7 +42,7 @@ var IBusManager = class {
        this._candidatePopup = new IBusCandidatePopup.CandidatePopup();

        this._panelService = null;
-        this._engines = new Map();
+        this._engines = {};
        this._ready = false;
        this._registerPropertiesId = 0;
        this._currentEngineName = null;
@@ -63,7 +63,7 @@ var IBusManager = class {
            Gio.Subprocess.new(['ibus-daemon', '--xim', '--panel', 'disable'],
                               Gio.SubprocessFlags.NONE);
        } catch(e) {
-            log(`Failed to launch ibus-daemon: ${e.message}`);
+            log('Failed to launch ibus-daemon: ' + e.message);
        }
    }

@@ -73,7 +73,7 @@ var IBusManager = class {

        this._panelService = null;
        this._candidatePopup.setPanelService(null);
-        this._engines.clear();
+        this._engines = {};
        this._ready = false;
        this._registerPropertiesId = 0;
        this._currentEngineName = null;
@@ -96,7 +96,7 @@ var IBusManager = class {
        if (enginesList) {
            for (let i = 0; i < enginesList.length; ++i) {
                let name = enginesList[i].get_name();
-                this._engines.set(name, enginesList[i]);
+                this._engines[name] = enginesList[i];
            }
            this._updateReadiness();
        } else {
@@ -119,7 +119,7 @@ var IBusManager = class {
                if (!GLib.str_has_suffix(path, '/InputContext_1'))
                    this.emit ('focus-in');
            });
-            this._panelService.connect('focus-out', () => this.emit('focus-out'));
+            this._panelService.connect('focus-out', () => { this.emit('focus-out'); });

            try {
                // IBus versions older than 1.5.10 have a bug which
@@ -150,7 +150,8 @@ var IBusManager = class {
    }

    _updateReadiness() {
-        this._ready = this._engines.size > 0 && this._panelService != null;
+        this._ready = (Object.keys(this._engines).length > 0 &&
+                       this._panelService != null);
        this.emit('ready', this._ready);
    }

@@ -188,10 +189,10 @@ var IBusManager = class {
    }

    getEngineDesc(id) {
-        if (!this._ready || !this._engines.has(id))
+        if (!this._ready || !this._engines.hasOwnProperty(id))
            return null;

-        return this._engines.get(id);
+        return this._engines[id];
    }

    setEngine(id, callback) {
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -74,7 +74,7 @@ class InputMethod extends Clutter.InputMethod {
        this._context = null;
        this._hints = 0;
        this._purpose = 0;
-        this._preeditStr = '';
+        this._preeditStr = ''
        this._preeditPos = 0;
        this._preeditVisible = false;
    }
@@ -262,7 +262,7 @@ class InputMethod extends Clutter.InputMethod {
                                                      let retval = context.process_key_event_async_finish(res);
                                                      this.notify_key_event(event, retval);
                                                  } catch (e) {
-                                                      log(`Error processing key on IM: ${e.message}`);
+                                                      log('Error processing key on IM: ' + e.message);
                                                  }
                                              });
        return true;
--- a/js/misc/jsParse.js
+++ b/js/misc/jsParse.js
@@ -51,7 +51,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
 // if we encounter anything that isn't a letter, '.', ')', or ']',
 // we should stop parsing.
 function isStopChar(c) {
-    return !c.match(/[\w.)\]]/);
+    return !c.match(/[\w\.\)\]]/);
 }

 // Given the ending position of a quoted string, find where it starts
@@ -121,7 +121,7 @@ function getExpressionOffset(expr, offset) {
            return offset + 1;
        }

-        if (currChar.match(/[)\]]/)) {
+        if (currChar.match(/[\)\]]/)) {
            offset = findMatchingBrace(expr, offset);
        }

--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -125,7 +125,7 @@ var KeyboardManager = class {

    _getLocaleLayout() {
        let locale = GLib.get_language_names()[0];
-        if (!locale.includes('_'))
+        if (locale.indexOf('_') == -1)
            locale = DEFAULT_LOCALE;

        let [found, , id] = GnomeDesktop.get_input_source_from_locale(locale);
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -26,33 +26,33 @@ function _getMobileProvidersDatabase() {
 }

 // _findProviderForMccMnc:
-// @operatorName: operator name
-// @operatorCode: operator code
+// @operator_name: operator name
+// @operator_code: operator code
 //
 // Given an operator name string (which may not be a real operator name) and an
 // operator code string, tries to find a proper operator name to display.
 //
-function _findProviderForMccMnc(operatorName, operatorCode) {
-    if (operatorName) {
-        if (operatorName.length != 0 &&
-            (operatorName.length > 6 || operatorName.length < 5)) {
+function _findProviderForMccMnc(operator_name, operator_code) {
+    if (operator_name) {
+        if (operator_name.length != 0 &&
+            (operator_name.length > 6 || operator_name.length < 5)) {
            // this looks like a valid name, i.e. not an MCCMNC (that some
            // devices return when not yet connected
-            return operatorName;
+            return operator_name;
        }

-        if (isNaN(parseInt(operatorName))) {
+        if (isNaN(parseInt(operator_name))) {
            // name is definitely not a MCCMNC, so it may be a name
            // after all; return that
-            return operatorName;
+            return operator_name;
        }
    }

    let needle;
-    if ((!operatorName || operatorName.length == 0) && operatorCode)
-        needle = operatorCode;
-    else if (operatorName && (operatorName.length == 6 || operatorName.length == 5))
-        needle = operatorName;
+    if ((!operator_name || operator_name.length == 0) && operator_code)
+        needle = operator_code;
+    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
+        needle = operator_name;
    else // nothing to search
        return null;

@@ -173,7 +173,7 @@ var ModemCdma = class {
            } else {
                let [bandClass, band, sid] = result;

-                this.operator_name = _findProviderForSid(sid);
+                this.operator_name = _findProviderForSid(sid)
            }
            this.emit('notify::operator-name');
        });
@@ -230,17 +230,17 @@ var BroadbandModem = class {
    }

    _reloadOperatorName() {
-        let newName = "";
+        let new_name = "";
        if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
-            newName += this.operator_name_3gpp;
+            new_name += this.operator_name_3gpp;

        if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
-            if (newName != "")
-                newName += ", ";
-            newName += this.operator_name_cdma;
+            if (new_name != "")
+                new_name += ", ";
+            new_name += this.operator_name_cdma;
        }

-        this.operator_name = newName;
+        this.operator_name = new_name;
        this.emit('notify::operator-name');
    }

--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -89,11 +89,14 @@ var ObjectManager = class {
                                       g_interface_info: info,
                                       g_flags: Gio.DBusProxyFlags.DO_NOT_AUTO_START });

-        proxy.init_async(GLib.PRIORITY_DEFAULT, this._cancellable, (initable, result) => {
+        proxy.init_async(GLib.PRIORITY_DEFAULT,
+                         this._cancellable,
+                         (initable, result) => {
+               let error = null;
               try {
                   initable.init_finish(result);
               } catch(e) {
-                logError(e, `could not initialize proxy for interface ${interfaceName}`);
+                   logError(e, 'could not initialize proxy for interface ' + interfaceName);

                   if (onFinished)
                       onFinished();
@@ -152,10 +155,11 @@ var ObjectManager = class {
    }

    _onManagerProxyLoaded(initable, result) {
+        let error = null;
        try {
            initable.init_finish(result);
        } catch(e) {
-            logError(e, `could not initialize object manager for object ${this._serviceName}`);
+            logError(e, 'could not initialize object manager for object ' + this._serviceName);

            this._tryToCompleteLoad();
            return;
@@ -193,7 +197,7 @@ var ObjectManager = class {
        this._managerProxy.GetManagedObjectsRemote((result, error) => {
            if (!result) {
                if (error) {
-                    logError(error, `could not get remote objects for service ${this._serviceName} path ${this._managerPath}`);
+                   logError(error, 'could not get remote objects for service ' + this._serviceName + ' path ' + this._managerPath);
                }

                this._tryToCompleteLoad();
--- a/js/misc/params.js
+++ b/js/misc/params.js
@@ -1,7 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const Lang = imports.lang;
-
 // parse:
 // @params: caller-provided parameter object, or %null
 // @defaults-provided defaults object
@@ -16,14 +14,22 @@ const Lang = imports.lang;
 //
 // Return value: a new object, containing the merged parameters from
 // @params and @defaults
-function parse(params = {}, defaults, allowExtras) {
-    if (!allowExtras) {
-        for (let prop in params)
-            if (!(prop in defaults))
-                throw new Error(`Unrecognized parameter "${prop}"`);
+function parse(params, defaults, allowExtras) {
+    let ret = {}, prop;
+
+    if (!params)
+        params = {};
+
+    for (prop in params) {
+        if (!(prop in defaults) && !allowExtras)
+            throw new Error('Unrecognized parameter "' + prop + '"');
+        ret[prop] = params[prop];
    }

-    let defaultsCopy = {};
-    Lang.copyProperties(defaults, defaultsCopy);
-    return Object.assign(defaultsCopy, params);
+    for (prop in defaults) {
+        if (!(prop in params))
+            ret[prop] = defaults[prop];
+    }
+
+    return ret;
 }
--- a/js/misc/permissionStore.js
+++ b/js/misc/permissionStore.js
@@ -12,4 +12,4 @@ function PermissionStore(initCallback, cancellable) {
                                    'org.freedesktop.impl.portal.PermissionStore',
                                    '/org/freedesktop/impl/portal/PermissionStore',
                                    initCallback, cancellable);
-}
+};
--- a/js/misc/systemActions.js
+++ b/js/misc/systemActions.js
@@ -83,54 +83,48 @@ const SystemActions = GObject.registerClass({
        this._canHaveSuspend = true;

        this._actions = new Map();
-        this._actions.set(POWER_OFF_ACTION_ID, {
-            // Translators: The name of the power-off action in search
+        this._actions.set(POWER_OFF_ACTION_ID,
+                          { // Translators: The name of the power-off action in search
                            name: C_("search-result", "Power Off"),
                            iconName: 'system-shutdown-symbolic',
                            // Translators: A list of keywords that match the power-off action, separated by semicolons
                            keywords: _("power off;shutdown;reboot;restart").split(/[; ]/),
-            available: false
-        });
-        this._actions.set(LOCK_SCREEN_ACTION_ID, {
-            // Translators: The name of the lock screen action in search
+                            available: false });
+        this._actions.set(LOCK_SCREEN_ACTION_ID,
+                          { // Translators: The name of the lock screen action in search
                            name: C_("search-result", "Lock Screen"),
                            iconName: 'system-lock-screen-symbolic',
                            // Translators: A list of keywords that match the lock screen action, separated by semicolons
                            keywords: _("lock screen").split(/[; ]/),
-            available: false
-        });
-        this._actions.set(LOGOUT_ACTION_ID, {
-            // Translators: The name of the logout action in search
+                            available: false });
+        this._actions.set(LOGOUT_ACTION_ID,
+                          { // Translators: The name of the logout action in search
                            name: C_("search-result", "Log Out"),
                            iconName: 'application-exit-symbolic',
                            // Translators: A list of keywords that match the logout action, separated by semicolons
                            keywords: _("logout;log out;sign off").split(/[; ]/),
-            available: false
-        });
-        this._actions.set(SUSPEND_ACTION_ID, {
-            // Translators: The name of the suspend action in search
+                            available: false });
+        this._actions.set(SUSPEND_ACTION_ID,
+                          { // Translators: The name of the suspend action in search
                            name: C_("search-result", "Suspend"),
                            iconName: 'media-playback-pause-symbolic',
                            // Translators: A list of keywords that match the suspend action, separated by semicolons
                            keywords: _("suspend;sleep").split(/[; ]/),
-            available: false
-        });
-        this._actions.set(SWITCH_USER_ACTION_ID, {
-            // Translators: The name of the switch user action in search
+                            available: false });
+        this._actions.set(SWITCH_USER_ACTION_ID,
+                          { // Translators: The name of the switch user action in search
                            name: C_("search-result", "Switch User"),
                            iconName: 'system-switch-user-symbolic',
                            // Translators: A list of keywords that match the switch user action, separated by semicolons
                            keywords: _("switch user").split(/[; ]/),
-            available: false
-        });
-        this._actions.set(LOCK_ORIENTATION_ACTION_ID, {
-            // Translators: The name of the lock orientation action in search
+                            available: false });
+        this._actions.set(LOCK_ORIENTATION_ACTION_ID,
+                          { // Translators: The name of the lock orientation action in search
                            name: C_("search-result", "Lock Orientation"),
                            iconName: '',
                            // Translators: A list of keywords that match the lock orientation action, separated by semicolons
                            keywords: _("lock orientation;screen;rotation").split(/[; ]/),
-            available: false
-        });
+                            available: false });

        this._loginScreenSettings = new Gio.Settings({ schema_id: LOGIN_SCREEN_SCHEMA });
        this._lockdownSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
@@ -143,39 +137,37 @@ const SystemActions = GObject.registerClass({
        this._userManager = AccountsService.UserManager.get_default();

        this._userManager.connect('notify::is-loaded',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
        this._userManager.connect('notify::has-multiple-users',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
        this._userManager.connect('user-added',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });
        this._userManager.connect('user-removed',
-                                  () => this._updateMultiUser());
+                                  () => { this._updateMultiUser(); });

-        this._lockdownSettings.connect(`changed::${DISABLE_USER_SWITCH_KEY}`,
-                                       () => this._updateSwitchUser());
-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
-                                       () => this._updateLogout());
-        global.settings.connect(`changed::${ALWAYS_SHOW_LOG_OUT_KEY}`,
-                                () => this._updateLogout());
+        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
+                                       () => { this._updateSwitchUser(); });
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       () => { this._updateLogout(); });
+        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
+                                () => { this._updateLogout(); });

-        this._lockdownSettings.connect(`changed::${DISABLE_LOCK_SCREEN_KEY}`,
-                                       () => this._updateLockScreen());
+        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
+                                       () => { this._updateLockScreen(); });

-        this._lockdownSettings.connect(`changed::${DISABLE_LOG_OUT_KEY}`,
-                                       () => this._updateHaveShutdown());
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       () => { this._updateHaveShutdown(); });

        this.forceUpdate();

        this._orientationSettings.connect('changed::orientation-lock',
-                                          () => {
-                                              this._updateOrientationLock();
-                                              this._updateOrientationLockIcon();
-                                          });
+                                          () => { this._updateOrientationLock();
+                                                  this._updateOrientationLockIcon(); });
        Main.layoutManager.connect('monitors-changed',
-                                   () => this._updateOrientationLock());
+                                   () => { this._updateOrientationLock(); });
        Gio.DBus.system.watch_name(SENSOR_BUS_NAME,
                                   Gio.BusNameWatcherFlags.NONE,
-                                   () => this._sensorProxyAppeared(),
+                                   () => { this._sensorProxyAppeared(); },
                                   () => {
                                       this._sensorProxy = null;
                                       this._updateOrientationLock();
@@ -183,7 +175,7 @@ const SystemActions = GObject.registerClass({
        this._updateOrientationLock();
        this._updateOrientationLockIcon();

-        Main.sessionMode.connect('updated', () => this._sessionUpdated());
+        Main.sessionMode.connect('updated', () => { this._sessionUpdated(); });
        this._sessionUpdated();
    }

@@ -223,7 +215,7 @@ const SystemActions = GObject.registerClass({
                    return;
                }
                this._sensorProxy.connect('g-properties-changed',
-                                          () => this._updateOrientationLock());
+                                          () => { this._updateOrientationLock(); });
                this._updateOrientationLock();
            });
    }
@@ -265,7 +257,7 @@ const SystemActions = GObject.registerClass({

    getMatchingActions(terms) {
        // terms is a list of strings
-        terms = terms.map((term) => term.toLowerCase());
+        terms = terms.map((term) => { return term.toLowerCase(); });

        let results = [];

--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -17,7 +17,7 @@ const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
 const _notTrailingJunk = '[^\\s`!()\\[\\]{};:\'\\".,<>?\u00AB\u00BB\u201C\u201D\u2018\u2019]';

 const _urlRegexp = new RegExp(
-    `(^|${_leadingJunk})` +
+    '(^|' + _leadingJunk + ')' +
    '(' +
        '(?:' +
            '(?:http|https|ftp)://' +             // scheme://
@@ -29,12 +29,12 @@ const _urlRegexp = new RegExp(
        '(?:' +                                   // one or more:
            '[^\\s()<>]+' +                       // run of non-space non-()
            '|' +                                 // or
-            `${_balancedParens}` +                // balanced parens
+            _balancedParens +                     // balanced parens
        ')+' +
        '(?:' +                                   // end with:
-            `${_balancedParens}` +                // balanced parens
+            _balancedParens +                     // balanced parens
            '|' +                                 // or
-            `${_notTrailingJunk}` +               // last non-junk char
+            _notTrailingJunk +                    // last non-junk char
        ')' +
    ')', 'gi');

@@ -69,16 +69,16 @@ function spawn(argv) {
 }

 // spawnCommandLine:
-// @commandLine: a command line
+// @command_line: a command line
 //
-// Runs @commandLine in the background, handling any errors that
+// Runs @command_line in the background, handling any errors that
 // occur when trying to parse or start the program.
-function spawnCommandLine(commandLine) {
+function spawnCommandLine(command_line) {
    try {
-        let [success, argv] = GLib.shell_parse_argv(commandLine);
+        let [success, argv] = GLib.shell_parse_argv(command_line);
        trySpawn(argv);
    } catch (err) {
-        _handleSpawnError(commandLine, err);
+        _handleSpawnError(command_line, err);
    }
 }

@@ -103,7 +103,8 @@ function spawnApp(argv) {
 //
 // Runs @argv in the background. If launching @argv fails,
 // this will throw an error.
-function trySpawn(argv) {
+function trySpawn(argv)
+{
    var success, pid;
    try {
        [success, pid] = GLib.spawn_async(null, argv, null,
@@ -134,19 +135,19 @@ function trySpawn(argv) {
 }

 // trySpawnCommandLine:
-// @commandLine: a command line
+// @command_line: a command line
 //
-// Runs @commandLine in the background. If launching @commandLine
+// Runs @command_line in the background. If launching @command_line
 // fails, this will throw an error.
-function trySpawnCommandLine(commandLine) {
+function trySpawnCommandLine(command_line) {
    let success, argv;

    try {
-        [success, argv] = GLib.shell_parse_argv(commandLine);
+        [success, argv] = GLib.shell_parse_argv(command_line);
    } catch (err) {
        // Replace "Error invoking GLib.shell_parse_argv: " with
        // something nicer
-        err.message = err.message.replace(/[^:]*: /, `${_("Could not parse command:")}\n`);
+        err.message = err.message.replace(/[^:]*: /, _("Could not parse command:") + "\n");
        throw err;
    }

@@ -288,7 +289,7 @@ function createTimeLabel(date, params) {
    let id = _desktopSettings.connect('changed::clock-format', () => {
        label.text = formatTime(date, params);
    });
-    label.connect('destroy', () => _desktopSettings.disconnect(id));
+    label.connect('destroy', () => { _desktopSettings.disconnect(id); });
    return label;
 }

@@ -379,7 +380,7 @@ class CloseButton extends St.Button {
        let themeNode = this.get_theme_node();

        let offY = this._computeBoxPointerOffset();
-        this.translation_x = themeNode.get_length('-shell-close-overlap-x');
+        this.translation_x = themeNode.get_length('-shell-close-overlap-x')
        this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY;
    }

@@ -466,7 +467,7 @@ var AppSettingsMonitor = class {
        if (!this._settings || handler.id > 0)
            return;

-        handler.id = this._settings.connect(`changed::${handler.key}`,
+        handler.id = this._settings.connect('changed::' + handler.key,
                                            handler.callback);
        handler.callback(this._settings, handler.key);
    }
@@ -492,13 +493,13 @@ var AppSettingsMonitor = class {
    }

    _setSettings(settings) {
-        this._handlers.forEach((handler) => this._disconnectHandler(handler));
+        this._handlers.forEach((handler) => { this._disconnectHandler(handler); });

        let hadSettings = (this._settings != null);
        this._settings = settings;
        let haveSettings = (this._settings != null);

-        this._handlers.forEach((handler) => this._connectHandler(handler));
+        this._handlers.forEach((handler) => { this._connectHandler(handler); });

        if (hadSettings != haveSettings)
            this.emit('available-changed');
--- a/js/misc/weather.js
+++ b/js/misc/weather.js
@@ -26,7 +26,7 @@ var WeatherClient = class {
        this._weatherAuthorized = false;
        this._permStore = new PermissionStore.PermissionStore((proxy, error) => {
            if (error) {
-                log(`Failed to connect to permissionStore: ${error.message}`);
+                log('Failed to connect to permissionStore: ' + error.message);
                return;
            }

@@ -40,7 +40,7 @@ var WeatherClient = class {

            this._permStore.LookupRemote('gnome', 'geolocation', (res, error) => {
                if (error)
-                    log(`Error looking up permission: ${error.message}`);
+                    log('Error looking up permission: ' + error.message);

                let [perms, data] = error ? [{}, null] : res;
                let  params = ['gnome', 'geolocation', false, data, perms];
@@ -68,7 +68,7 @@ var WeatherClient = class {

        this._weatherAppMon = new Util.AppSettingsMonitor('org.gnome.Weather.desktop',
                                                          'org.gnome.Weather');
-        this._weatherAppMon.connect('available-changed', () => this.emit('changed'));
+        this._weatherAppMon.connect('available-changed', () => { this.emit('changed'); });
        this._weatherAppMon.watchSetting('automatic-location',
                                         this._onAutomaticLocationChanged.bind(this));
        this._weatherAppMon.watchSetting('locations',
@@ -179,7 +179,7 @@ var WeatherClient = class {
                try {
                    this._gclueService = Geoclue.Simple.new_finish(res);
                } catch(e) {
-                    log(`Failed to connect to Geoclue2 service: ${e.message}`);
+                    log('Failed to connect to Geoclue2 service: ' + e.message);
                    this._setLocation(this._mostRecentLocation);
                    return;
                }
--- a/js/perf/core.js
+++ b/js/perf/core.js
@@ -136,6 +136,7 @@ let overviewFrames;
 let overviewLatency;
 let mallocUsedSize = 0;
 let overviewShowCount = 0;
+let firstOverviewUsedSize;
 let haveSwapComplete = false;
 let applicationsShowStart;
 let applicationsShowCount = 0;
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -30,7 +30,7 @@ var METRICS = {
    geditStartTime:
    { description: "Time from gedit launch to window drawn",
      units: "us" },
-};
+}

 function waitAndDraw(milliseconds) {
    let cb;
@@ -48,7 +48,7 @@ function waitAndDraw(milliseconds) {
            cb();
    });

-    return callback => cb = callback;
+    return callback => { cb = callback; };
 }

 function waitSignal(object, signal) {
@@ -60,7 +60,7 @@ function waitSignal(object, signal) {
            cb();
    });

-    return callback => cb = callback;
+    return callback => { cb = callback; };
 }

 function extractBootTimestamp() {
@@ -273,7 +273,7 @@ function script_collectTimings(time) {
        else
            median = Math.round((times[len / 2 - 1] + times[len / 2]) / 2);

-        METRICS[`${timing}RedrawTime`].value = median;
+        METRICS[timing + 'RedrawTime'].value = median;
    }
 }

--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -19,6 +19,7 @@ const PortalHelperSecurityLevel = {
    INSECURE: 2
 };

+const INACTIVITY_TIMEOUT = 30000; //ms
 const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
@@ -264,7 +265,7 @@ class WebPortalHelper extends Gtk.Application {
        this._queue = [];

        let action = new Gio.SimpleAction({ name: 'quit' });
-        action.connect('activate', () => this.active_window.destroyWindow());
+        action.connect('activate', () => { this.active_window.destroyWindow(); });
        this.add_action(action);
    }

--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -135,7 +135,7 @@ var AccessDialogDBus = class {
        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
        // We probably want to use parentWindow and global.display.focus_window
        // for this check in the future
-        if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
+        if (appId && appId + '.desktop' != this._windowTracker.focus_app.id) {
            invocation.return_error_literal(Gio.DBusError,
                                            Gio.DBusError.ACCESS_DENIED,
                                            'Only the focused app is allowed to show a system access dialog');
@@ -146,7 +146,7 @@ var AccessDialogDBus = class {
                                      subtitle, body, options);
        dialog.open();

-        dialog.connect('closed', () => this._accessDialog = null);
+        dialog.connect('closed', () => { this._accessDialog = null; });

        this._accessDialog = dialog;
    }
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -36,7 +36,7 @@ function _createWindowClone(window, size) {
                               // usual hack for the usual bug in ClutterBinLayout...
                               x_expand: true,
                               y_expand: true });
-}
+};

 function getWindows(workspace) {
    // We ignore skip-taskbar windows in switchers, but if they are attached
@@ -395,7 +395,7 @@ class AppSwitcherPopup extends SwitcherPopup.SwitcherPopup {
                         { opacity: 255,
                           time: THUMBNAIL_FADE_TIME,
                           transition: 'easeOutQuad',
-                           onComplete: () => this.thumbnailsVisible = true
+                           onComplete: () => { this.thumbnailsVisible = true; }
                         });

        this._switcherList._items[this._selectedIndex].add_accessible_state (Atk.StateType.EXPANDED);
@@ -459,7 +459,7 @@ class CyclerHighlight {
    _onDestroy() {
        this.window = null;
    }
-}
+};

 // We don't show an actual popup, so just provide what SwitcherPopup
 // expects instead of inheriting from SwitcherList
@@ -663,6 +663,14 @@ class AppIcon extends St.BoxLayout {
    set_size(size) {
        this.icon = this.app.create_icon_texture(size);
        this._iconBin.child = this.icon;
+        this._iconBin.set_size(size, size);
+    }
+
+    vfunc_get_preferred_width(forHeight) {
+        let [minWidth, ] = super.vfunc_get_preferred_width(forHeight);
+
+        minWidth = Math.max(minWidth, forHeight);
+        return [minWidth, minWidth];
    }
 });

@@ -720,12 +728,11 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                j++;
        }
        let themeNode = this._items[j].get_theme_node();
-        this._list.ensure_style();

        let iconPadding = themeNode.get_horizontal_padding();
        let iconBorder = themeNode.get_border_width(St.Side.LEFT) + themeNode.get_border_width(St.Side.RIGHT);
-        let [, labelNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
-        let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
+        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
        let totalSpacing = this._list.spacing * (this._items.length - 1);

        // We just assume the whole screen here due to weirdness happing with the passed width
@@ -795,10 +802,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                                                            return GLib.SOURCE_REMOVE;
                                                        });
            GLib.Source.set_name_by_id(this._mouseTimeOutId, '[gnome-shell] this._enterItem');
-        } else {
+        } else
           this._itemEntered(index);
    }
-    }

    _enterItem(index) {
        let [x, y, mask] = global.get_pointer();
@@ -842,8 +848,9 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
                this._removeIcon(app);
        });

+        let n = this._arrows.length;
        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', () => SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM));
+        arrow.connect('repaint', () => { SwitcherPopup.drawArrow(arrow, St.Side.BOTTOM); });
        this.add_actor(arrow);
        this._arrows.push(arrow);

@@ -1037,7 +1044,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
            this.icons.push(icon);

            icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => {
-                this._removeWindow(window);
+                this._removeWindow(window)
            });
        }

@@ -1073,7 +1080,7 @@ class WindowList extends SwitcherPopup.SwitcherList {
        childBox.y1 = childBox.y2 - this._label.height;
        this._label.allocate(childBox, flags);

-        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM);
+        let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM)
        childBox.x1 = box.x1;
        childBox.x2 = box.x2;
        childBox.y1 = box.y1;
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -62,9 +62,9 @@ var Animation = class {
        if (!validResourceScale)
            return;

-        let textureCache = St.TextureCache.get_default();
+        let texture_cache = St.TextureCache.get_default();
        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
-        this._animations = textureCache.load_sliced_image(file, width, height,
+        this._animations = texture_cache.load_sliced_image(file, width, height,
                                                           scaleFactor, resourceScale,
                                                           this._animationsLoaded.bind(this));
        this.actor.set_child(this._animations);
@@ -162,7 +162,7 @@ var Spinner = class extends AnimatedIcon {
                time: SPINNER_ANIMATION_TIME,
                transition: 'linear',
                onComplete: () => {
-                    super.stop();
+                    this.stop(false);
                }
            });
        } else {
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -20,6 +20,7 @@ const SystemActions = imports.misc.systemActions;

 const { loadInterfaceXML } = imports.misc.fileUtils;

+var MAX_APPLICATION_WORK_MILLIS = 75;
 var MENU_POPUP_TIMEOUT = 600;
 var MAX_COLUMNS = 6;
 var MIN_COLUMNS = 4;
@@ -33,9 +34,23 @@ var FOLDER_SUBICON_FRACTION = .4;

 var MIN_FREQUENT_APPS_COUNT = 3;

+var INDICATORS_BASE_TIME = 0.25;
+var INDICATORS_ANIMATION_DELAY = 0.125;
+var INDICATORS_ANIMATION_MAX_TIME = 0.75;
+
 var VIEWS_SWITCH_TIME = 0.4;
 var VIEWS_SWITCH_ANIMATION_DELAY = 0.1;

+// Follow iconGrid animations approach and divide by 2 to animate out to
+// not annoy the user when the user wants to quit appDisplay.
+// Also, make sure we don't exceed iconGrid animation total time or
+// views switch time.
+var INDICATORS_BASE_TIME_OUT = 0.125;
+var INDICATORS_ANIMATION_DELAY_OUT = 0.0625;
+var INDICATORS_ANIMATION_MAX_TIME_OUT =
+    Math.min (VIEWS_SWITCH_TIME,
+              IconGrid.ANIMATION_TIME_OUT + IconGrid.ANIMATION_MAX_DELAY_OUT_FOR_ITEM);
+
 var PAGE_SWITCH_TIME = 0.3;

 const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
@@ -54,7 +69,7 @@ function _getCategories(info) {

 function _listsIntersect(a, b) {
    for (let itemA of a)
-        if (b.includes(itemA))
+        if (b.indexOf(itemA) >= 0)
            return true;
    return false;
 }
@@ -143,7 +158,7 @@ class BaseAppView {

    loadGrid() {
        this._allItems.sort(this._compareItems);
-        this._allItems.forEach(item => this._grid.addItem(item));
+        this._allItems.forEach(item => { this._grid.addItem(item); });
        this.emit('view-loaded');
    }

@@ -151,7 +166,7 @@ class BaseAppView {
        if (this._items[id])
            this._items[id].actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
        else
-            log(`No such application ${id}`);
+            log('No such application ' + id);
    }

    selectApp(id) {
@@ -212,12 +227,12 @@ class BaseAppView {
        } else {
            params.opacity = 0;
            params.delay = 0;
-            params.onComplete = () => this.actor.hide();
+            params.onComplete = () => { this.actor.hide(); };
        }

        Tweener.addTween(this._grid, params);
    }
-}
+};
 Signals.addSignalMethods(BaseAppView.prototype);

 var AllView = class AllView extends BaseAppView {
@@ -285,7 +300,7 @@ var AllView = class AllView extends BaseAppView {
        this._availWidth = 0;
        this._availHeight = 0;

-        Main.overview.connect('hidden', () => this.goToPage(0));
+        Main.overview.connect('hidden', () => { this.goToPage(0); });
        this._grid.connect('space-opened', () => {
            let fadeEffect = this._scrollView.get_effect('fade');
            if (fadeEffect)
@@ -358,7 +373,7 @@ var AllView = class AllView extends BaseAppView {
    _loadApps() {
        this._appInfoList = Shell.AppSystem.get_default().get_installed().filter(appInfo => {
            try {
-                (appInfo.get_id()); // catch invalid file encodings
+                let id = appInfo.get_id(); // catch invalid file encodings
            } catch(e) {
                return false;
            }
@@ -852,7 +867,7 @@ var AppDisplay = class AppDisplay {
            this._controls.opacity = 0;
            finalOpacity = 255;
        } else {
-            finalOpacity = 0;
+            finalOpacity = 0
        }

        Tweener.addTween(this._controls,
@@ -1150,7 +1165,7 @@ var FolderIcon = class FolderIcon {
        let excludedApps = this._folder.get_strv('excluded-apps');
        let appSys = Shell.AppSystem.get_default();
        let addAppId = appId => {
-            if (excludedApps.includes(appId))
+            if (excludedApps.indexOf(appId) >= 0)
                return;

            let app = appSys.lookup_app(appId);
@@ -1299,7 +1314,7 @@ var AppFolderPopup = class AppFolderPopup {

        global.focus_manager.add_group(this.actor);

-        source.actor.connect('destroy', () => this.actor.destroy());
+        source.actor.connect('destroy', () => { this.actor.destroy(); });
        this._grabHelper = new GrabHelper.GrabHelper(this.actor, {
            actionMode: Shell.ActionMode.POPUP
        });
@@ -1713,7 +1728,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {
            let appInfo = this._source.app.get_app_info();
            let actions = appInfo.list_actions();
            if (this._source.app.can_open_new_window() &&
-                actions.includes('new-window')) {
+                actions.indexOf('new-window') == -1) {
                this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
                this._newWindowMenuItem.connect('activate', () => {
                    if (this._source.app.state == Shell.AppState.STOPPED)
@@ -1727,7 +1742,7 @@ var AppIconMenu = class AppIconMenu extends PopupMenu.PopupMenu {

            if (discreteGpuAvailable &&
                this._source.app.state == Shell.AppState.STOPPED &&
-                actions.includes('activate-discrete-gpu')) {
+                actions.indexOf('activate-discrete-gpu') == -1) {
                this._onDiscreteGpuMenuItem = this._appendMenuItem(_("Launch using Dedicated Graphics Card"));
                this._onDiscreteGpuMenuItem.connect('activate', () => {
                    if (this._source.app.state == Shell.AppState.STOPPED)
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -63,7 +63,7 @@ class AppFavorites {
    constructor() {
        this.FAVORITE_APPS_KEY = 'favorite-apps';
        this._favorites = {};
-        global.settings.connect(`changed::${this.FAVORITE_APPS_KEY}`, this._onFavsChanged.bind(this));
+        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, this._onFavsChanged.bind(this));
        this.reload();
    }

@@ -187,7 +187,7 @@ class AppFavorites {
                                   }
                                 });
    }
-}
+};
 Signals.addSignalMethods(AppFavorites.prototype);

 var appFavoritesInstance = null;
--- a/js/ui/audioDeviceSelection.js
+++ b/js/ui/audioDeviceSelection.js
@@ -110,11 +110,11 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
    }

    _openSettings() {
-        let desktopFile = 'gnome-sound-panel.desktop';
+        let desktopFile = 'gnome-sound-panel.desktop'
        let app = Shell.AppSystem.get_default().lookup_app(desktopFile);

        if (!app) {
-            log(`Settings panel for desktop file ${desktopFile} could not be loaded!`);
+            log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
            return;
        }

@@ -159,7 +159,7 @@ var AudioDeviceSelectionDBus = class AudioDeviceSelectionDBus {

        let [deviceNames] = params;
        let devices = 0;
-        deviceNames.forEach(n => devices |= AudioDevice[n.toUpperCase()]);
+        deviceNames.forEach(n => { devices |= AudioDevice[n.toUpperCase()]; });

        let dialog;
        try {
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -108,6 +108,7 @@ const PRIMARY_COLOR_KEY = 'primary-color';
 const SECONDARY_COLOR_KEY = 'secondary-color';
 const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
 const BACKGROUND_STYLE_KEY = 'picture-options';
+const PICTURE_OPACITY_KEY = 'picture-opacity';
 const PICTURE_URI_KEY = 'picture-uri';

 var FADE_ANIMATION_TIME = 1.0;
@@ -464,9 +465,9 @@ var Background = class Background {

        let cache = Meta.BackgroundImageCache.get_default();
        let image = cache.load(file);
-        if (image.is_loaded()) {
+        if (image.is_loaded())
            this._setLoaded();
-        } else {
+        else {
            let id = image.connect('loaded', () => {
                this._setLoaded();
                image.disconnect(id);
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -14,7 +14,7 @@ var BarLevel = class {
        this._barLevelWidth = 0;

        if (params == undefined)
-            params = {};
+            params = {}

        this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel',
                                          can_focus: params['canFocus'] || false,
@@ -105,7 +105,7 @@ var BarLevel = class {
            overdriveSeparatorWidth = themeNode.get_length('-barlevel-overdrive-separator-width');

        /* background bar */
-        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
+        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
        cr.lineTo(endX, (height + barLevelHeight) / 2);
        cr.lineTo(endX, (height - barLevelHeight) / 2);
        cr.lineTo(width - barLevelBorderRadius - barLevelBorderWidth, (height - barLevelHeight) / 2);
@@ -117,7 +117,7 @@ var BarLevel = class {

        /* normal progress bar */
        let x = Math.min(endX, overdriveSeparatorX - overdriveSeparatorWidth / 2);
-        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * (1 / 4), TAU * (3 / 4));
+        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 1 / 4, TAU * 3 / 4);
        cr.lineTo(x, (height - barLevelHeight) / 2);
        cr.lineTo(x, (height + barLevelHeight) / 2);
        cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
@@ -149,7 +149,7 @@ var BarLevel = class {
              Clutter.cairo_set_source_color(cr, barLevelActiveColor);
          else
              Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
-            cr.arc(endX, height / 2, barLevelBorderRadius, TAU * (3 / 4), TAU * (1 / 4));
+          cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
          cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
          cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
          cr.lineTo(endX, (height - barLevelHeight) / 2);
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { Clutter, GObject, Shell, St } = imports.gi;
+const { Clutter, GObject, Meta, Shell, St } = imports.gi;

 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -396,7 +396,7 @@ var BoxPointer = GObject.registerClass({
                cr.lineTo(x1 - rise, y1);
                cr.lineTo(x1 + borderRadius, y1);
            } else if (skipBottomLeft) {
-                cr.lineTo(x1 - rise, y2);
+                cr.lineTo(x1 - rise, y2)
                cr.lineTo(x1 - rise, y2 - halfBase);
            } else {
                cr.lineTo(x1, this._arrowOrigin + halfBase);
@@ -437,7 +437,7 @@ var BoxPointer = GObject.registerClass({
                this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => {
                    this._sourceActor = null;
                    delete this._sourceActorDestroyId;
-                });
+                })
            }
        }

--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -17,7 +17,7 @@ var ELLIPSIS_CHAR = '\u2026';

 var MESSAGE_ICON_SIZE = -1; // pick up from CSS

-var NC_ = (context, str) => `${context}\u0004${str}`;
+var NC_ = (context, str) => context + '\u0004' + str;

 function sameYear(dateA, dateB) {
    return (dateA.getYear() == dateB.getYear());
@@ -38,7 +38,7 @@ function isToday(date) {
 function _isWorkDay(date) {
    /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
    let days = C_('calendar-no-work', "06");
-    return !days.includes(date.getDay().toString());
+    return days.indexOf(date.getDay().toString()) == -1;
 }

 function _getBeginningOfDay(date) {
@@ -143,7 +143,8 @@ function _datesEqual(a, b) {
    return true;
 }

-function _dateIntervalsOverlap(a0, a1, b0, b1) {
+function _dateIntervalsOverlap(a0, a1, b0, b1)
+{
    if (a1 <= b0)
        return false;
    else if (b1 <= a0)
@@ -177,7 +178,7 @@ var DBusEventSource = class DBusEventSource {
                    // about the HasCalendars property and would cause an exception trying
                    // to read it)
                } else {
-                    log(`Error loading calendars: ${e.message}`);
+                    log('Error loading calendars: ' + e.message);
                    return;
                }
            }
@@ -319,7 +320,7 @@ var Calendar = class Calendar {
        this._weekStart = Shell.util_get_week_start();
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.calendar' });

-        this._settings.connect(`changed::${SHOW_WEEKDATE_KEY}`, this._onSettingsChange.bind(this));
+        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, this._onSettingsChange.bind(this));
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);

        /**
@@ -465,7 +466,8 @@ var Calendar = class Calendar {
                let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
                newDate = new Date(newDate.getFullYear() - 1, 11, day);
            }
-        } else {
+        }
+        else {
            newDate.setMonth(oldMonth - 1);
            if (newDate.getMonth() != oldMonth - 1) {
                let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
@@ -488,7 +490,8 @@ var Calendar = class Calendar {
                let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
                newDate = new Date(newDate.getFullYear() + 1, 0, day);
            }
-        } else {
+        }
+        else {
            newDate.setMonth(oldMonth + 1);
            if (newDate.getMonth() != oldMonth + 1) {
                let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
@@ -543,6 +546,8 @@ var Calendar = class Calendar {
        this._calendarBegin = new Date(beginDate);
        this._markedAsToday = now;

+        let year = beginDate.getYear();
+
        let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
        let startsOnWeekStart = daysToWeekStart == 0;
        let weekPadding = startsOnWeekStart ? 7 : 0;
@@ -554,7 +559,7 @@ var Calendar = class Calendar {
        let row = 2;
        // nRows here means 6 weeks + one header + one navbar
        let nRows = 8;
-        while (row < nRows) {
+        while (row < 8) {
            // xgettext:no-javascript-format
            let button = new St.Button({ label: iter.toLocaleFormat(C_("date day number format", "%d")),
                                         can_focus: true });
@@ -580,12 +585,12 @@ var Calendar = class Calendar {

            // Hack used in lieu of border-collapse - see gnome-shell.css
            if (row == 2)
-                styleClass = `calendar-day-top ${styleClass}`;
+                styleClass = 'calendar-day-top ' + styleClass;

            let leftMost = rtl ? iter.getDay() == (this._weekStart + 6) % 7
                               : iter.getDay() == this._weekStart;
            if (leftMost)
-                styleClass = `calendar-day-left ${styleClass}`;
+                styleClass = 'calendar-day-left ' + styleClass;

            if (sameDay(now, iter))
                styleClass += ' calendar-today';
@@ -643,9 +648,9 @@ var Calendar = class Calendar {
                button.add_style_pseudo_class('selected');
                if (this._shouldDateGrabFocus)
                    button.grab_key_focus();
-            } else {
-                button.remove_style_pseudo_class('selected');
            }
+            else
+                button.remove_style_pseudo_class('selected');
        });
    }
 };
@@ -1072,7 +1077,7 @@ var CalendarMessageList = class CalendarMessageList {
        this._clearButton.set_x_align(Clutter.ActorAlign.END);
        this._clearButton.connect('clicked', () => {
            let sections = [...this._sections.keys()];
-            sections.forEach((s) => s.clear());
+            sections.forEach((s) => { s.clear(); });
        });
        box.add_actor(this._clearButton);

--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -6,8 +6,8 @@ const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

-var FROZEN_WINDOW_BRIGHTNESS = -0.3;
-var DIALOG_TRANSITION_TIME = 0.15;
+var FROZEN_WINDOW_BRIGHTNESS = -0.3
+var DIALOG_TRANSITION_TIME = 0.15
 var ALIVE_TIMEOUT = 5000;

 var CloseDialog = GObject.registerClass({
@@ -165,7 +165,7 @@ var CloseDialog = GObject.registerClass({
        GLib.source_remove(this._timeoutId);
        this._timeoutId = 0;

-        global.display.disconnect(this._windowFocusChangedId);
+        global.display.disconnect(this._windowFocusChangedId)
        this._windowFocusChangedId = 0;

        global.stage.disconnect(this._keyFocusChangedId);
--- a/js/ui/components/init.js
+++ b/js/ui/components/init.js
@@ -13,13 +13,13 @@ var ComponentManager = class {
        let newEnabledComponents = Main.sessionMode.components;

        newEnabledComponents.filter(
-            name => !this._enabledComponents.includes(name)
+            name => this._enabledComponents.indexOf(name) == -1
        ).forEach(name => {
            this._enableComponent(name);
        });

        this._enabledComponents.filter(
-            name => !newEnabledComponents.includes(name)
+            name => newEnabledComponents.indexOf(name) == -1
        ).forEach(name => {
            this._disableComponent(name);
        });
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -109,21 +109,23 @@ var AutomountManager = class {
        // we force stop/eject in this case, so we don't have to pass a
        // mount operation object
        if (drive.can_stop()) {
-            drive.stop(Gio.MountUnmountFlags.FORCE, null, null,
+            drive.stop
+                (Gio.MountUnmountFlags.FORCE, null, null,
                 (drive, res) => {
                     try {
                         drive.stop_finish(res);
                     } catch (e) {
-                        log(`Unable to stop the drive after drive-eject-button ${e.toString()}`);
+                         log("Unable to stop the drive after drive-eject-button " + e.toString());
                     }
                 });
        } else if (drive.can_eject()) {
-            drive.eject_with_operation(Gio.MountUnmountFlags.FORCE, null, null,
+            drive.eject_with_operation 
+                (Gio.MountUnmountFlags.FORCE, null, null,
                 (drive, res) => {
                     try {
                         drive.eject_with_operation_finish(res);
                     } catch (e) {
-                        log(`Unable to eject the drive after drive-eject-button ${e.toString()}`);
+                         log("Unable to eject the drive after drive-eject-button " + e.toString());
                     }
                 });
        }
@@ -211,7 +213,7 @@ var AutomountManager = class {
                }

                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                    log(`Unable to mount volume ${volume.get_name()}: ${e.toString()}`);
+                    log('Unable to mount volume ' + volume.get_name() + ': ' + e.toString());
                this._closeOperation(volume);
            }
        }
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -40,7 +40,7 @@ function isMountRootHidden(root) {
    let path = root.get_path();

    // skip any mounts in hidden directory hierarchies
-    return (path.includes('/.'));
+    return (path.indexOf('/.') != -1);
 }

 function isMountNonLocal(mount) {
@@ -65,7 +65,8 @@ function startAppForMount(app, mount) {
        retval = app.launch(files, 
                            global.create_app_launch_context(0, -1));
    } catch (e) {
-        log(`Unable to launch the application ${app.get_name()}: ${e}`);
+        log('Unable to launch the application ' + app.get_name()
+            + ': ' + e.toString());
    }

    return retval;
@@ -106,7 +107,8 @@ var ContentTypeDiscoverer = class {
        try {
            contentTypes = mount.guess_content_type_finish(res);
        } catch (e) {
-            log(`Unable to guess content types on added mount ${mount.get_name()}: ${e}`);
+            log('Unable to guess content types on added mount ' + mount.get_name()
+                + ': ' + e.toString());
        }

        if (contentTypes.length) {
@@ -190,15 +192,15 @@ var AutorunDispatcher = class {

    _getAutorunSettingForType(contentType) {
        let runApp = this._settings.get_strv(SETTING_START_APP);
-        if (runApp.includes(contentType))
+        if (runApp.indexOf(contentType) != -1)
            return AutorunSetting.RUN;

        let ignore = this._settings.get_strv(SETTING_IGNORE);
-        if (ignore.includes(contentType))
+        if (ignore.indexOf(contentType) != -1)
            return AutorunSetting.IGNORE;

        let openFiles = this._settings.get_strv(SETTING_OPEN_FOLDER);
-        if (openFiles.includes(contentType))
+        if (openFiles.indexOf(contentType) != -1)
            return AutorunSetting.FILES;

        return AutorunSetting.ASK;
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -172,7 +172,7 @@ class KeyringDialog extends ModalDialog.ModalDialog {

        log('keyringPrompt: Failed to show modal dialog.' +
            ' Dismissing prompt request');
-        this.prompt.cancel();
+        this.prompt.cancel()
        return false;
    }

--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -80,9 +80,8 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                        secret.valid = secret.value.length > 0;
                    this._updateOkButton();
                });
-            } else {
+            } else
                secret.valid = true;
-            }

            if (rtl) {
                layout.attach(secret.entry, 0, pos, 1, 1);
@@ -189,9 +188,8 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                          || (value[i] >= 'A' && value[i] <= 'Z')))
                        return false;
                }
-            } else {
+            } else
                return false;
-            }
 	} else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) {
 	    if (value.length < 0 || value.length > 64)
 	        return false;
@@ -216,7 +214,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                           validate: this._validateWpaPsk, password: true });
            break;
        case 'none': // static WEP
-            secrets.push({ label: _("Key: "), key: `wep-key${wirelessSecuritySetting.wep_tx_keyidx}`,
+            secrets.push({ label: _("Key: "), key: 'wep-key' + wirelessSecuritySetting.wep_tx_keyidx,
                           value: wirelessSecuritySetting.get_wep_key(wirelessSecuritySetting.wep_tx_keyidx) || '',
                           wep_key_type: wirelessSecuritySetting.wep_key_type,
                           validate: this._validateStaticWep, password: true });
@@ -232,12 +230,13 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
            this._get8021xSecrets(secrets);
            break;
        default:
-            log(`Invalid wireless key management: ${wirelessSecuritySetting.key_mgmt}`);
+            log('Invalid wireless key management: ' + wirelessSecuritySetting.key_mgmt);
        }
    }

    _get8021xSecrets(secrets) {
        let ieee8021xSetting = this._connection.get_setting_802_1x();
+        let phase2method;

        /* If hints were given we know exactly what we need to ask */
        if (this._settingName == "802-1x" && this._hints.length) {
@@ -274,7 +273,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
                           value: ieee8021xSetting.private_key_password || '', password: true });
            break;
        default:
-            log(`Invalid EAP/IEEE802.1x method: ${ieee8021xSetting.get_eap_method(0)}`);
+            log('Invalid EAP/IEEE802.1x method: ' + ieee8021xSetting.get_eap_method(0));
        }
    }

@@ -311,7 +310,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
        case '802-11-wireless':
            wirelessSetting = this._connection.get_setting_wireless();
            ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
-            content.title = _("Authentication required by wireless network");
+            content.title = _("Authentication required");
            content.message = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
            this._getWirelessSecrets(content.secrets, wirelessSetting);
            break;
@@ -328,7 +327,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
            this._getPPPoESecrets(content.secrets);
            break;
        case 'gsm':
-            if (this._hints.includes('pin')) {
+            if (this._hints.indexOf('pin') != -1) {
                let gsmSetting = this._connection.get_setting_gsm();
                content.title = _("PIN code required");
                content.message = _("PIN code is needed for the mobile broadband device");
@@ -339,13 +338,13 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
            // fall through
        case 'cdma':
        case 'bluetooth':
-            content.title = _("Mobile broadband network password");
+            content.title = _("Mobile broadband password");
            content.message = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
            this._getMobileSecrets(content.secrets, connectionType);
            break;
        default:
-            log(`Invalid connection type: ${connectionType}`);
-        }
+            log('Invalid connection type: ' + connectionType);
+        };

        return content;
    }
@@ -368,7 +367,8 @@ var VPNRequestHandler = class {
        let argv = [ authHelper.fileName,
                     '-u', connectionSetting.uuid,
                     '-n', connectionSetting.id,
-                    '-s', serviceType];
+                     '-s', serviceType
+                   ];
        if (authHelper.externalUIMode)
            argv.push('--external-ui-mode');
        if (flags & NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION)
@@ -459,9 +459,8 @@ var VPNRequestHandler = class {
                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.USER_CANCELED);
            else
                this._agent.respond(this._requestId, Shell.NetworkAgentResponse.CONFIRMED);
-        } else {
+        } else
            this._agent.respond(this._requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
-        }

        this.destroy();
    }
@@ -588,12 +587,12 @@ var VPNRequestHandler = class {

        try {
            vpnSetting.foreach_data_item((key, value) => {
-                this._stdin.write(`DATA_KEY=${key}\n`, null);
-                this._stdin.write(`DATA_VAL=${value || ''}\n\n`, null);
+                this._stdin.write('DATA_KEY=' + key + '\n', null);
+                this._stdin.write('DATA_VAL=' + (value || '') + '\n\n', null);
            });
            vpnSetting.foreach_secret((key, value) => {
-                this._stdin.write(`SECRET_KEY=${key}\n`, null);
-                this._stdin.write(`SECRET_VAL=${value || ''}\n\n`, null);
+                this._stdin.write('SECRET_KEY=' + key + '\n', null);
+                this._stdin.write('SECRET_VAL=' + (value || '') + '\n\n', null);
            });
            this._stdin.write('DONE\n\n', null);
        } catch(e) {
@@ -620,9 +619,9 @@ var NetworkAgent = class {
        this._pluginDir = Gio.file_new_for_path(Config.VPNDIR);
        try {
            let monitor = this._pluginDir.monitor(Gio.FileMonitorFlags.NONE, null);
-            monitor.connect('changed', () => this._vpnCacheBuilt = false);
+            monitor.connect('changed', () => { this._vpnCacheBuilt = false; });
        } catch(e) {
-            log(`Failed to create monitor for VPN plugin dir: ${e.message}`);
+            log('Failed to create monitor for VPN plugin dir: ' + e.message);
        }

        this._native.connect('new-request', this._newRequest.bind(this));
@@ -681,13 +680,12 @@ var NetworkAgent = class {
        let connectionSetting = connection.get_setting_connection();
        let connectionType = connectionSetting.get_connection_type();
        switch (connectionType) {
-        case '802-11-wireless': {
+        case '802-11-wireless':
            let wirelessSetting = connection.get_setting_wireless();
            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
-            title = _("Authentication required by wireless network");
+            title = _("Authentication required");
            body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
            break;
-        }
        case '802-3-ethernet':
            title = _("Wired 802.1X authentication");
            body = _("A password is required to connect to “%s”.".format(connection.get_id()));
@@ -697,7 +695,8 @@ var NetworkAgent = class {
            body = _("A password is required to connect to “%s”.".format(connection.get_id()));
            break;
        case 'gsm':
-            if (hints.includes('pin')) {
+            if (hints.indexOf('pin') != -1) {
+                let gsmSetting = connection.get_setting_gsm();
                title = _("PIN code required");
                body = _("PIN code is needed for the mobile broadband device");
                break;
@@ -709,7 +708,7 @@ var NetworkAgent = class {
            body = _("A password is required to connect to “%s”.").format(connectionSetting.get_id());
            break;
        default:
-            log(`Invalid connection type: ${connectionType}`);
+            log('Invalid connection type: ' + connectionType);
            this._native.respond(requestId, Shell.NetworkAgentResponse.INTERNAL_ERROR);
            return;
        }
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -2,6 +2,7 @@

 const { AccountsService, Clutter, Gio, GLib,
        GObject, Pango, PolkitAgent, Polkit, Shell, St } = imports.gi;
+const Signals = imports.signals;

 const Animation = imports.ui.animation;
 const Dialog = imports.ui.dialog;
@@ -38,19 +39,19 @@ var AuthenticationDialog = GObject.registerClass({
        this.contentLayout.add_actor(content);

        if (userNames.length > 1) {
-            log(`polkitAuthenticationAgent: Received ${userNames.length} ` +
+            log('polkitAuthenticationAgent: Received ' + userNames.length +
                ' identities that can be used for authentication. Only ' +
                'considering one.');
        }

        let userName = GLib.get_user_name();
-        if (!userNames.includes(userName))
+        if (userNames.indexOf(userName) < 0)
            userName = 'root';
-        if (!userNames.includes(userName))
+        if (userNames.indexOf(userName) < 0)
            userName = userNames[0];

        this._user = AccountsService.UserManager.get_default().get_user(userName);
-        let userRealName = this._user.get_real_name();
+        let userRealName = this._user.get_real_name()
        this._userLoadedId = this._user.connect('notify::is_loaded',
                                                this._onUserChanged.bind(this));
        this._userChangedId = this._user.connect('changed',
@@ -181,8 +182,8 @@ var AuthenticationDialog = GObject.registerClass({
            // We could add retrying if this turns out to be a problem

            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
-                `Dismissing authentication request for action-id ${this.actionId} ` +
-                `cookie ${this._cookie}`);
+                ' Dismissing authentication request for action-id ' + this.actionId +
+                ' cookie ' + this._cookie);
            this._emitDone(true);
        }
    }
@@ -250,14 +251,14 @@ var AuthenticationDialog = GObject.registerClass({
        }
    }

-    _onSessionRequest(session, request, echoOn) {
+    _onSessionRequest(session, request, echo_on) {
        // Cheap localization trick
        if (request == 'Password:' || request == 'Password: ')
            this._passwordLabel.set_text(_("Password:"));
        else
            this._passwordLabel.set_text(request);

-        if (echoOn)
+        if (echo_on)
            this._passwordEntry.clutter_text.set_password_char('');
        else
            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -40,6 +40,8 @@ var NotificationDirection = {
    RECEIVED: 'chat-received'
 };

+var N_ = s => s;
+
 function makeMessageFromTpMessage(tpMessage, direction) {
    let [text, flags] = tpMessage.to_text();

@@ -87,7 +89,7 @@ var TelepathyComponent = class {
        try {
            this._client.register();
        } catch (e) {
-            throw new Error(`Could not register Telepathy client. Error: ${e}`);
+            throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
        }

        if (!this._client.account_manager.is_prepared(Tp.AccountManager.get_feature_quark_core()))
@@ -147,8 +149,8 @@ class TelepathyClient extends Tp.BaseClient {
            this._delegatedChannelsCb.bind(this));
    }

-    vfunc_observe_channels(...args) {
-        let [account, conn, channels, dispatchOp, requests, context] = args;
+    vfunc_observe_channels(account, conn, channels,
+                                     dispatchOp, requests, context) {
        let len = channels.length;
        for (let i = 0; i < len; i++) {
            let channel = channels[i];
@@ -180,8 +182,8 @@ class TelepathyClient extends Tp.BaseClient {
        });
    }

-    vfunc_handle_channels(...args) {
-        let [account, conn, channels, requests, userActionTime, context] = args;
+    vfunc_handle_channels(account, conn, channels, requests,
+                                    user_action_time, context) {
        this._handlingChannels(account, conn, channels, true);
        context.accept();
    }
@@ -220,8 +222,8 @@ class TelepathyClient extends Tp.BaseClient {
        }
    }

-    vfunc_add_dispatch_operation(...args) {
-        let [account, conn, channels, dispatchOp, context] = args;
+    vfunc_add_dispatch_operation(account, conn, channels,
+                                           dispatchOp, context) {
        let channel = channels[0];
        let chanType = channel.get_channel_type();

@@ -253,7 +255,7 @@ class TelepathyClient extends Tp.BaseClient {
                dispatchOp.claim_with_finish(result);
                this._handlingChannels(account, conn, [channel], false);
            } catch (err) {
-                log(`Failed to Claim channel: ${err}`);
+                log('Failed to Claim channel: ' + err);
            }
        });

--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -7,6 +7,7 @@ const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;

 var POPUP_APPICON_SIZE = 96;
+var POPUP_FADE_TIME = 0.1; // seconds

 var SortGroup = {
    TOP:    0,
@@ -32,7 +33,7 @@ var CtrlAltTabManager = class CtrlAltTabManager {
        item.iconName = icon;

        this._items.push(item);
-        root.connect('destroy', () => this.removeGroup(root));
+        root.connect('destroy', () => { this.removeGroup(root); });
        if (root instanceof St.Widget)
            global.focus_manager.add_group(root);
    }
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -81,7 +81,7 @@ class DashItemContainer extends St.Widget {
        let itemHeight = this.allocation.y2 - this.allocation.y1;

        let labelHeight = this.label.get_height();
-        let yOffset = Math.floor((itemHeight - labelHeight) / 2);
+        let yOffset = Math.floor((itemHeight - labelHeight) / 2)

        let y = stageY + yOffset;

@@ -321,8 +321,8 @@ class DashActor extends St.Widget {
        let themeNode = this.get_theme_node();
        let adjustedForWidth = themeNode.adjust_for_width(forWidth);
        let [, showAppsButton] = this.get_children();
-        let [minHeight] = showAppsButton.get_preferred_height(adjustedForWidth);
-        [minHeight] = themeNode.adjust_preferred_height(minHeight, natHeight);
+        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
+        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);

        return [minHeight, natHeight];
    }
@@ -700,14 +700,14 @@ var Dash = class Dash {
            }

            // App removed at oldIndex
-            if (oldApp && !newApps.includes(oldApp)) {
+            if (oldApp && newApps.indexOf(oldApp) == -1) {
                removedActors.push(children[oldIndex]);
                oldIndex++;
                continue;
            }

            // App added at newIndex
-            if (newApp && !oldApps.includes(newApp)) {
+            if (newApp && oldApps.indexOf(newApp) == -1) {
                addedItems.push({ app: newApp,
                                  item: this._createAppItem(newApp),
                                  pos: newIndex });
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -47,7 +47,7 @@ var TodayButton = class TodayButton {
        this._calendar.connect('selected-date-changed', (calendar, date) => {
            // Make the button reactive only if the selected date is not the
            // current date.
-            this.actor.reactive = !_isToday(date);
+            this.actor.reactive = !_isToday(date)
        });
    }

@@ -357,7 +357,7 @@ var MessagesIndicator = class MessagesIndicator {
        Main.messageTray.connect('queue-changed', this._updateCount.bind(this));

        let sources = Main.messageTray.getSources();
-        sources.forEach(source => this._onSourceAdded(null, source));
+        sources.forEach(source => { this._onSourceAdded(null, source); });
    }

    _onSourceAdded(tray, source) {
@@ -373,7 +373,7 @@ var MessagesIndicator = class MessagesIndicator {

    _updateCount() {
        let count = 0;
-        this._sources.forEach(source => count += source.unseenCount);
+        this._sources.forEach(source => { count += source.unseenCount; });
        count -= Main.messageTray.queueCount;

        this.actor.visible = (count > 0);
@@ -384,8 +384,8 @@ var IndicatorPad = GObject.registerClass(
 class IndicatorPad extends St.Widget {
    _init(actor) {
        this._source = actor;
-        this._source.connect('notify::visible', () => this.queue_relayout());
-        this._source.connect('notify::size', () => this.queue_relayout());
+        this._source.connect('notify::visible', () => { this.queue_relayout(); });
+        this._source.connect('notify::size', () => { this.queue_relayout(); });
        super._init();
    }

@@ -459,6 +459,7 @@ class CalendarColumnLayout extends Clutter.BoxLayout {
 var DateMenuButton = GObject.registerClass(
 class DateMenuButton extends PanelMenu.Button {
    _init() {
+        let item;
        let hbox;
        let vbox;

--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -434,13 +434,14 @@ var _Draggable = class _Draggable {
                                   scale_y: scale * origScale,
                                   time: SCALE_ANIMATION_TIME,
                                   transition: 'easeOutQuad',
-                                   onUpdate: () => {
+                                   onUpdate() {
                                       let currentScale = this._dragActor.scale_x / origScale;
                                       this._dragOffsetX = currentScale * origDragOffsetX;
                                       this._dragOffsetY = currentScale * origDragOffsetY;
                                       this._dragActor.set_position(this._dragX + this._dragOffsetX,
                                                                    this._dragY + this._dragOffsetY);
-                                   } });
+                                   },
+                                   onUpdateScope: this });
            }
        }
    }
@@ -587,10 +588,9 @@ var _Draggable = class _Draggable {
                        if (this._restoreOnSuccess) {
                            this._restoreDragActor(event.get_time());
                            return true;
-                        } else {
+                        } else
                            this._dragActor.destroy();
                    }
-                    }

                    this._dragState = DragState.INIT;
                    global.display.set_cursor(Meta.Cursor.DEFAULT);
@@ -689,12 +689,12 @@ var _Draggable = class _Draggable {
        params['onCompleteParams'] = [this._dragActor, eventTime];

        // start the animation
-        Tweener.addTween(this._dragActor, params);
+        Tweener.addTween(this._dragActor, params)
    }

    _finishAnimation() {
        if (!this._animationInProgress)
-            return;
+            return

        this._animationInProgress = false;
        if (!this._buttonDown)
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -16,7 +16,7 @@ var EdgeDragAction = GObject.registerClass({
        this._allowedModes = allowedModes;
        this.set_n_touch_points(1);

-        global.display.connect('grab-op-begin', () => this.cancel());
+        global.display.connect('grab-op-begin', () => { this.cancel(); });
    }

    _getMonitorRect(x, y) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -29,9 +29,13 @@ const UserWidget = imports.ui.userWidget;

 const { loadInterfaceXML } = imports.misc.fileUtils;

+let _endSessionDialog = null;
+
 const _ITEM_ICON_SIZE = 48;
 const _DIALOG_ICON_SIZE = 48;

+var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
+
 const EndSessionDialogIface = loadInterfaceXML('org.gnome.SessionManager.EndSessionDialog');

 const logoutDialogContent = {
@@ -219,7 +223,7 @@ function init() {
    // This always returns the same singleton object
    // By instantiating it initially, we register the
    // bus object, etc.
-    (new EndSessionDialog());
+    _endSessionDialog = new EndSessionDialog();
 }

 var EndSessionDialog = GObject.registerClass(
@@ -231,13 +235,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._loginManager = LoginManager.getLoginManager();
        this._userManager = AccountsService.UserManager.get_default();
        this._user = this._userManager.get_user(GLib.get_user_name());
-        this._updatesPermission = null;

        this._pkOfflineProxy = new PkOfflineProxy(Gio.DBus.system,
                                                  'org.freedesktop.PackageKit',
                                                  '/org/freedesktop/PackageKit',
-                                                  this._onPkOfflineProxyCreated.bind(this));
-
+                                                  (proxy, error) => {
+                                                      if (error)
+                                                          log(error.message);
+                                                  });
        this._powerProxy = new UPowerProxy(Gio.DBus.system,
                                           'org.freedesktop.UPower',
                                           '/org/freedesktop/UPower',
@@ -332,31 +337,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._inhibitorSection.add_actor(this._sessionHeader);
        this._inhibitorSection.add_actor(this._sessionList);

-        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
-        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
-    }
-
-    _onPkOfflineProxyCreated(proxy, error) {
-        if (error) {
-            log(error.message);
-            return;
-        }
-
-        // Creating a D-Bus proxy won't propagate SERVICE_UNKNOWN or NAME_HAS_NO_OWNER
-        // errors if PackageKit is not available, but the GIO implementation will make
-        // sure in that case that the proxy's g-name-owner is set to null, so check that.
-        if (this._pkOfflineProxy.g_name_owner === null) {
-            this._pkOfflineProxy = null;
-            return;
-        }
-
-        // It only makes sense to check for this permission if PackageKit is available.
        try {
-            this._updatesPermission = Polkit.Permission.new_sync(
-                "org.freedesktop.packagekit.trigger-offline-update", null, null);
+            this._updatesPermission = Polkit.Permission.new_sync("org.freedesktop.packagekit.trigger-offline-update", null, null);
        } catch(e) {
            log('No permission to trigger offline updates: %s'.format(e.toString()));
        }
+
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');
    }

    _onDestroy() {
@@ -403,8 +391,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        }

        // Use a different description when we are installing a system upgrade
-        // if the PackageKit proxy is available (i.e. PackageKit is available).
-        if (this._pkOfflineProxy && dialogContent.upgradeDescription) {
+        if (dialogContent.upgradeDescription) {
            let name = this._pkOfflineProxy.PreparedUpgrade['name'].deep_unpack();
            let version = this._pkOfflineProxy.PreparedUpgrade['version'].deep_unpack();

@@ -513,12 +500,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
    }

    _triggerOfflineUpdateReboot(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
        this._pkOfflineProxy.TriggerRemote('reboot', (result, error) => {
            if (error)
                log(error.message);
@@ -528,12 +509,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
    }

    _triggerOfflineUpdateShutdown(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
        this._pkOfflineProxy.TriggerRemote('power-off', (result, error) => {
            if (error)
                log(error.message);
@@ -543,12 +518,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
    }

    _triggerOfflineUpdateCancel(callback) {
-        // Handle this gracefully if PackageKit is not available.
-        if (!this._pkOfflineProxy) {
-            callback();
-            return;
-        }
-
        this._pkOfflineProxy.CancelRemote((result, error) => {
            if (error)
                log(error.message);
@@ -616,7 +585,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
    }

    _onInhibitorLoaded(inhibitor) {
-        if (!this._applications.includes(inhibitor)) {
+        if (this._applications.indexOf(inhibitor) < 0) {
            // Stale inhibitor
            return;
        }
@@ -711,8 +680,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        this._totalSecondsToStayOpen = totalSecondsToStayOpen;
        this._type = type;

-        // Only consider updates and upgrades if PackageKit is available.
-        if (this._pkOfflineProxy && this._type == DialogType.RESTART) {
+        if (this._type == DialogType.RESTART) {
            if (this._pkOfflineProxy.UpdateTriggered)
                this._type = DialogType.UPDATE_RESTART;
            else if (this._pkOfflineProxy.UpgradeTriggered)
@@ -744,9 +712,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
        if (dialogContent.showOtherSessions)
            this._loadSessions();

-        // Only consider updates and upgrades if PackageKit is available.
-        let updateTriggered = this._pkOfflineProxy ? this._pkOfflineProxy.UpdateTriggered : false;
-        let updatePrepared = this._pkOfflineProxy ? this._pkOfflineProxy.UpdatePrepared : false;
+        let updateTriggered = this._pkOfflineProxy.UpdateTriggered;
+        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -57,8 +57,8 @@ function _patchLayoutClass(layoutClass, styleProps) {
    };
 }

-function _loggingFunc(...args) {
-    let fields = { 'MESSAGE': args.join(', ') };
+function _loggingFunc() {
+    let fields = {'MESSAGE': [].join.call(arguments, ', ')};
    let domain = "GNOME Shell";

    // If the caller is an extension, add it as metadata
@@ -111,7 +111,7 @@ function init() {
        let base = origToString.call(this);
        try {
            if ('actor' in this && this.actor instanceof Clutter.Actor)
-                return base.replace(/\]$/, ` delegate for ${this.actor.toString().substring(1)}`);
+                return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
            else
                return base;
        } catch(e) {
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { Clutter, Gio, GLib, GObject, Soup } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Pango, Soup, St } = imports.gi;

 const Config = imports.misc.config;
 const Dialog = imports.ui.dialog;
@@ -9,10 +9,12 @@ const ExtensionSystem = imports.ui.extensionSystem;
 const FileUtils = imports.misc.fileUtils;
 const ModalDialog = imports.ui.modalDialog;

+const _signals = ExtensionSystem._signals;
+
 var REPOSITORY_URL_BASE = 'https://extensions.gnome.org';
-var REPOSITORY_URL_DOWNLOAD = `${REPOSITORY_URL_BASE}/download-extension/%s.shell-extension.zip`;
-var REPOSITORY_URL_INFO     = `${REPOSITORY_URL_BASE}/extension-info/`;
-var REPOSITORY_URL_UPDATE   = `${REPOSITORY_URL_BASE}/update-info/`;
+var REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
+var REPOSITORY_URL_INFO     = REPOSITORY_URL_BASE + '/extension-info/';
+var REPOSITORY_URL_UPDATE   = REPOSITORY_URL_BASE + '/update-info/';

 let _httpSession;

@@ -24,7 +26,7 @@ function installExtension(uuid, invocation) {

    _httpSession.queue_message(message, (session, message) => {
        if (message.status_code != Soup.KnownStatusCode.OK) {
-            ExtensionSystem.logExtensionError(uuid, `downloading info: ${message.status_code}`);
+            ExtensionSystem.logExtensionError(uuid, 'downloading info: ' + message.status_code);
            invocation.return_dbus_error('org.gnome.Shell.DownloadInfoError', message.status_code.toString());
            return;
        }
@@ -33,7 +35,7 @@ function installExtension(uuid, invocation) {
        try {
            info = JSON.parse(message.response_body.data);
        } catch (e) {
-            ExtensionSystem.logExtensionError(uuid, `parsing info: ${e}`);
+            ExtensionSystem.logExtensionError(uuid, 'parsing info: ' + e);
            invocation.return_dbus_error('org.gnome.Shell.ParseInfoError', e.toString());
            return;
        }
@@ -220,13 +222,13 @@ class InstallExtensionDialog extends ModalDialog.ModalDialog {
        function errback(code, message) {
            let msg = message ? message.toString() : '';
            log('Error while installing %s: %s (%s)'.format(uuid, code, msg));
-            invocation.return_dbus_error(`org.gnome.Shell.${code}`, msg);
+            invocation.return_dbus_error('org.gnome.Shell.' + code, msg);
        }

        function callback() {
            // Add extension to 'enabled-extensions' for the user, always...
            let enabledExtensions = global.settings.get_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY);
-            if (!enabledExtensions.includes(uuid)) {
+            if (enabledExtensions.indexOf(uuid) == -1) {
                enabledExtensions.push(uuid);
                global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions);
            }
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -111,7 +111,7 @@ function enableExtension(uuid) {

    extensionOrder.push(uuid);

-    let stylesheetNames = [`${global.session_mode}.css`, 'stylesheet.css'];
+    let stylesheetNames = [global.session_mode + '.css', 'stylesheet.css'];
    let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
    for (let i = 0; i < stylesheetNames.length; i++) {
        try {
@@ -147,7 +147,7 @@ function logExtensionError(uuid, error) {
    if (!extension)
        return;

-    let message = `${error}`;
+    let message = '' + error;

    extension.state = ExtensionState.ERROR;
    if (!extension.errors)
@@ -169,7 +169,7 @@ function loadExtension(extension) {
    if (checkVersion && ExtensionUtils.isOutOfDate(extension)) {
        extension.state = ExtensionState.OUT_OF_DATE;
    } else {
-        let enabled = enabledExtensions.includes(extension.uuid);
+        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
        if (enabled) {
            if (!initExtension(extension.uuid))
                return;
@@ -313,9 +313,9 @@ function _onVersionValidationChanged() {
 }

 function _loadExtensions() {
-    global.settings.connect(`changed::${ENABLED_EXTENSIONS_KEY}`, onEnabledExtensionsChanged);
-    global.settings.connect(`changed::${DISABLE_USER_EXTENSIONS_KEY}`, onEnabledExtensionsChanged);
-    global.settings.connect(`changed::${EXTENSION_DISABLE_VERSION_CHECK_KEY}`, _onVersionValidationChanged);
+    global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
+    global.settings.connect('changed::' + DISABLE_USER_EXTENSIONS_KEY, onEnabledExtensionsChanged);
+    global.settings.connect('changed::' + EXTENSION_DISABLE_VERSION_CHECK_KEY, _onVersionValidationChanged);

    enabledExtensions = getEnabledExtensions();

--- a/js/ui/focusCaretTracker.js
+++ b/js/ui/focusCaretTracker.js
@@ -56,8 +56,8 @@ var FocusCaretTracker = class FocusCaretTracker {
        if (!this._initAtspi() || this._focusListenerRegistered)
            return;

-        this._atspiListener.register(`${STATECHANGED}:focused`);
-        this._atspiListener.register(`${STATECHANGED}:selected`);
+        this._atspiListener.register(STATECHANGED + ':focused');
+        this._atspiListener.register(STATECHANGED + ':selected');
        this._focusListenerRegistered = true;
    }

@@ -73,8 +73,8 @@ var FocusCaretTracker = class FocusCaretTracker {
        if (!this._focusListenerRegistered)
            return;

-        this._atspiListener.deregister(`${STATECHANGED}:focused`);
-        this._atspiListener.deregister(`${STATECHANGED}:selected`);
+        this._atspiListener.deregister(STATECHANGED + ':focused');
+        this._atspiListener.deregister(STATECHANGED + ':selected');
        this._focusListenerRegistered = false;
    }

--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -87,7 +87,7 @@ var GrabHelper = class GrabHelper {
    _isWithinGrabbedActor(actor) {
        let currentActor = this.currentGrab.actor;
        while (actor) {
-            if (this._actors.includes(actor))
+            if (this._actors.indexOf(actor) != -1)
                return true;
            if (actor == currentActor)
                return true;
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -44,7 +44,7 @@ var CandidateArea = class CandidateArea {
            case Clutter.ScrollDirection.DOWN:
                this.emit('cursor-down');
                break;
-            }
+            };
            return Clutter.EVENT_PROPAGATE;
        });

--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -141,7 +141,7 @@ class BaseIcon extends St.Bin {

 function clamp(value, min, max) {
    return Math.max(Math.min(value, max), min);
-}
+};

 function zoomOutActor(actor) {
    let actorClone = new Clutter.Clone({ source: actor,
@@ -276,7 +276,7 @@ var IconGrid = GObject.registerClass({
        if (forWidth < 0)
            nColumns = children.length;
        else
-            [nColumns] = this._computeLayout(forWidth);
+            [nColumns, ] = this._computeLayout(forWidth);

        let nRows;
        if (nColumns > 0)
@@ -385,7 +385,7 @@ var IconGrid = GObject.registerClass({

            let childVolume = child.get_transformed_paint_volume(this);
            if (!childVolume)
-                return false;
+                return false

            paintVolume.union(childVolume);
        }
@@ -402,7 +402,7 @@ var IconGrid = GObject.registerClass({
    }

    _cancelAnimation() {
-        this._clonesAnimating.forEach(clone => clone.destroy());
+        this._clonesAnimating.forEach(clone => { clone.destroy(); });
        this._clonesAnimating = [];
    }

@@ -504,7 +504,7 @@ var IconGrid = GObject.registerClass({
            this._clonesAnimating.push(actorClone);
            Main.uiGroup.add_actor(actorClone);

-            let [width, height] = this._getAllocatedChildSizeAndSpacing(actor);
+            let [width, height,,] = this._getAllocatedChildSizeAndSpacing(actor);
            actorClone.set_size(width, height);
            let scaleX = sourceScaledWidth / width;
            let scaleY = sourceScaledHeight / height;
@@ -743,6 +743,7 @@ var IconGrid = GObject.registerClass({
        this._fixedHItemSize = this._hItemSize;
        this._fixedVItemSize = this._vItemSize;
        this._updateSpacingForSize(availWidth, availHeight);
+        let spacing = this._getSpacing();

        if (this.columnsForWidth(availWidth) < this._minColumns || this.rowsForHeight(availHeight) < this._minRows) {
            let neededWidth = this.usedWidthForNColumns(this._minColumns) - availWidth ;
@@ -801,6 +802,7 @@ var PaginatedIconGrid = GObject.registerClass({
        }
        let children = this._getVisibleChildren();
        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
        let spacing = this._getSpacing();
        let [nColumns, usedWidth] = this._computeLayout(availWidth);

@@ -819,6 +821,7 @@ var PaginatedIconGrid = GObject.registerClass({
        let x = box.x1 + leftEmptySpace + this.leftPadding;
        let y = box.y1 + this.topPadding;
        let columnIndex = 0;
+        let rowIndex = 0;

        for (let i = 0; i < children.length; i++) {
            let childBox = this._calculateChildBox(children[i], x, y, box);
@@ -828,17 +831,17 @@ var PaginatedIconGrid = GObject.registerClass({
            columnIndex++;
            if (columnIndex == nColumns) {
                columnIndex = 0;
+                rowIndex++;
            }
            if (columnIndex == 0) {
                y += this._getVItemSize() + spacing;
                if ((i + 1) % this._childrenPerPage == 0)
                    y +=  this._spaceBetweenPages - spacing + this.bottomPadding + this.topPadding;
                x = box.x1 + leftEmptySpace + this.leftPadding;
-            } else {
+            } else
                x += this._getHItemSize() + spacing;
        }
    }
-    }

    // Overridden from IconGrid
    _getChildrenToAnimate() {
@@ -860,6 +863,7 @@ var PaginatedIconGrid = GObject.registerClass({
        if (this._rowLimit)
            nRows = Math.min(nRows, this._rowLimit);

+        let spacing = this._getSpacing();
        // We want to contain the grid inside the parent box with padding
        this._rowsPerPage = this.rowsForHeight(availHeightPerPage);
        this._nPages = Math.ceil(nRows / this._rowsPerPage);
@@ -888,7 +892,7 @@ var PaginatedIconGrid = GObject.registerClass({
        if (!this._nPages)
            return 0;

-        let firstPageItem = pageNumber * this._childrenPerPage;
+        let firstPageItem = pageNumber * this._childrenPerPage
        let childBox = this._getVisibleChildren()[firstPageItem].get_allocation_box();
        return childBox.y1 - this.topPadding;
    }
@@ -967,7 +971,7 @@ var PaginatedIconGrid = GObject.registerClass({
                           transition: 'easeInOutQuad'
                         };
            if (i == (children.length - 1))
-                params.onComplete = () => this.emit('space-opened');
+                params.onComplete = () => { this.emit('space-opened'); };
            Tweener.addTween(children[i], params);
        }
    }
@@ -985,7 +989,7 @@ var PaginatedIconGrid = GObject.registerClass({
                             { translation_y: 0,
                               time: EXTRA_SPACE_ANIMATION_TIME,
                               transition: 'easeInOutQuad',
-                               onComplete: () => this.emit('space-closed')
+                               onComplete: () => { this.emit('space-closed'); }
                             });
        }
    }
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -111,7 +111,7 @@ var InhibitShortcutsDialog = GObject.registerClass({
    }

    vfunc_show() {
-        if (this._app && APP_WHITELIST.includes(this._app.get_id())) {
+        if (this._app && APP_WHITELIST.indexOf(this._app.get_id()) != -1) {
            this._emitResponse(DialogResponse.ALLOW);
            return;
        }
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -297,7 +297,7 @@ var Key = class Key {
    }

    _press(key) {
-        this.emit('activated');
+        this.emit('activated')

        if (key != this.key || this._extended_keys.length == 0) {
            this.emit('pressed', this._getKeyval(key), key);
@@ -405,6 +405,9 @@ var Key = class Key {
            return Clutter.EVENT_PROPAGATE;
        });
        button.connect('touch-event', (actor, event) => {
+            let device = event.get_device();
+            let sequence = event.get_event_sequence();
+
            // We only handle touch events here on wayland. On X11
            // we do get emulated pointer events, which already works
            // for single-touch cases. Besides, the X11 passive touch grab
@@ -680,7 +683,7 @@ var EmojiPager = class EmojiPager {

    _onPanEnd() {
        if (Math.abs(this._delta) < this.actor.width * PANEL_SWITCH_RELATIVE_DISTANCE) {
-            this._onPanCancel();
+            this._onPanCancel()
        } else {
            let value;
            if (this._delta > 0)
@@ -862,7 +865,7 @@ var EmojiSelection = class EmojiSelection {
                                        x_expand: true,
                                        y_expand: true,
                                        vertical: true });
-        this.actor.connect('notify::mapped', () => this._emojiPager.setCurrentPage(0));
+        this.actor.connect('notify::mapped', () => { this._emojiPager.setCurrentPage(0); });

        this._emojiPager = new EmojiPager(this._sections, 11, 3);
        this._emojiPager.connect('page-changed', (pager, section, page, nPages) => {
@@ -910,6 +913,7 @@ var EmojiSelection = class EmojiSelection {
            contents = imports.byteArray.toString(contents);
        let emoji = JSON.parse(contents);

+        let pages = [];
        let variants = [];
        let currentKey = 0;
        let currentSection = null;
@@ -944,14 +948,14 @@ var EmojiSelection = class EmojiSelection {

        key = new Key('ABC', []);
        key.keyButton.add_style_class_name('default-key');
-        key.connect('released', () => this.emit('toggle'));
+        key.connect('released', () => { this.emit('toggle'); });
        row.appendKey(key.actor, 1.5);

        for (let i = 0; i < this._sections.length; i++) {
            let section = this._sections[i];

            key = new Key(section.label, []);
-            key.connect('released', () => this._emojiPager.setCurrentSection(section, 0));
+            key.connect('released', () => { this._emojiPager.setCurrentSection(section, 0) });
            row.appendKey(key.actor);

            section.button = key;
@@ -1070,7 +1074,7 @@ var Keyboard = class Keyboard {
                let manager = Clutter.DeviceManager.get_default();
                let device = manager.get_device(deviceId);

-                if (!device.get_device_name().includes('XTEST')) {
+                if (device.get_device_name().indexOf('XTEST') < 0) {
                    this._lastDeviceId = deviceId;
                    this._syncEnabled();
                }
@@ -1171,7 +1175,7 @@ var Keyboard = class Keyboard {

        this._emojiSelection = new EmojiSelection();
        this._emojiSelection.connect('toggle', this._toggleEmoji.bind(this));
-        this._emojiSelection.connect('hide', (selection) => this.hide());
+        this._emojiSelection.connect('hide', (selection) => { this.hide(); });
        this._emojiSelection.connect('emoji-selected', (selection, emoji) => {
            this._keyboardController.commitString(emoji);
        });
@@ -1402,6 +1406,8 @@ var Keyboard = class Keyboard {
    }

    _getDefaultKeysForRow(row, numRows, level) {
+        let pre, post;
+
        /* The first 2 rows in defaultKeysPre/Post belong together with
         * the first 2 rows on each keymap. On keymaps that have more than
         * 4 rows, the last 2 default key rows must be respectively
@@ -1442,8 +1448,8 @@ var Keyboard = class Keyboard {
        numOfVertSlots = rows.length;

        for (let i = 0; i < rows.length; ++i) {
-            let keyboardRow = rows[i];
-            let keys = keyboardRow.get_children();
+            let keyboard_row = rows[i];
+            let keys = keyboard_row.get_children();

            numOfHorizSlots = Math.max(numOfHorizSlots, keys.length);
        }
@@ -1640,7 +1646,8 @@ var Keyboard = class Keyboard {
    }

    _windowSlideAnimationComplete(window, delta) {
-        // Synchronize window positions again.
+        // Synchronize window and actor positions again.
+        let windowActor = window.get_compositor_private();
        let frameRect = window.get_frame_rect();
        frameRect.y += delta;
        window.move_frame(true, frameRect.x, frameRect.y);
@@ -1686,6 +1693,7 @@ var Keyboard = class Keyboard {

        if (window && monitor) {
            let keyboardHeight = Main.layoutManager.keyboardBox.height;
+            let focusObscured = false;

            if (y + h >= monitor.y + monitor.height - keyboardHeight) {
                if (this._keyboardVisible)
@@ -1736,6 +1744,7 @@ var KeyboardController = class {
    }

    _onContentPurposeHintsChanged(method) {
+        let hints = method.content_hints;
        let purpose = method.content_purpose;
        let emojiVisible = false;
        let keypadVisible = false;
@@ -1750,13 +1759,13 @@ var KeyboardController = class {
            purpose == Clutter.InputContentPurpose.PHONE)
            keypadVisible = true;

-        this.emit('emoji-visible', emojiVisible);
+        this.emit('emoji-visible', emojiVisible)
        this.emit('keypad-visible', keypadVisible);
    }

    getGroups() {
        let inputSources = this._inputSourceManager.inputSources;
-        let groups = [];
+        let groups = []

        for (let i in inputSources) {
            let is = inputSources[i];
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -32,8 +32,7 @@ function isPopupMetaWindow(actor) {
 }

 var MonitorConstraint = GObject.registerClass({
-    Properties: {
-        'primary': GObject.ParamSpec.boolean('primary',
+    Properties: {'primary': GObject.ParamSpec.boolean('primary', 
                                                      'Primary', 'Track primary monitor',
                                                      GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
                                                      false),
@@ -44,8 +43,7 @@ var MonitorConstraint = GObject.registerClass({
                 'work-area': GObject.ParamSpec.boolean('work-area',
                                                        'Work-area', 'Track monitor\'s work-area',
                                                        GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
-                                               false)
-    },
+                                                        false)},
 }, class MonitorConstraint extends Clutter.Constraint {
    _init(props) {
        this._primary = false;
@@ -149,13 +147,13 @@ var MonitorConstraint = GObject.registerClass({
 });

 var Monitor = class Monitor {
-    constructor(index, geometry, geometryScale) {
+    constructor(index, geometry, geometry_scale) {
        this.index = index;
        this.x = geometry.x;
        this.y = geometry.y;
        this.width = geometry.width;
        this.height = geometry.height;
-        this.geometry_scale = geometryScale;
+        this.geometry_scale = geometry_scale;
    }

    get inFullscreen() {
--- a/js/ui/locatePointer.js
+++ b/js/ui/locatePointer.js
@@ -1,13 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { Gio } = imports.gi;
+const { Clutter, Gio, GLib, St } = imports.gi;
 const Ripples = imports.ui.ripples;
 const Main = imports.ui.main;

 const LOCATE_POINTER_KEY = "locate-pointer";
-const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface";
+const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface"

-var LocatePointer = class {
+var locatePointer = class {
    constructor() {
        this._settings = new Gio.Settings({schema_id: LOCATE_POINTER_SCHEMA});
        this._ripples = new Ripples.Ripples(0.5, 0.5, 'ripple-pointer-location');
@@ -15,7 +15,7 @@ var LocatePointer = class {
    }

    show() {
-        if (!this._settings.get_boolean(LOCATE_POINTER_KEY))
+        if (!this._settings.get_boolean("locate-pointer"))
            return;

        let [x, y, mods] = global.get_pointer();
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -146,8 +146,8 @@ var Notebook = class Notebook {
        this.actor.add(scrollview, { expand: true });

        let vAdjust = scrollview.vscroll.adjustment;
-        vAdjust.connect('changed', () => this._onAdjustScopeChanged(tabData));
-        vAdjust.connect('notify::value', () => this._onAdjustValueChanged(tabData));
+        vAdjust.connect('changed', () => { this._onAdjustScopeChanged(tabData); });
+        vAdjust.connect('notify::value', () => { this._onAdjustValueChanged(tabData); });

        if (this._selectedIndex == -1)
            this.selectIndex(0);
@@ -185,9 +185,9 @@ var Notebook = class Notebook {
    }

    selectChild(child) {
-        if (child == null) {
+        if (child == null)
            this.selectIndex(-1);
-        } else {
+        else {
            for (let i = 0; i < this._tabs.length; i++) {
                let tabData = this._tabs[i];
                if (tabData.child == child) {
@@ -242,7 +242,7 @@ function objectToString(o) {
        // special case this since the default is way, way too verbose
        return '<js function>';
    } else {
-        return `${o}`;
+        return '' + o;
    }
 }

@@ -284,7 +284,7 @@ var Result = class Result {
        this.actor.add(cmdTxt);
        let box = new St.BoxLayout({});
        this.actor.add(box);
-        let resultTxt = new St.Label({ text: `r(${index}) = ` });
+        let resultTxt = new St.Label({ text: 'r(' + index + ') = ' });
        resultTxt.clutter_text.ellipsize = Pango.EllipsizeMode.END;
        box.add(resultTxt);
        let objLink = new ObjLink(this._lookingGlass, o);
@@ -320,7 +320,7 @@ var WindowList = class WindowList {
            box.add(windowLink.actor, { x_align: St.Align.START, x_fill: false });
            let propsBox = new St.BoxLayout({ vertical: true, style: 'padding-left: 6px;' });
            box.add(propsBox);
-            propsBox.add(new St.Label({ text: `wmclass: ${metaWindow.get_wm_class()}` }));
+            propsBox.add(new St.Label({ text: 'wmclass: ' + metaWindow.get_wm_class() }));
            let app = tracker.get_window_app(metaWindow);
            if (app != null && !app.is_window_backed()) {
                let icon = app.create_icon_texture(22);
@@ -394,6 +394,7 @@ var ObjInspector = class ObjInspector {

            for (let i = 0; i < properties.length; i++) {
                let propName = properties[i];
+                let valueStr;
                let link;
                try {
                    let prop = obj[propName];
@@ -402,7 +403,8 @@ var ObjInspector = class ObjInspector {
                    link = new St.Label({ text: '<error>' });
                }
                let hbox = new St.BoxLayout();
-                hbox.add(new St.Label({ text: `${propName}: ` }));
+                let propText = propName + ': ' + valueStr;
+                hbox.add(new St.Label({ text: propName + ': ' }));
                hbox.add(link);
                this._container.add_actor(hbox);
            }
@@ -491,13 +493,8 @@ var Inspector = GObject.registerClass({
        eventHandler.connect('button-press-event', this._onButtonPressEvent.bind(this));
        eventHandler.connect('scroll-event', this._onScrollEvent.bind(this));
        eventHandler.connect('motion-event', this._onMotionEvent.bind(this));
-
-        let dm = Clutter.DeviceManager.get_default();
-        this._pointerDevice = dm.get_core_device(Clutter.InputDeviceType.POINTER_DEVICE);
-        this._keyboardDevice = dm.get_core_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
-
-        this._pointerDevice.grab(eventHandler);
-        this._keyboardDevice.grab(eventHandler);
+        Clutter.grab_pointer(eventHandler);
+        Clutter.grab_keyboard(eventHandler);

        // this._target is the actor currently shown by the inspector.
        // this._pointerTarget is the actor directly under the pointer.
@@ -530,8 +527,8 @@ var Inspector = GObject.registerClass({
    }

    _close() {
-        this._pointerDevice.ungrab();
-        this._keyboardDevice.ungrab();
+        Clutter.ungrab_pointer();
+        Clutter.ungrab_keyboard();
        this._eventHandler.destroy();
        this._eventHandler = null;
        this.emit('closed');
@@ -554,7 +551,7 @@ var Inspector = GObject.registerClass({

    _onScrollEvent(actor, event) {
        switch (event.get_scroll_direction()) {
-        case Clutter.ScrollDirection.UP: {
+        case Clutter.ScrollDirection.UP:
            // select parent
            let parent = this._target.get_parent();
            if (parent != null) {
@@ -562,7 +559,6 @@ var Inspector = GObject.registerClass({
                this._update(event);
            }
            break;
-        }

        case Clutter.ScrollDirection.DOWN:
            // select child
@@ -602,9 +598,9 @@ var Inspector = GObject.registerClass({
            this._target = target;
        this._pointerTarget = target;

-        let position = `[inspect x: ${stageX} y: ${stageY}]`;
+        let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
        this._displayText.text = '';
-        this._displayText.text = `${position} ${this._target}`;
+        this._displayText.text = position + ' ' + this._target;

        this._lookingGlass.setBorderPaintTarget(this._target);
    }
@@ -714,6 +710,7 @@ var Extensions = class Extensions {

        let metaBox = new St.BoxLayout({ style_class: 'lg-extension-meta' });
        box.add(metaBox);
+        let stateString = this._stateToString(extension.state);
        let state = new St.Label({ style_class: 'lg-extension-state',
                                   text: this._stateToString(extension.state) });
        metaBox.add(state);
@@ -798,7 +795,7 @@ var LookingGlass = class LookingGlass {
        inspectIcon.connect('button-press-event', () => {
            let inspector = new Inspector(this);
            inspector.connect('target', (i, target, stageX, stageY) => {
-                this._pushResult(`inspect(${Math.round(stageX)}, ${Math.round(stageY)})`, target);
+                this._pushResult('inspect(' + Math.round(stageX) + ', ' + Math.round(stageY) + ')', target);
            });
            inspector.connect('closed', () => {
                this.actor.show();
@@ -892,11 +889,9 @@ var LookingGlass = class LookingGlass {
        let fontDesc = Pango.FontDescription.from_string(fontName);
        // We ignore everything but size and style; you'd be crazy to set your system-wide
        // monospace font to be bold/oblique/etc. Could easily be added here.
-        let size = fontDesc.get_size() / 1024.;
-        let unit = fontDesc.get_size_is_absolute() ? 'px' : 'pt';
-        this.actor.style = `
-            font-size: ${size}${unit};
-            font-family: "${fontDesc.get_family()}";`;
+        this.actor.style =
+            'font-size: ' + fontDesc.get_size() / 1024. + (fontDesc.get_size_is_absolute() ? 'px' : 'pt') + ';'
+            + 'font-family: "' + fontDesc.get_family() + '";';
    }

    setBorderPaintTarget(obj) {
@@ -982,7 +977,7 @@ var LookingGlass = class LookingGlass {
        try {
            resultObj = Function(fullCmd)();
        } catch (e) {
-            resultObj = `<exception ${e}>`;
+            resultObj = '<exception ' + e + '>';
        }

        this._pushResult(command, resultObj);
@@ -1009,7 +1004,7 @@ var LookingGlass = class LookingGlass {
    }

    _queueResize() {
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => this._resize());
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { this._resize(); });
    }

    _resize() {
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -41,6 +41,8 @@ const CROSS_HAIRS_OPACITY_KEY   = 'cross-hairs-opacity';
 const CROSS_HAIRS_LENGTH_KEY    = 'cross-hairs-length';
 const CROSS_HAIRS_CLIP_KEY      = 'cross-hairs-clip';

+let magDBusService = null;
+
 var MouseSpriteContent = GObject.registerClass({
    Implements: [ Clutter.Content ],
 }, class MouseSpriteContent extends GObject.Object {
@@ -120,7 +122,7 @@ var Magnifier = class Magnifier {
        });

        // Export to dbus.
-        (new MagnifierDBus.ShellMagnifier());
+        magDBusService = new MagnifierDBus.ShellMagnifier();
        this.setActive(St.Settings.get().magnifier_active);
    }

@@ -347,7 +349,8 @@ var Magnifier = class Magnifier {
            if (!this._crossHairs)
                this.addCrosshairs();
            this._crossHairs.show();
-        } else {
+        }
+        else {
            if (this._crossHairs)
                this._crossHairs.hide();
        }
@@ -374,9 +377,9 @@ var Magnifier = class Magnifier {
        if (this._crossHairs) {
            let clutterColor = this._crossHairs.getColor();
            return clutterColor.to_string();
-        } else {
-            return '#00000000';
        }
+        else
+            return '#00000000';
    }

    /**
@@ -456,7 +459,8 @@ var Magnifier = class Magnifier {
        if (clip) {
            if (this._crossHairs)
                this._crossHairs.setClip(CROSSHAIRS_CLIP_SIZE);
-        } else {
+        }
+        else {
            // Setting no clipping on crosshairs means a zero sized clip
            // rectangle.
            if (this._crossHairs)
@@ -473,9 +477,9 @@ var Magnifier = class Magnifier {
        if (this._crossHairs) {
            let [clipWidth, clipHeight] = this._crossHairs.getClip();
            return (clipWidth > 0 && clipHeight > 0);
-        } else {
-            return false;
        }
+        else
+            return false;
     }

    //// Private methods ////
@@ -500,61 +504,61 @@ var Magnifier = class Magnifier {
    _settingsInit(zoomRegion) {
        this._settings = new Gio.Settings({ schema_id: MAGNIFIER_SCHEMA });

-        this._settings.connect(`changed::${SCREEN_POSITION_KEY}`,
+        this._settings.connect('changed::' + SCREEN_POSITION_KEY,
                               this._updateScreenPosition.bind(this));
-        this._settings.connect(`changed::${MAG_FACTOR_KEY}`,
+        this._settings.connect('changed::' + MAG_FACTOR_KEY,
                               this._updateMagFactor.bind(this));
-        this._settings.connect(`changed::${LENS_MODE_KEY}`,
+        this._settings.connect('changed::' + LENS_MODE_KEY,
                               this._updateLensMode.bind(this));
-        this._settings.connect(`changed::${CLAMP_MODE_KEY}`,
+        this._settings.connect('changed::' + CLAMP_MODE_KEY,
                               this._updateClampMode.bind(this));
-        this._settings.connect(`changed::${MOUSE_TRACKING_KEY}`,
+        this._settings.connect('changed::' + MOUSE_TRACKING_KEY,
                               this._updateMouseTrackingMode.bind(this));
-        this._settings.connect(`changed::${FOCUS_TRACKING_KEY}`,
+        this._settings.connect('changed::' + FOCUS_TRACKING_KEY,
                               this._updateFocusTrackingMode.bind(this));
-        this._settings.connect(`changed::${CARET_TRACKING_KEY}`,
+        this._settings.connect('changed::' + CARET_TRACKING_KEY,
                               this._updateCaretTrackingMode.bind(this));

-        this._settings.connect(`changed::${INVERT_LIGHTNESS_KEY}`,
+        this._settings.connect('changed::' + INVERT_LIGHTNESS_KEY,
                               this._updateInvertLightness.bind(this));
-        this._settings.connect(`changed::${COLOR_SATURATION_KEY}`,
+        this._settings.connect('changed::' + COLOR_SATURATION_KEY,
                               this._updateColorSaturation.bind(this));

-        this._settings.connect(`changed::${BRIGHT_RED_KEY}`,
+        this._settings.connect('changed::' + BRIGHT_RED_KEY,
                               this._updateBrightness.bind(this));
-        this._settings.connect(`changed::${BRIGHT_GREEN_KEY}`,
+        this._settings.connect('changed::' + BRIGHT_GREEN_KEY,
                               this._updateBrightness.bind(this));
-        this._settings.connect(`changed::${BRIGHT_BLUE_KEY}`,
+        this._settings.connect('changed::' + BRIGHT_BLUE_KEY,
                               this._updateBrightness.bind(this));

-        this._settings.connect(`changed::${CONTRAST_RED_KEY}`,
+        this._settings.connect('changed::' + CONTRAST_RED_KEY,
                               this._updateContrast.bind(this));
-        this._settings.connect(`changed::${CONTRAST_GREEN_KEY}`,
+        this._settings.connect('changed::' + CONTRAST_GREEN_KEY,
                               this._updateContrast.bind(this));
-        this._settings.connect(`changed::${CONTRAST_BLUE_KEY}`,
+        this._settings.connect('changed::' + CONTRAST_BLUE_KEY,
                               this._updateContrast.bind(this));

-        this._settings.connect(`changed::${SHOW_CROSS_HAIRS_KEY}`, () => {
+        this._settings.connect('changed::' + SHOW_CROSS_HAIRS_KEY, () => {
            this.setCrosshairsVisible(this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY));
        });

-        this._settings.connect(`changed::${CROSS_HAIRS_THICKNESS_KEY}`, () => {
+        this._settings.connect('changed::' + CROSS_HAIRS_THICKNESS_KEY, () => {
            this.setCrosshairsThickness(this._settings.get_int(CROSS_HAIRS_THICKNESS_KEY));
        });

-        this._settings.connect(`changed::${CROSS_HAIRS_COLOR_KEY}`, () => {
+        this._settings.connect('changed::' + CROSS_HAIRS_COLOR_KEY, () => {
            this.setCrosshairsColor(this._settings.get_string(CROSS_HAIRS_COLOR_KEY));
        });

-        this._settings.connect(`changed::${CROSS_HAIRS_OPACITY_KEY}`, () => {
+        this._settings.connect('changed::' + CROSS_HAIRS_OPACITY_KEY, () => {
            this.setCrosshairsOpacity(this._settings.get_double(CROSS_HAIRS_OPACITY_KEY));
        });

-        this._settings.connect(`changed::${CROSS_HAIRS_LENGTH_KEY}`, () => {
+        this._settings.connect('changed::' + CROSS_HAIRS_LENGTH_KEY, () => {
            this.setCrosshairsLength(this._settings.get_int(CROSS_HAIRS_LENGTH_KEY));
        });

-        this._settings.connect(`changed::${CROSS_HAIRS_CLIP_KEY}`, () => {
+        this._settings.connect('changed::' + CROSS_HAIRS_CLIP_KEY, () => {
            this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
        });

@@ -797,7 +801,7 @@ var ZoomRegion = class ZoomRegion {
        try {
            extents = component.get_extents(Atspi.CoordType.SCREEN);
        } catch(e) {
-            log(`Failed to read extents of focused component: ${e.message}`);
+            log('Failed to read extents of focused component: ' + e.message);
            return;
        }

@@ -814,7 +818,7 @@ var ZoomRegion = class ZoomRegion {
        try {
            extents = text.get_character_extents(text.get_caret_offset(), 0);
        } catch(e) {
-            log(`Failed to read extents of text caret: ${e.message}`);
+            log('Failed to read extents of text caret: ' + e.message);
            return;
        }

@@ -1456,9 +1460,11 @@ var ZoomRegion = class ZoomRegion {

        if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PROPORTIONAL) {
            return this._centerFromPointProportional(xMouse, yMouse);
-        } else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH) {
+        }
+        else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.PUSH) {
            return this._centerFromPointPush(xMouse, yMouse);
-        } else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED) {
+        }
+        else if (this._mouseTrackingMode == GDesktopEnums.MagnifierMouseTrackingMode.CENTERED) {
            return this._centerFromPointCentered(xMouse, yMouse);
        }

@@ -1772,7 +1778,8 @@ var Crosshairs = class Crosshairs {
            // mouse.
            this._clipSize = size;
            this.reCenter();
-        } else {
+        }
+        else {
            // Restore the missing chunk.
            this._clipSize = [0, 0];
            this.reCenter();
@@ -1811,7 +1818,9 @@ var Crosshairs = class Crosshairs {
    reCenter(clipSize) {
        let [groupWidth, groupHeight] = this._actor.get_size();
        let leftLength = this._horizLeftHair.get_width();
+        let rightLength = this._horizRightHair.get_width();
        let topLength = this._vertTopHair.get_height();
+        let bottomLength = this._vertBottomHair.get_height();
        let thickness = this._horizLeftHair.get_height();

        // Deal with clip rectangle.
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@@ -85,7 +85,7 @@ var ShellMagnifier = class ShellMagnifier {
        let ROI = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
        let viewBox = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
        let realZoomRegion = Main.magnifier.createZoomRegion(xMagFactor, yMagFactor, ROI, viewBox);
-        let objectPath = `${ZOOM_SERVICE_PATH}/zoomer${_zoomRegionInstanceCount}`;
+        let objectPath = ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
        _zoomRegionInstanceCount++;

        let zoomRegionProxy = new ShellMagnifierZoomRegion(objectPath, realZoomRegion);
@@ -106,9 +106,9 @@ var ShellMagnifier = class ShellMagnifier {
        if (proxyAndZoomRegion && proxyAndZoomRegion.zoomRegion) {
            Main.magnifier.addZoomRegion(proxyAndZoomRegion.zoomRegion);
            return true;
-        } else {
-            return false;
        }
+        else
+            return false;
    }

    /**
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -84,6 +84,7 @@ let _cssStylesheet = null;
 let _a11ySettings = null;
 let _themeResource = null;
 let _oskResource = null;
+let pointerA11yTimeout = null;

 function _sessionUpdated() {
    if (sessionMode.isPrimary)
@@ -171,7 +172,7 @@ function _initializeUI() {
    kbdA11yDialog = new KbdA11yDialog.KbdA11yDialog();
    wm = new WindowManager.WindowManager();
    magnifier = new Magnifier.Magnifier();
-    locatePointer = new LocatePointer.LocatePointer();
+    locatePointer = new LocatePointer.locatePointer();

    if (LoginManager.canLock())
        screenShield = new ScreenShield.ScreenShield();
@@ -191,7 +192,7 @@ function _initializeUI() {
    layoutManager.init();
    overview.init();

-    (new PointerA11yTimeout.PointerA11yTimeout());
+    pointerA11yTimeout = new PointerA11yTimeout.PointerA11yTimeout();

    _a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });

@@ -254,7 +255,7 @@ function _initializeUI() {
        let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
        if (perfModuleName) {
            let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
-            let module = eval(`imports.perf.${perfModuleName};`);
+            let module = eval('imports.perf.' + perfModuleName + ';');
            Scripting.runPerfScript(module, perfOutput);
        }
    });
@@ -390,9 +391,9 @@ function notify(msg, details) {
 function notifyError(msg, details) {
    // Also print to stderr so it's logged somewhere
    if (details)
-        log(`error: ${msg}: ${details}`);
+        log('error: ' + msg + ': ' + details);
    else
-        log(`error: ${msg}`);
+        log('error: ' + msg);

    notify(msg, details);
 }
@@ -658,11 +659,11 @@ function _queueBeforeRedraw(workId) {
 */
 function initializeDeferredWork(actor, callback, props) {
    // Turn into a string so we can use as an object property
-    let workId = `${(++_deferredWorkSequence)}`;
+    let workId = '' + (++_deferredWorkSequence);
    _deferredWorkData[workId] = { 'actor': actor,
                                  'callback': callback };
    actor.connect('notify::mapped', () => {
-        if (!(actor.mapped && _deferredWorkQueue.includes(workId)))
+        if (!(actor.mapped && _deferredWorkQueue.indexOf(workId) >= 0))
            return;
        _queueBeforeRedraw(workId);
    });
@@ -692,7 +693,7 @@ function queueDeferredWork(workId) {
        logError(new Error(message), message);
        return;
    }
-    if (!_deferredWorkQueue.includes(workId))
+    if (_deferredWorkQueue.indexOf(workId) < 0)
        _deferredWorkQueue.push(workId);
    if (data.actor.mapped) {
        _queueBeforeRedraw(workId);
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -72,7 +72,7 @@ var URLHighlighter = class URLHighlighter {
            let urlId = this._findUrlAtPos(event);
            if (urlId != -1) {
                let url = this._urls[urlId].url;
-                if (!url.includes(':'))
+                if (url.indexOf(':') == -1)
                    url = 'http://' + url;

                Gio.app_info_launch_default_for_uri(url, global.create_app_launch_context(0, -1));
@@ -135,17 +135,17 @@ var URLHighlighter = class URLHighlighter {
        let success;
        let [x, y] = event.get_coords();
        [success, x, y] = this.actor.transform_stage_point(x, y);
-        let findPos = -1;
+        let find_pos = -1;
        for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, lineHeight] = this.actor.clutter_text.position_to_coords(i);
-            if (py > y || py + lineHeight < y || x < px)
+            let [success, px, py, line_height] = this.actor.clutter_text.position_to_coords(i);
+            if (py > y || py + line_height < y || x < px)
                continue;
-            findPos = i;
+            find_pos = i;
        }
-        if (findPos != -1) {
+        if (find_pos != -1) {
            for (let i = 0; i < this._urls.length; i++)
-                if (findPos >= this._urls[i].pos &&
-                    this._urls[i].pos + this._urls[i].url.length > findPos)
+            if (find_pos >= this._urls[i].pos &&
+                this._urls[i].pos + this._urls[i].url.length > find_pos)
                return i;
        }
        return -1;
@@ -197,14 +197,12 @@ class ScaleLayout extends Clutter.BinLayout {
 });

 var LabelExpanderLayout = GObject.registerClass({
-    Properties: {
-        'expansion': GObject.ParamSpec.double('expansion',
+    Properties: { 'expansion': GObject.ParamSpec.double('expansion',
                                                        'Expansion',
                                                        'Expansion of the layout, between 0 (collapsed) ' +
                                                        'and 1 (fully expanded',
                                                         GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE,
-                                              0, 1, 0)
-    },
+                                                         0, 1, 0)},
 }, class LabelExpanderLayout extends Clutter.LayoutManager {
    _init(params) {
        this._expansion = 0;
@@ -469,7 +467,8 @@ var Message = class Message {
                             { scale_y: 0,
                               time: MessageTray.ANIMATION_TIME,
                               transition: 'easeOutQuad',
-                               onComplete: () => {
+                               onCompleteScope: this,
+                               onComplete() {
                                   this._actionBin.hide();
                                   this.expanded = false;
                               }});
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -218,17 +218,17 @@ class NotificationApplicationPolicy extends NotificationPolicy {

        this._masterSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications' });
        this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.notifications.application',
-                                            path: `/org/gnome/desktop/notifications/application/${this._canonicalId}/` });
+                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });

        this._masterSettings.connect('changed', this._changed.bind(this));
        this._settings.connect('changed', this._changed.bind(this));
    }

    store() {
-        this._settings.set_string('application-id', `${this.id}.desktop`);
+        this._settings.set_string('application-id', this.id + '.desktop');

        let apps = this._masterSettings.get_strv('application-children');
-        if (!apps.includes(this._canonicalId)) {
+        if (apps.indexOf(this._canonicalId) < 0) {
            apps.push(this._canonicalId);
            this._masterSettings.set_strv('application-children', apps);
        }
@@ -248,7 +248,7 @@ class NotificationApplicationPolicy extends NotificationPolicy {
    _canonicalizeId(id) {
        // Keys are restricted to lowercase alphanumeric characters and dash,
        // and two dashes cannot be in succession
-        return id.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-');
+        return id.toLowerCase().replace(/[^a-z0-9\-]/g, '-').replace(/--+/g, '-');
    }

    get enable() {
@@ -590,11 +590,11 @@ class SourceActor extends St.Widget {
        });
        this._actorDestroyed = false;

-        let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
+        let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
        this._iconBin = new St.Bin({ x_fill: true,
                                     x_expand: true,
-                                     height: size * scaleFactor,
-                                     width: size * scaleFactor });
+                                     height: size * scale_factor,
+                                     width: size * scale_factor });

        this.add_actor(this._iconBin);

@@ -616,77 +616,6 @@ class SourceActor extends St.Widget {
    }
 });

-var SourceActorWithLabel = GObject.registerClass(
-class SourceActorWithLabel extends SourceActor {
-    _init(source, size) {
-        super._init(source, size);
-
-        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
-                                            x_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER,
-                                            y_expand: true });
-
-        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
-                                        child: this._counterLabel,
-                                        layout_manager: new Clutter.BinLayout() });
-        this._counterBin.hide();
-
-        this._counterBin.connect('style-changed', () => {
-            let themeNode = this._counterBin.get_theme_node();
-            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
-            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
-        });
-
-        this.add_actor(this._counterBin);
-
-        this._countUpdatedId = this._source.connect('count-updated', this._updateCount.bind(this));
-        this._updateCount();
-
-        this.connect('destroy', () => {
-            this._source.disconnect(this._countUpdatedId);
-        });
-    }
-
-    vfunc_allocate(box, flags) {
-        super.vfunc_allocate(box, flags);
-
-        let childBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
-        let direction = this.get_text_direction();
-
-        if (direction == Clutter.TextDirection.LTR) {
-            // allocate on the right in LTR
-            childBox.x1 = box.x2 - naturalWidth;
-            childBox.x2 = box.x2;
-        } else {
-            // allocate on the left in RTL
-            childBox.x1 = 0;
-            childBox.x2 = naturalWidth;
-        }
-
-        childBox.y1 = box.y2 - naturalHeight;
-        childBox.y2 = box.y2;
-
-        this._counterBin.allocate(childBox, flags);
-    }
-
-    _updateCount() {
-        if (this._actorDestroyed)
-            return;
-
-        this._counterBin.visible = this._source.countVisible;
-
-        let text;
-        if (this._source.count < 100)
-            text = this._source.count.toString();
-        else
-            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
-
-        this._counterLabel.set_text(text);
-    }
-});
-
 var Source = class Source {
    constructor(title, iconName) {
        this.SOURCE_ICON_SIZE = 48;
@@ -772,7 +701,7 @@ var Source = class Source {
    }

    pushNotification(notification) {
-        if (this.notifications.includes(notification))
+        if (this.notifications.indexOf(notification) >= 0)
            return;

        while (this.notifications.length >= MAX_NOTIFICATIONS_PER_SOURCE)
@@ -988,7 +917,7 @@ var MessageTray = class MessageTray {

    add(source) {
        if (this.contains(source)) {
-            log(`Trying to re-add source ${source.title}`);
+            log('Trying to re-add source ' + source.title);
            return;
        }

@@ -1069,7 +998,7 @@ var MessageTray = class MessageTray {
            // If a new notification is updated while it is being hidden,
            // we stop hiding it and show it again.
            this._updateShowingNotification();
-        } else if (!this._notificationQueue.includes(notification)) {
+        } else if (this._notificationQueue.indexOf(notification) < 0) {
            // If the queue is "full", we skip banner mode and just show a small
            // indicator in the panel; however do make an exception for CRITICAL
            // notifications, as only banner mode allows expansion.
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const { Atk, Clutter, GObject, Shell, St } = imports.gi;
+const Signals = imports.signals;

 const Dialog = imports.ui.dialog;
 const Layout = imports.ui.layout;
@@ -21,13 +22,11 @@ var State = {
 };

 var ModalDialog = GObject.registerClass({
-    Properties: {
-        'state': GObject.ParamSpec.int('state', 'Dialog state', 'state',
+    Properties: { 'state': GObject.ParamSpec.int('state', 'Dialog state', 'state',
                                                 GObject.ParamFlags.READABLE,
                                                 Math.min(...Object.values(State)),
                                                 Math.max(...Object.values(State)),
-                                       State.CLOSED)
-    },
+                                                 State.CLOSED) },
    Signals: { 'opened': {}, 'closed': {} }
 }, class ModalDialog extends St.Widget {
    _init(params) {
@@ -181,7 +180,7 @@ var ModalDialog = GObject.registerClass({
                               time: OPEN_AND_CLOSE_TIME,
                               transition: 'easeOutQuad',
                               onComplete: this._closeComplete.bind(this)
-                             });
+                             })
        else
            this._closeComplete();
    }
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -135,7 +135,7 @@ var MprisPlayer = class MprisPlayer {
        // so prefer activating the app via .desktop file if possible
        let app = null;
        if (this._mprisProxy.DesktopEntry) {
-            let desktopId = `${this._mprisProxy.DesktopEntry}.desktop`;
+            let desktopId = this._mprisProxy.DesktopEntry + '.desktop';
            app = Shell.AppSystem.get_default().lookup_app(desktopId);
        }

--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -170,11 +170,11 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
            // Ignore replacesId since we already sent back a
            // NotificationClosed for that id.
            id = this._nextNotificationId++;
-            let idleId = Mainloop.idle_add(() => {
+            let idle_id = Mainloop.idle_add(() => {
                this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
                return GLib.SOURCE_REMOVE;
            });
-            GLib.Source.set_name_by_id(idleId, '[gnome-shell] this._emitNotificationClosed');
+            GLib.Source.set_name_by_id(idle_id, '[gnome-shell] this._emitNotificationClosed');
            return invocation.return_value(GLib.Variant.new('(u)', [id]));
        }

@@ -231,7 +231,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
            // There's already a pending call to GetConnectionUnixProcessID,
            // which will see the new notification data when it finishes,
            // so we don't have to do anything.
-            return invocation.return_value(GLib.Variant.new('(u)', [id]));
+            return invocation.return_value(GLib.Variant.new('(u)', [id]));;
        }

        this._busProxy.GetConnectionUnixProcessIDRemote(sender, (result, excp) => {
@@ -474,7 +474,7 @@ class FdoNotificationDaemonSource extends MessageTray.Source {
            return app;

        if (appId) {
-            app = Shell.AppSystem.get_default().lookup_app(`${appId}.desktop`);
+            app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
            if (app != null)
                return app;
        }
@@ -610,7 +610,7 @@ function objectPathFromAppId(appId) {
 }

 function getPlatformData() {
-    let startupId = GLib.Variant.new('s', `_TIME${global.get_current_time()}`);
+    let startupId = GLib.Variant.new('s', '_TIME' + global.get_current_time());
    return { "desktop-startup-id": startupId };
 }

@@ -623,7 +623,7 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
        if (!GLib.Variant.is_object_path(objectPath))
            throw new InvalidAppError();

-        let app = Shell.AppSystem.get_default().lookup_app(`${appId}.desktop`);
+        let app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
        if (!app)
            throw new InvalidAppError();

--- a/js/ui/osdMonitorLabeler.js
+++ b/js/ui/osdMonitorLabeler.js
@@ -4,6 +4,8 @@ const { Clutter, Gio, Meta, St } = imports.gi;

 const Main = imports.ui.main;

+var FADE_TIME = 0.1;
+
 var OsdMonitorLabel = class {
    constructor(monitor, label) {
        this._actor = new St.Widget({ x_expand: true,
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -21,7 +21,7 @@ var LevelBar = class extends BarLevel.BarLevel {

        this.actor.accessible_name = _("Volume");

-        this.actor.connect('notify::width', () => this.level = this.level);
+        this.actor.connect('notify::width', () => { this.level = this.level; });
    }

    get level() {
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -18,7 +18,7 @@ function getRtlSlideDirection(direction, actor) {
            SlideDirection.RIGHT : SlideDirection.LEFT;

    return direction;
-}
+};

 var SlideDirection = {
    LEFT: 0,
@@ -133,7 +133,7 @@ var SlidingControl = class {

    getVisibleWidth() {
        let child = this.actor.get_first_child();
-        let [, , natWidth] = child.get_preferred_size();
+        let [, , natWidth, ] = child.get_preferred_size();
        return natWidth;
    }

--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -121,7 +121,7 @@ var ActionComboBox = class {
        this.actor.set_child(box);

        this._label = new St.Label({ style_class: 'combo-box-label' });
-        box.add_child(this._label);
+        box.add_child(this._label)

        let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
                                  icon_name: 'pan-down-symbolic',
@@ -186,7 +186,7 @@ var ActionComboBox = class {
    }

    setButtonActionsActive(active) {
-        this._buttonItems.forEach(item => item.setSensitive(active));
+        this._buttonItems.forEach(item => { item.setSensitive(active); });
    }
 };
 Signals.addSignalMethods(ActionComboBox.prototype);
@@ -275,8 +275,7 @@ var ActionEditor = class {
 Signals.addSignalMethods(ActionEditor.prototype);

 var PadDiagram = GObject.registerClass({
-    Properties: {
-        'left-handed': GObject.ParamSpec.boolean('left-handed',
+    Properties: { 'left-handed': GObject.ParamSpec.boolean('left-handed',
                                                           'left-handed', 'Left handed',
                                                           GObject.ParamFlags.READWRITE |
                                                           GObject.ParamFlags.CONSTRUCT_ONLY,
@@ -290,8 +289,7 @@ var PadDiagram = GObject.registerClass({
                                                           'Editor actor',
                                                           GObject.ParamFlags.READWRITE |
                                                           GObject.ParamFlags.CONSTRUCT_ONLY,
-                                                 Clutter.Actor.$gtype)
-    },
+                                                           Clutter.Actor.$gtype) },
 }, class PadDiagram extends St.DrawingArea {
    _init(params) {
        let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/pad-osd.css');
@@ -342,7 +340,7 @@ var PadDiagram = GObject.registerClass({
        return ('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' +
                '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" ' +
                'xmlns:xi="http://www.w3.org/2001/XInclude" ' +
-                `width="${this._imageWidth}" height="${this._imageHeight}"> ` +
+                'width="' + this._imageWidth + '" height="' + this._imageHeight + '"> ' +
                '<style type="text/css">');
    }

@@ -357,10 +355,10 @@ var PadDiagram = GObject.registerClass({

        for (let i = 0; i < this._activeButtons.length; i++) {
            let ch = String.fromCharCode('A'.charCodeAt() + this._activeButtons[i]);
-            css += `.${ch} {
-                stroke: ${ACTIVE_COLOR} !important;
-                fill: ${ACTIVE_COLOR} !important;
-            }`;
+            css += ('.' + ch + ' { ' +
+	            '  stroke: ' + ACTIVE_COLOR + ' !important; ' +
+                    '  fill: ' + ACTIVE_COLOR + ' !important; ' +
+                    '} ');
        }

        return css;
@@ -459,7 +457,7 @@ var PadDiagram = GObject.registerClass({
        // I miss Cairo.Matrix
        let dimensions = this._handle.get_dimensions();
        x = x * this._scale + this._actorWidth / 2 - dimensions.width / 2 * this._scale;
-        y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;
+        y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;;
        return [Math.round(x), Math.round(y)];
    }

@@ -470,12 +468,12 @@ var PadDiagram = GObject.registerClass({
        let leaderPos, leaderSize, pos;
        let found, direction;

-        [found, pos] = this._handle.get_position_sub(`#${labelName}`);
+        [found, pos] = this._handle.get_position_sub('#' + labelName);
        if (!found)
            return [false];

-        [found, leaderPos] = this._handle.get_position_sub(`#${leaderName}`);
-        [found, leaderSize] = this._handle.get_dimensions_sub(`#${leaderName}`);
+        [found, leaderPos] = this._handle.get_position_sub('#' + leaderName);
+        [found, leaderSize] = this._handle.get_dimensions_sub('#' + leaderName);
        if (!found)
            return [false];

@@ -490,15 +488,15 @@ var PadDiagram = GObject.registerClass({
            pos.y = this._imageHeight - pos.y;
        }

-        let [x, y] = this._transformPoint(pos.x, pos.y);
+        let [x, y] = this._transformPoint(pos.x, pos.y)

        return [true, x, y, direction];
    }

    getButtonLabelCoords(button) {
        let ch = String.fromCharCode('A'.charCodeAt() + button);
-        let labelName = `Label${ch}`;
-        let leaderName = `Leader${ch}`;
+        let labelName = 'Label' + ch;
+        let leaderName = 'Leader' + ch;

        return this._getItemLabelCoords(labelName, leaderName);
    }
@@ -506,8 +504,8 @@ var PadDiagram = GObject.registerClass({
    getRingLabelCoords(number, dir) {
        let numStr = number > 0 ? (number + 1).toString() : '';
        let dirStr = dir == CW ? 'CW' : 'CCW';
-        let labelName = `LabelRing${numStr}${dirStr}`;
-        let leaderName = `LeaderRing${numStr}${dirStr}`;
+        let labelName = 'LabelRing' + numStr + dirStr;
+        let leaderName = 'LeaderRing' + numStr + dirStr;

        return this._getItemLabelCoords(labelName, leaderName);
    }
@@ -515,8 +513,8 @@ var PadDiagram = GObject.registerClass({
    getStripLabelCoords(number, dir) {
        let numStr = number > 0 ? (number + 1).toString() : '';
        let dirStr = dir == UP ? 'Up' : 'Down';
-        let labelName = `LabelStrip${numStr}${dirStr}`;
-        let leaderName = `LeaderStrip${numStr}${dirStr}`;
+        let labelName = 'LabelStrip' + numStr + dirStr;
+        let leaderName = 'LeaderStrip' + numStr + dirStr;

        return this._getItemLabelCoords(labelName, leaderName);
    }
@@ -632,7 +630,7 @@ var PadOsd = class {
            // If the device is being removed, destroy the padOsd.
            if (device == this.padDevice) {
                this.destroy();
-            } else if (this._groupPads.includes(device)) {
+            } else if (this._groupPads.indexOf(device) != -1) {
                // Or update the pad chooser if the device belongs to
                // the same group.
                this._groupPads.splice(this._groupPads.indexOf(device), 1);
@@ -736,7 +734,7 @@ var PadOsd = class {
    _updatePadChooser() {
        if (this._groupPads.length > 1) {
            if (this._padChooser == null) {
-                this._padChooser = new PadChooser(this.padDevice, this._groupPads);
+                this._padChooser = new PadChooser(this.padDevice, this._groupPads)
                this._padChooser.connect('pad-selected', (chooser, pad) => {
                    this._requestForOtherPad(pad);
                });
@@ -751,7 +749,8 @@ var PadOsd = class {
    }

    _requestForOtherPad(pad) {
-        if (pad == this.padDevice || !this._groupPads.includes(pad))
+        if (pad == this.padDevice ||
+            this._groupPads.indexOf(pad) == -1)
            return;

        let editionMode = this._editionMode;
@@ -802,7 +801,7 @@ var PadOsd = class {

        // If the event comes from another pad in the same group,
        // show the OSD for it.
-        if (this._groupPads.includes(event.get_source_device())) {
+        if (this._groupPads.indexOf(event.get_source_device()) != -1) {
            this._requestForOtherPad(event.get_source_device());
            return Clutter.EVENT_STOP;
        }
@@ -866,7 +865,7 @@ var PadOsd = class {
            if (this._followUpActionEdition(str))
                return;

-            this._padDiagram.stopEdition(false, str ? str : _("None"));
+            this._padDiagram.stopEdition(false, str ? str : _("None"))
            this._editedAction = null;
        }

@@ -889,7 +888,7 @@ var PadOsd = class {

    _startButtonActionEdition(button) {
        let ch = String.fromCharCode('A'.charCodeAt() + button);
-        let key = `button${ch}`;
+        let key = 'button' + ch;
        this._startActionEdition(key, Meta.PadActionType.BUTTON, button);
    }

--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -51,7 +51,7 @@ function _premultiply(color) {
                               green: _norm(color.green * color.alpha),
                               blue: _norm(color.blue * color.alpha),
                               alpha: color.alpha });
-}
+};

 function _unpremultiply(color) {
    if (color.alpha == 0)
@@ -62,7 +62,7 @@ function _unpremultiply(color) {
    let blue = Math.min((color.blue * 255 + 127) / color.alpha, 255);
    return new Clutter.Color({ red: red, green: green,
                               blue: blue, alpha: color.alpha });
-}
+};

 class AppMenu extends PopupMenu.PopupMenu {
    constructor(sourceActor) {
@@ -283,9 +283,10 @@ var AppMenuButton = GObject.registerClass({
                         { opacity: 0,
                           time: Overview.ANIMATION_TIME,
                           transition: 'easeOutQuad',
-                           onComplete: () => {
+                           onComplete() {
                               this.hide();
-                           } });
+                           },
+                           onCompleteScope: this });
    }

    _onStyleChanged(actor) {
@@ -327,7 +328,8 @@ var AppMenuButton = GObject.registerClass({
                         { opacity: 0,
                           time: SPINNER_ANIMATION_TIME,
                           transition: "easeOutQuad",
-                           onComplete: () => {
+                           onCompleteScope: this,
+                           onComplete() {
                               this._spinner.stop();
                               this._spinner.actor.opacity = 255;
                               this._spinner.actor.hide();
@@ -862,7 +864,7 @@ class Panel extends St.Widget {

        Main.sessionMode.connect('updated', this._updatePanel.bind(this));

-        global.display.connect('workareas-changed', () => this.queue_relayout());
+        global.display.connect('workareas-changed', () => { this.queue_relayout(); });
        this._updatePanel();
    }

@@ -1054,9 +1056,9 @@ class Panel extends St.Widget {
        this._updateBox(panel.center, this._centerBox);
        this._updateBox(panel.right, this._rightBox);

-        if (panel.left.includes('dateMenu'))
+        if (panel.left.indexOf('dateMenu') != -1)
            Main.messageTray.bannerAlignment = Clutter.ActorAlign.START;
-        else if (panel.right.includes('dateMenu'))
+        else if (panel.right.indexOf('dateMenu') != -1)
            Main.messageTray.bannerAlignment = Clutter.ActorAlign.END;
        // Default to center if there is no dateMenu
        else
@@ -1137,7 +1139,7 @@ class Panel extends St.Widget {

    addToStatusArea(role, indicator, position, box) {
        if (this.statusArea[role])
-            throw new Error(`Extension point conflict: there is already a status indicator for role ${role}`);
+            throw new Error('Extension point conflict: there is already a status indicator for role ' + role);

        if (!(indicator instanceof PanelMenu.Button))
            throw new TypeError('Status indicator must be an instance of PanelMenu.Button');
@@ -1187,7 +1189,7 @@ class Panel extends St.Widget {

    _getDraggableWindowForPosition(stageX) {
        let workspaceManager = global.workspace_manager;
-        let workspace = workspaceManager.get_active_workspace();
+        let workspace = workspaceManager.get_active_workspace()
        let allWindowsByStacking = global.display.sort_windows_by_stacking(
            workspace.list_windows()
        ).reverse();
@@ -1198,7 +1200,7 @@ class Panel extends St.Widget {
                   metaWindow.showing_on_its_workspace() &&
                   metaWindow.get_window_type() != Meta.WindowType.DESKTOP &&
                   metaWindow.maximized_vertically &&
-                   stageX > rect.x && stageX < rect.x + rect.width;
+                   stageX > rect.x && stageX < rect.x + rect.width
        });
    }
 });
--- a/js/ui/panel.js.
+++ b/js/ui/panel.js.
--- a/js/ui/pointerA11yTimeout.js
+++ b/js/ui/pointerA11yTimeout.js
@@ -3,6 +3,8 @@ const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
 const Cairo = imports.cairo;

+const ANIMATION_STEPS = 36.;
+
 var PieTimer = GObject.registerClass(
 class PieTimer extends St.DrawingArea {
    _init() {
@@ -66,8 +68,10 @@ class PieTimer extends St.DrawingArea {
                         { opacity: 255,
                           time: duration / 1000,
                           transition: 'easeOutQuad',
-                           onUpdate: () => this.queue_repaint(),
-                           onComplete: () => this.stop()
+                           onUpdateScope: this,
+                           onUpdate() { this.queue_repaint() },
+                           onCompleteScope: this,
+                           onComplete() { this.stop(); }
                          });
    }

--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -261,7 +261,7 @@ class PopupMenuItem extends PopupBaseMenuItem {

        this.label = new St.Label({ text: text });
        this.add_child(this.label);
-        this.label_actor = this.label;
+        this.label_actor = this.label
    }
 });

@@ -315,7 +315,8 @@ class Switch extends St.Bin {

 var PopupSwitchMenuItem = GObject.registerClass({
    Signals: { 'toggled': { param_types: [GObject.TYPE_BOOLEAN] }, },
-}, class PopupSwitchMenuItem extends PopupBaseMenuItem {
+},
+class PopupSwitchMenuItem extends PopupBaseMenuItem {
    _init(text, active, params) {
        super._init(params);

@@ -501,7 +502,7 @@ var PopupMenuBase = class {
            let app = Shell.AppSystem.get_default().lookup_app(desktopFile);

            if (!app) {
-                log(`Settings panel for desktop file ${desktopFile} could not be loaded!`);
+                log('Settings panel for desktop file ' + desktopFile + ' could not be loaded!');
                return;
            }

@@ -650,14 +651,14 @@ var PopupMenuBase = class {
    }

    addMenuItem(menuItem, position) {
-        let beforeItem = null;
+        let before_item = null;
        if (position == undefined) {
            this.box.add(menuItem.actor);
        } else {
            let items = this._getMenuItems();
            if (position < items.length) {
-                beforeItem = items[position].actor;
-                this.box.insert_child_below(menuItem.actor, beforeItem);
+                before_item = items[position].actor;
+                this.box.insert_child_below(menuItem.actor, before_item);
            } else {
                this.box.add(menuItem.actor);
            }
@@ -687,10 +688,10 @@ var PopupMenuBase = class {
                this.length--;
            });
        } else if (menuItem instanceof PopupSubMenuMenuItem) {
-            if (beforeItem == null)
+            if (before_item == null)
                this.box.add(menuItem.menu.actor);
            else
-                this.box.insert_child_below(menuItem.menu.actor, beforeItem);
+                this.box.insert_child_below(menuItem.menu.actor, before_item);

            this._connectItemSignals(menuItem);
            let subMenuActiveChangeId = menuItem.menu.connect('active-changed', this._subMenuActiveChanged.bind(this));
@@ -851,10 +852,9 @@ var PopupMenu = class extends PopupMenuBase {
                this.toggle();
            this.actor.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
            return Clutter.EVENT_STOP;
-        } else {
+        } else
            return Clutter.EVENT_PROPAGATE;
    }
-    }

    setArrowOrigin(origin) {
        this._boxPointer.setArrowOrigin(origin);
@@ -920,16 +920,9 @@ var PopupDummyMenu = class {
        return this.getSensitive();
    }

-    open() {
-        this.emit('open-state-changed', true);
-    }
-
-    close() {
-        this.emit('open-state-changed', false);
-    }
-
+    open() { this.emit('open-state-changed', true); }
+    close() { this.emit('open-state-changed', false); }
    toggle() {}
-
    destroy() {
        this.emit('destroy');
    }
@@ -1015,10 +1008,12 @@ var PopupSubMenu = class extends PopupMenuBase {
                             { _arrowRotation: targetAngle,
                               height: naturalHeight,
                               time: 0.25,
-                               onUpdate: () => {
+                               onUpdateScope: this,
+                               onUpdate() {
                                   this._arrow.rotation_angle_z = this.actor._arrowRotation;
                               },
-                               onComplete: () => {
+                               onCompleteScope: this,
+                               onComplete() {
                                   this.actor.set_height(-1);
                               }
                             });
@@ -1046,10 +1041,12 @@ var PopupSubMenu = class extends PopupMenuBase {
                             { _arrowRotation: 0,
                               height: 0,
                               time: 0.25,
-                               onUpdate: () => {
+                               onUpdateScope: this,
+                               onUpdate() {
                                   this._arrow.rotation_angle_z = this.actor._arrowRotation;
                               },
-                               onComplete: () => {
+                               onCompleteScope: this,
+                               onComplete() {
                                   this.actor.hide();
                                   this.actor.set_height(-1);
                               },
@@ -1092,13 +1089,8 @@ var PopupMenuSection = class extends PopupMenuBase {

    // deliberately ignore any attempt to open() or close(), but emit the
    // corresponding signal so children can still pick it up
-    open() {
-        this.emit('open-state-changed', true);
-    }
-
-    close() {
-        this.emit('open-state-changed', false);
-    }
+    open() { this.emit('open-state-changed', true); }
+    close() { this.emit('open-state-changed', false); }
 };

 var PopupSubMenuMenuItem = GObject.registerClass(
@@ -1134,7 +1126,7 @@ class PopupSubMenuMenuItem extends PopupBaseMenuItem {

        this.menu = new PopupSubMenu(this, this._triangle);
        this.menu.connect('open-state-changed', this._subMenuOpenStateChanged.bind(this));
-        this.connect('destroy', () => this.menu.destroy());
+        this.connect('destroy', () => { this.menu.destroy(); });
    }

    _setParent(parent) {
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -92,7 +92,7 @@ function loadRemoteSearchProviders(searchSettings, callback) {
                if (!appInfo.should_show())
                    return;
            } catch (e) {
-                log(`Ignoring search provider ${path}: missing DesktopId`);
+                log('Ignoring search provider ' + path + ': missing DesktopId');
                return;
            }

@@ -146,10 +146,10 @@ function loadRemoteSearchProviders(searchSettings, callback) {

        if (provider.defaultEnabled) {
            let disabled = searchSettings.get_strv('disabled');
-            return !disabled.includes(appId);
+            return disabled.indexOf(appId) == -1;
        } else {
            let enabled = searchSettings.get_strv('enabled');
-            return enabled.includes(appId);
+            return enabled.indexOf(appId) != -1;
        }
    });

@@ -191,18 +191,18 @@ var RemoteSearchProvider = class {
        if (!proxyInfo)
            proxyInfo = SearchProviderProxyInfo;

-        let gFlags = Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES;
+        let g_flags = Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES;
        if (autoStart)
-            gFlags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION;
+            g_flags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION;
        else
-            gFlags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START;
+            g_flags |= Gio.DBusProxyFlags.DO_NOT_AUTO_START;

        this.proxy = new Gio.DBusProxy({ g_bus_type: Gio.BusType.SESSION,
                                         g_name: dbusName,
                                         g_object_path: dbusPath,
                                         g_interface_info: proxyInfo,
                                         g_interface_name: proxyInfo.name,
-                                         gFlags });
+                                         g_flags });
        this.proxy.init_async(GLib.PRIORITY_DEFAULT, null, null);

        this.appInfo = appInfo;
@@ -313,7 +313,7 @@ var RemoteSearchProvider = class {
    launchSearch(terms) {
        // the provider is not compatible with the new version of the interface, launch
        // the app itself but warn so we can catch the error in logs
-        log(`Search provider ${this.appInfo.get_id()} does not implement LaunchSearch`);
+        log('Search provider ' + this.appInfo.get_id() + ' does not implement LaunchSearch');
        this.appInfo.launch([], global.create_app_launch_context(0, -1));
    }
 };
--- a/js/ui/ripples.js
+++ b/js/ui/ripples.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

-const { St } = imports.gi;
+const { Clutter, St } = imports.gi;
 const Tweener = imports.ui.tweener;

 // Shamelessly copied from the layout "hotcorner" ripples implementation
@@ -56,13 +56,15 @@ var Ripples = class Ripples {
                                   delay: delay,
                                   time: time,
                                   transition: 'linear',
-                                   onUpdate: () => ripple.opacity = 255 * Math.sqrt(ripple._opacity),
-                                   onComplete: () => ripple.visible = false });
+                                   onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
+                                   onComplete() { ripple.visible = false; } });
    }

    addTo(stage) {
-        if (this._stage !== undefined)
+        if (this._stage !== undefined) {
            throw new Error('Ripples already added');
+            return;
+        }

        this._stage = stage;
        this._stage.add_actor(this._ripple1);
@@ -71,8 +73,10 @@ var Ripples = class Ripples {
    }

    playAnimation(x, y) {
-        if (this._stage === undefined)
+        if (this._stage === undefined) {
            throw new Error('Ripples not added');
+            return;
+        }

        this._x = x;
        this._y = y;
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-

 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
+const Signals = imports.signals;

 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
@@ -9,6 +10,8 @@ const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
 const History = imports.misc.history;

+var MAX_FILE_DELETED_BEFORE_INVALID = 10;
+
 const HISTORY_KEY = 'command-history';

 const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
@@ -33,15 +36,18 @@ class RunDialog extends ModalDialog.ModalDialog {
        });
        this._enableInternalCommands = global.settings.get_boolean('development-tools');

-        this._internalCommands = {
-            'lg': () => Main.createLookingGlass().open(),
+        this._internalCommands = { 'lg': () => {
+                                       Main.createLookingGlass().open();
+                                   },

                                   'r': this._restart.bind(this),

                                   // Developer brain backwards compatibility
                                   'restart': this._restart.bind(this),

-            'debugexit': () => Meta.quit(Meta.ExitCode.ERROR),
+                                   'debugexit': () => {
+                                       Meta.quit(Meta.ExitCode.ERROR);
+                                   },

                                   // rt is short for "reload theme"
                                   'rt': () => {
@@ -54,6 +60,7 @@ class RunDialog extends ModalDialog.ModalDialog {
                                   },
                                 };

+
        let label = new St.Label({ style_class: 'run-dialog-label',
                                   text: _("Enter a Command") });

@@ -162,8 +169,9 @@ class RunDialog extends ModalDialog.ModalDialog {
                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
                    !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))
                    log(e);
-            }
+            } finally {
                return results;
+            }
        });
        let results = someResults.reduce((a, b) => a.concat(b), []);

@@ -175,7 +183,7 @@ class RunDialog extends ModalDialog.ModalDialog {
    }

    _getCompletion(text) {
-        if (text.includes('/')) {
+        if (text.indexOf('/') != -1) {
            return this._pathCompleter.get_completion_suffix(text);
        } else {
            return this._getCommandCompletion(text);
@@ -198,8 +206,8 @@ class RunDialog extends ModalDialog.ModalDialog {
            try {
                if (inTerminal) {
                    let exec = this._terminalSettings.get_string(EXEC_KEY);
-                    let execArg = this._terminalSettings.get_string(EXEC_ARG_KEY);
-                    command = `${exec} ${execArg} ${input}`;
+                    let exec_arg = this._terminalSettings.get_string(EXEC_ARG_KEY);
+                    command = exec + ' ' + exec_arg + ' ' + input;
                }
                Util.trySpawnCommandLine(command);
            } catch (e) {
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -44,9 +44,11 @@ var SUMMARY_ICON_SIZE = 48;
 // - STANDARD_FADE_TIME is used when the session goes idle
 // - MANUAL_FADE_TIME is used for lowering the shield when asked by the user,
 //   or when cancelling the dialog
+// - BACKGROUND_FADE_TIME is used when the background changes to crossfade to new background
 // - CURTAIN_SLIDE_TIME is used when raising the shield before unlocking
 var STANDARD_FADE_TIME = 10;
 var MANUAL_FADE_TIME = 0.3;
+var BACKGROUND_FADE_TIME = 1.0;
 var CURTAIN_SLIDE_TIME = 0.3;

 var Clock = class {
@@ -255,10 +257,11 @@ var NotificationsBox = class {
                             { height: natHeight,
                               transition: 'easeOutQuad',
                               time: 0.25,
-                               onComplete: () => {
+                               onComplete() {
                                   this._scrollView.vscrollbar_policy = St.PolicyType.AUTOMATIC;
                                   widget.set_height(-1);
-                               }
+                               },
+                               onCompleteScope: this
                             });

            this._updateVisibility();
@@ -380,11 +383,11 @@ class ScreenShieldArrow extends St.Bin {
        if (!this._shadow)
            return true;

-        let shadowBox = new Clutter.ActorBox();
-        this._shadow.get_box(this._drawingArea.get_allocation_box(), shadowBox);
+        let shadow_box = new Clutter.ActorBox();
+        this._shadow.get_box(this._drawingArea.get_allocation_box(), shadow_box);

-        volume.set_width(Math.max(shadowBox.x2 - shadowBox.x1, volume.get_width()));
-        volume.set_height(Math.max(shadowBox.y2 - shadowBox.y1, volume.get_height()));
+        volume.set_width(Math.max(shadow_box.x2 - shadow_box.x1, volume.get_width()));
+        volume.set_height(Math.max(shadow_box.y2 - shadow_box.y1, volume.get_height()));

        return true;
    }
@@ -529,18 +532,18 @@ var ScreenShield = class {
        this._loginManager.getCurrentSessionProxy(sessionProxy => {
            this._loginSession = sessionProxy;
            this._loginSession.connectSignal('Lock',
-                                             () => this.lock(false));
+                                             () => { this.lock(false); });
            this._loginSession.connectSignal('Unlock',
-                                             () => this.deactivate(false));
+                                             () => { this.deactivate(false); });
            this._loginSession.connect('g-properties-changed', this._syncInhibitor.bind(this));
            this._syncInhibitor();
        });

        this._settings = new Gio.Settings({ schema_id: SCREENSAVER_SCHEMA });
-        this._settings.connect(`changed::${LOCK_ENABLED_KEY}`, this._syncInhibitor.bind(this));
+        this._settings.connect('changed::' + LOCK_ENABLED_KEY, this._syncInhibitor.bind(this));

        this._lockSettings = new Gio.Settings({ schema_id: LOCKDOWN_SCHEMA });
-        this._lockSettings.connect(`changed::${DISABLE_LOCK_KEY}`, this._syncInhibitor.bind(this));
+        this._lockSettings.connect('changed::' + DISABLE_LOCK_KEY, this._syncInhibitor.bind(this));

        this._isModal = false;
        this._hasLockScreen = false;
@@ -790,10 +793,11 @@ var ScreenShield = class {
                             { y: 0,
                               time: time,
                               transition: 'easeInQuad',
-                               onComplete: () => {
+                               onComplete() {
                                   this._lockScreenGroup.fixed_position_set = false;
                                   this._lockScreenState = MessageTray.State.SHOWN;
-                               }
+                               },
+                               onCompleteScope: this,
                             });

            this._maybeCancelDialog();
@@ -931,9 +935,9 @@ var ScreenShield = class {
            // if velocity is specified, it's in pixels per milliseconds
            let h = global.stage.height;
            let delta = (h + this._lockScreenGroup.y);
-            let minVelocity = global.stage.height / (CURTAIN_SLIDE_TIME * 1000);
+            let min_velocity = global.stage.height / (CURTAIN_SLIDE_TIME * 1000);

-            velocity = Math.max(minVelocity, velocity);
+            velocity = Math.max(min_velocity, velocity);
            let time = (delta / velocity) / 1000;

            Tweener.addTween(this._lockScreenGroup,
@@ -1006,10 +1010,11 @@ var ScreenShield = class {
                             { y: 0,
                               time: MANUAL_FADE_TIME,
                               transition: 'easeOutQuad',
-                               onComplete: () => {
+                               onComplete() {
                                   this._lockScreenShown({ fadeToBlack: fadeToBlack,
                                                           animateFade: true });
-                               }
+                               },
+                               onCompleteScope: this
                             });
        } else {
            this._lockScreenGroup.fixed_position_set = false;
@@ -1177,7 +1182,7 @@ var ScreenShield = class {

    deactivate(animate) {
        if (this._dialog)
-            this._dialog.finish(() => this._continueDeactivate(animate));
+            this._dialog.finish(() => { this._continueDeactivate(animate); });
        else
            this._continueDeactivate(animate);
    }
@@ -1285,7 +1290,7 @@ var ScreenShield = class {

    lock(animate) {
        if (this._lockSettings.get_boolean(DISABLE_LOCK_KEY)) {
-            log('Screen lock is locked down, not locking'); // lock, lock - who's there?
+            log('Screen lock is locked down, not locking') // lock, lock - who's there?
            return;
        }

--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@@ -27,7 +27,7 @@ var ScreenshotService = class {
    _createScreenshot(invocation, needsDisk=true) {
        let lockedDown = false;
        if (needsDisk)
-            lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk');
+            lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk')

        let sender = invocation.get_sender();
        if (this._screenShooter.has(sender) || lockedDown) {
@@ -72,9 +72,9 @@ var ScreenshotService = class {
                flashspot.fire(() => {
                    this._removeShooterForSender(invocation.get_sender());
                });
-            } else {
-                this._removeShooterForSender(invocation.get_sender());
            }
+            else
+                this._removeShooterForSender(invocation.get_sender());
        }

        let retval = GLib.Variant.new('(bs)', [result, filenameUsed]);
@@ -125,11 +125,11 @@ var ScreenshotService = class {
    }

    ScreenshotWindowAsync(params, invocation) {
-        let [includeFrame, includeCursor, flash, filename] = params;
+        let [include_frame, include_cursor, flash, filename] = params;
        let screenshot = this._createScreenshot(invocation);
        if (!screenshot)
            return;
-        screenshot.screenshot_window (includeFrame, includeCursor, filename,
+        screenshot.screenshot_window (include_frame, include_cursor, filename,
            (o, res) => {
                try {
                    let [result, area, filenameUsed] =
@@ -143,11 +143,11 @@ var ScreenshotService = class {
    }

    ScreenshotAsync(params, invocation) {
-        let [includeCursor, flash, filename] = params;
+        let [include_cursor, flash, filename] = params;
        let screenshot = this._createScreenshot(invocation);
        if (!screenshot)
            return;
-        screenshot.screenshot(includeCursor, filename,
+        screenshot.screenshot(include_cursor, filename,
            (o, res) => {
                try {
                    let [result, area, filenameUsed] =
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -150,7 +150,7 @@ function destroyTestWindows() {
 * within a performance automation script
 */
 function defineScriptEvent(name, description) {
-    Shell.PerfLog.get_default().define_event(`script.${name}`,
+    Shell.PerfLog.get_default().define_event("script." + name,
                                             description,
                                             "");
 }
@@ -163,7 +163,7 @@ function defineScriptEvent(name, description) {
 * previously defined with defineScriptEvent
 */
 function scriptEvent(name) {
-    Shell.PerfLog.get_default().event(`script.${name}`);
+    Shell.PerfLog.get_default().event("script." + name);
 }

 /**
@@ -181,7 +181,7 @@ function _collect(scriptModule, outputFile) {
    for (let f in scriptModule) {
        let m = /([A-Za-z]+)_([A-Za-z]+)/.exec(f);
        if (m)
-            eventHandlers[`${m[1]}.${m[2]}`] = scriptModule[f];
+            eventHandlers[m[1] + "." + m[2]] = scriptModule[f];
    }

    Shell.PerfLog.get_default().replay(
@@ -224,15 +224,15 @@ function _collect(scriptModule, outputFile) {
            // Extra checks here because JSON.stringify generates
            // invalid JSON for undefined values
            if (metric.description == null) {
-                log(`Error: No description found for metric ${name}`);
+                log("Error: No description found for metric " + name);
                continue;
            }
            if (metric.units == null) {
-                log(`Error: No units found for metric ${name}`);
+                log("Error: No units found for metric " + name);
                continue;
            }
            if (metric.value == null) {
-                log(`Error: No value found for metric ${name}`);
+                log("Error: No value found for metric " + name);
                continue;
            }

@@ -241,10 +241,10 @@ function _collect(scriptModule, outputFile) {
            first = false;

            Shell.write_string_to_stream(out,
-                                         `{ "name": ${JSON.stringify(name)},\n` +
-                                         `    "description": ${JSON.stringify(metric.description)},\n` +
-                                         `    "units": ${JSON.stringify(metric.units)},\n` +
-                                         `    "value": ${JSON.stringify(metric.value)} }`);
+                                         '{ "name": ' + JSON.stringify(name) + ',\n' +
+                                         '    "description": ' + JSON.stringify(metric.description) + ',\n' +
+                                         '    "units": ' + JSON.stringify(metric.units) + ',\n' +
+                                         '    "value": ' + JSON.stringify(metric.value) + ' }');
        }
        Shell.write_string_to_stream(out, ' ]');

@@ -263,8 +263,8 @@ function _collect(scriptModule, outputFile) {
        print ('------------------------------------------------------------');
        for (let i = 0; i < metrics.length; i++) {
            let metric = metrics[i];
-            print (`# ${scriptModule.METRICS[metric].description}`);
-            print (`${metric}: ${scriptModule.METRICS[metric].value}${scriptModule.METRICS[metric].units}`);
+            print ('# ' + scriptModule.METRICS[metric].description);
+            print (metric + ': ' +  scriptModule.METRICS[metric].value + scriptModule.METRICS[metric].units);
        }
        print ('------------------------------------------------------------');
    }
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -214,13 +214,13 @@ var SearchResultsBase = class {
                    return;
                }
                if (metas.length != metasNeeded.length) {
-                    log(`Wrong number of result metas returned by search provider ${this.provider.id}: ` +
-                        `expected ${metasNeeded.length} but got ${metas.length}`);
+                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
+                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
                    callback(false);
                    return;
                }
                if (metas.some(meta => !meta.name || !meta.id)) {
-                    log(`Invalid result meta returned from search provider ${this.provider.id}`);
+                    log('Invalid result meta returned from search provider ' + this.provider.id);
                    callback(false);
                    return;
                }
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -128,7 +128,7 @@ function _loadMode(file, info) {
    let propBlacklist = ['unlockDialog'];
    for (let prop in _modes[DEFAULT_MODE]) {
        if (newMode[prop] !== undefined &&
-            !propBlacklist.includes(prop))
+            propBlacklist.indexOf(prop) == -1)
            _modes[modeName][prop] = newMode[prop];
    }
    _modes[modeName]['isPrimary'] = true;
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -27,8 +27,8 @@ var GnomeShell = class {
        this._grabbers = new Map();

        global.display.connect('accelerator-activated',
-            (display, action, device, timestamp) => {
-                this._emitAcceleratorActivated(action, device, timestamp);
+            (display, action, deviceid, timestamp) => {
+                this._emitAcceleratorActivated(action, deviceid, timestamp);
            });

        this._cachedOverviewVisible = false;
@@ -65,7 +65,7 @@ var GnomeShell = class {
                returnValue = '';
            success = true;
        } catch (e) {
-            returnValue = `${e}`;
+            returnValue = '' + e;
            success = false;
        }
        return [success, returnValue];
@@ -144,15 +144,14 @@ var GnomeShell = class {
        return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
    }

-    _emitAcceleratorActivated(action, device, timestamp) {
+    _emitAcceleratorActivated(action, deviceid, timestamp) {
        let destination = this._grabbedAccelerators.get(action);
        if (!destination)
            return;

        let connection = this._dbusImpl.get_connection();
        let info = this._dbusImpl.get_info();
-        let params = { 'device-id': GLib.Variant.new('u', device.get_device_id()),
-                       'device-node': GLib.Variant.new('s', device.get_device_node()),
+        let params = { 'device-id': GLib.Variant.new('u', deviceid),
                       'timestamp': GLib.Variant.new('u', timestamp),
                       'action-mode': GLib.Variant.new('u', Main.actionMode) };
        connection.emit_signal(destination,
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -118,7 +118,7 @@ function _setMenuAlignment(entry, stageX) {
    let [success, entryX, entryY] = entry.transform_stage_point(stageX, 0);
    if (success)
        entry.menu.setSourceAlignment(entryX / entry.width);
-}
+};

 function _onButtonPressEvent(actor, event, entry) {
    if (entry.menu.isOpen) {
@@ -131,14 +131,14 @@ function _onButtonPressEvent(actor, event, entry) {
        return Clutter.EVENT_STOP;
    }
    return Clutter.EVENT_PROPAGATE;
-}
+};

 function _onPopup(actor, entry) {
    let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
    if (success)
        entry.menu.setSourceAlignment(textX / entry.width);
    entry.menu.open(BoxPointer.PopupAnimation.FULL);
-}
+};

 function addContextMenu(entry, params) {
    if (entry.menu)
@@ -162,7 +162,7 @@ function addContextMenu(entry, params) {
        _onButtonPressEvent(actor, event, entry);
    });

-    entry.connect('popup-menu', actor => _onPopup(actor, entry));
+    entry.connect('popup-menu', actor => { _onPopup(actor, entry); });

    entry.connect('destroy', () => {
        entry.menu.destroy();
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -20,13 +20,23 @@ var WORK_SPINNER_ICON_SIZE = 16;
 const REMEMBER_MOUNT_PASSWORD_KEY = 'remember-mount-password';

 /* ------ Common Utils ------- */
+function _setLabelText(label, text) {
+    if (text) {
+        label.set_text(text);
+        label.show();
+    } else {
+        label.set_text('');
+        label.hide();
+    }
+}
+
 function _setButtonsForChoices(dialog, choices) {
    let buttons = [];

    for (let idx = 0; idx < choices.length; idx++) {
        let button = idx;
        buttons.unshift({ label: choices[idx],
-                          action: () => dialog.emit('response', button)
+                          action: () => { dialog.emit('response', button); }
                        });
    }

@@ -40,6 +50,11 @@ function _setLabelsForMessage(content, message) {
    content.body = labels.join('\n');
 }

+function _createIcon(gicon) {
+    return new St.Icon({ gicon: gicon,
+                         style_class: 'shell-mount-operation-icon' })
+}
+
 /* -------------------------------------------------------- */

 var ListItem = class {
@@ -579,7 +594,7 @@ var GnomeShellMountOpHandler = class {
    _setCurrentRequest(invocation, id, type) {
        let oldId = this._currentId;
        let oldType = this._currentType;
-        let requestId = `${id}@${invocation.get_sender()}`;
+        let requestId = id + '@' + invocation.get_sender();

        this._clearCurrentRequest(Gio.MountOperationResult.UNHANDLED, {});

--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -14,8 +14,8 @@ var Slider = class extends BarLevel.BarLevel {
            canFocus: true,
            reactive: true,
            accessibleRole: Atk.Role.SLIDER,
-        };
-        super(value, params);
+        }
+        super(value, params)

        this.actor.connect('button-press-event', this._startDragging.bind(this));
        this.actor.connect('touch-event', this._touchDragging.bind(this));
@@ -42,6 +42,8 @@ var Slider = class extends BarLevel.BarLevel {
        let [hasHandleColor, handleBorderColor] =
            themeNode.lookup_color('-slider-handle-border-color', false);

+        const TAU = Math.PI * 2;
+
        let handleX = handleRadius + (width - 2 * handleRadius) * this._value / this._maxValue;
        let handleY = height / 2;

@@ -142,7 +144,7 @@ var Slider = class extends BarLevel.BarLevel {
        if (direction == Clutter.ScrollDirection.DOWN) {
            delta = -SLIDER_SCROLL_STEP;
        } else if (direction == Clutter.ScrollDirection.UP) {
-            delta = SLIDER_SCROLL_STEP;
+            delta = +SLIDER_SCROLL_STEP;
        } else if (direction == Clutter.ScrollDirection.SMOOTH) {
            let [dx, dy] = event.get_scroll_delta();
            // Even though the slider is horizontal, use dy to match
@@ -183,9 +185,10 @@ var Slider = class extends BarLevel.BarLevel {
    }

    _moveHandle(absX, absY) {
-        let relX, sliderX;
-        [sliderX] = this.actor.get_transformed_position();
+        let relX, relY, sliderX, sliderY;
+        [sliderX, sliderY] = this.actor.get_transformed_position();
        relX = absX - sliderX;
+        relY = absY - sliderY;

        let width = this._barLevelWidth;
        let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius');
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -42,7 +42,7 @@ class ATIndicator extends PanelMenu.Button {
        this.add_child(this._hbox);

        this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
-        this._a11ySettings.connect(`changed::${KEY_ALWAYS_SHOW}`, this._queueSyncMenuVisibility.bind(this));
+        this._a11ySettings.connect('changed::' + KEY_ALWAYS_SHOW, this._queueSyncMenuVisibility.bind(this));

        let highContrast = this._buildHCItem();
        this.menu.addMenuItem(highContrast);
@@ -99,13 +99,13 @@ class ATIndicator extends PanelMenu.Button {
        GLib.Source.set_name_by_id(this._syncMenuVisibilityIdle, '[gnome-shell] this._syncMenuVisibility');
    }

-    _buildItemExtended(string, initialValue, writable, onSet) {
-        let widget = new PopupMenu.PopupSwitchMenuItem(string, initialValue);
+    _buildItemExtended(string, initial_value, writable, on_set) {
+        let widget = new PopupMenu.PopupSwitchMenuItem(string, initial_value);
        if (!writable)
            widget.actor.reactive = false;
        else
            widget.connect('toggled', item => {
-                onSet(item.state);
+                on_set(item.state);
            });
        return widget;
    }
@@ -117,7 +117,7 @@ class ATIndicator extends PanelMenu.Button {
            settings.is_writable(key),
            enabled => settings.set_boolean(key, enabled));

-        settings.connect(`changed::${key}`, () => {
+        settings.connect('changed::' + key, () => {
            widget.setToggleState(settings.get_boolean(key));

            this._queueSyncMenuVisibility();
@@ -149,7 +149,7 @@ class ATIndicator extends PanelMenu.Button {
                }
            });

-        interfaceSettings.connect(`changed::${KEY_GTK_THEME}`, () => {
+        interfaceSettings.connect('changed::' + KEY_GTK_THEME, () => {
            let value = interfaceSettings.get_string(KEY_GTK_THEME);
            if (value == HIGH_CONTRAST_THEME) {
                highContrast.setToggleState(true);
@@ -161,7 +161,7 @@ class ATIndicator extends PanelMenu.Button {
            this._queueSyncMenuVisibility();
        });

-        interfaceSettings.connect(`changed::${KEY_ICON_THEME}`, () => {
+        interfaceSettings.connect('changed::' + KEY_ICON_THEME, () => {
            let value = interfaceSettings.get_string(KEY_ICON_THEME);
            if (value != HIGH_CONTRAST_THEME)
                iconTheme = value;
@@ -173,9 +173,9 @@ class ATIndicator extends PanelMenu.Button {
    _buildFontItem() {
        let settings = new Gio.Settings({ schema_id: DESKTOP_INTERFACE_SCHEMA });
        let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-        let initialSetting = (factor > 1.0);
+        let initial_setting = (factor > 1.0);
        let widget = this._buildItemExtended(_("Large Text"),
-            initialSetting,
+            initial_setting,
            settings.is_writable(KEY_TEXT_SCALING_FACTOR),
            enabled => {
                if (enabled)
@@ -185,7 +185,7 @@ class ATIndicator extends PanelMenu.Button {
                    settings.reset(KEY_TEXT_SCALING_FACTOR);
            });

-        settings.connect(`changed::${KEY_TEXT_SCALING_FACTOR}`, () => {
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, () => {
            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
            let active = (factor > 1.0);
            widget.setToggleState(active);
--- a/js/ui/status/dwellClick.js
+++ b/js/ui/status/dwellClick.js
@@ -1,4 +1,5 @@
 const { Clutter, Gio, GLib, GObject, St } = imports.gi;
+const Mainloop = imports.mainloop;

 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -27,7 +28,7 @@ const DWELL_CLICK_MODES = {
                 name: _("Secondary Click"),
                 icon: 'pointer-secondary-click-symbolic',
                 type: Clutter.PointerA11yDwellClickType.SECONDARY
-    }
+               },
 };

 var DwellClickIndicator = GObject.registerClass(
@@ -44,8 +45,8 @@ class DwellClickIndicator extends PanelMenu.Button {
        this.add_child(this._hbox);

        this._a11ySettings = new Gio.Settings({ schema_id: MOUSE_A11Y_SCHEMA });
-        this._a11ySettings.connect(`changed::${KEY_DWELL_CLICK_ENABLED}`, this._syncMenuVisibility.bind(this));
-        this._a11ySettings.connect(`changed::${KEY_DWELL_MODE}`, this._syncMenuVisibility.bind(this));
+        this._a11ySettings.connect('changed::' + KEY_DWELL_CLICK_ENABLED, this._syncMenuVisibility.bind(this));
+        this._a11ySettings.connect('changed::' + KEY_DWELL_MODE, this._syncMenuVisibility.bind(this));

        this._deviceManager = Clutter.DeviceManager.get_default();
        this._deviceManager.connect('ptr-a11y-dwell-click-type-changed', this._updateClickType.bind(this));
@@ -71,9 +72,9 @@ class DwellClickIndicator extends PanelMenu.Button {
        this.menu.addAction(mode.name, this._setClickType.bind(this, mode), mode.icon);
    }

-    _updateClickType(manager, clickType) {
+    _updateClickType(manager, click_type) {
        for (let mode in DWELL_CLICK_MODES) {
-            if (DWELL_CLICK_MODES[mode].type == clickType)
+            if (DWELL_CLICK_MODES[mode].type == click_type)
                this._icon.icon_name = DWELL_CLICK_MODES[mode].icon;
        }
    }
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -60,7 +60,7 @@ var InputSource = class {
            return this.id;

        if (engineDesc.variant && engineDesc.variant.length > 0)
-            return `${engineDesc.layout}+${engineDesc.variant}`;
+            return engineDesc.layout + '+' + engineDesc.variant;
        else
            return engineDesc.layout;
    }
@@ -200,7 +200,7 @@ var InputSourceSystemSettings = class extends InputSourceSettings {
                                 try {
                                     props = conn.call_finish(result).deep_unpack()[0];
                                 } catch(e) {
-                                     log(`Could not get properties from ${this._BUS_NAME}`);
+                                     log('Could not get properties from ' + this._BUS_NAME);
                                     return;
                                 }
                                 let layouts = props['X11Layout'].unpack();
@@ -227,8 +227,8 @@ var InputSourceSystemSettings = class extends InputSourceSettings {

        for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
            let id = layouts[i];
-            if (variants[i])
-                id += `+${variants[i]}`;
+            if (!!variants[i])
+                id += '+' + variants[i];
            sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: id });
        }
        return sourcesList;
@@ -250,9 +250,9 @@ var InputSourceSessionSettings = class extends InputSourceSettings {
        this._KEY_PER_WINDOW = 'per-window';

        this._settings = new Gio.Settings({ schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA });
-        this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
-        this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this));
-        this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this));
+        this._settings.connect('changed::' + this._KEY_INPUT_SOURCES, this._emitInputSourcesChanged.bind(this));
+        this._settings.connect('changed::' + this._KEY_KEYBOARD_OPTIONS, this._emitKeyboardOptionsChanged.bind(this));
+        this._settings.connect('changed::' + this._KEY_PER_WINDOW, this._emitPerWindowChanged.bind(this));
    }

    _getSourcesList(key) {
@@ -539,7 +539,7 @@ var InputSourceManager = class {
            let exists = false;

            if (type == INPUT_SOURCE_TYPE_XKB) {
-                [exists, displayName, shortName] =
+                [exists, displayName, shortName, , ] =
                    this._xkbInfo.get_layout_info(id);
            } else if (type == INPUT_SOURCE_TYPE_IBUS) {
                if (this._disableIBus)
@@ -564,7 +564,7 @@ var InputSourceManager = class {
        if (infosList.length == 0) {
            let type = INPUT_SOURCE_TYPE_XKB;
            let id = KeyboardManager.DEFAULT_LAYOUT;
-            let [, displayName, shortName] = this._xkbInfo.get_layout_info(id);
+            let [ , displayName, shortName, , ] = this._xkbInfo.get_layout_info(id);
            infosList.push({ type: type, id: id, displayName: displayName, shortName: shortName });
        }

@@ -875,7 +875,7 @@ class InputSourceIndicator extends PanelMenu.Button {
            let is = this._inputSourceManager.inputSources[i];

            let menuItem = new LayoutMenuItem(is.displayName, is.shortName);
-            menuItem.connect('activate', () => is.activate(true));
+            menuItem.connect('activate', () => { is.activate(true); });

            let indicatorLabel = new St.Label({ text: is.shortName,
                                                visible: false });
@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {

        let description = xkbLayout;
        if (xkbVariant.length > 0)
-            description = `${description}\t${xkbVariant}`;
+            description = description + '\t' + xkbVariant;

        Util.spawn(['gkbd-keyboard-display', '-l', description]);
    }
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -8,6 +8,7 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const ModalDialog = imports.ui.modalDialog;
 const PermissionStore = imports.misc.permissionStore;
+const Signals = imports.signals;

 const { loadInterfaceXML } = imports.misc.fileUtils;

@@ -46,9 +47,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        super();

        this._settings = new Gio.Settings({ schema_id: LOCATION_SCHEMA });
-        this._settings.connect(`changed::${ENABLED}`,
+        this._settings.connect('changed::' + ENABLED,
                               this._onMaxAccuracyLevelChanged.bind(this));
-        this._settings.connect(`changed::${MAX_ACCURACY_LEVEL}`,
+        this._settings.connect('changed::' + MAX_ACCURACY_LEVEL,
                               this._onMaxAccuracyLevelChanged.bind(this));

        this._indicator = this._addIndicator();
@@ -241,7 +242,7 @@ var AppAuthorizer = class {
        this._onAuthDone = onAuthDone;

        let appSystem = Shell.AppSystem.get_default();
-        this._app = appSystem.lookup_app(`${this.desktopId}.desktop`);
+        this._app = appSystem.lookup_app(this.desktopId + ".desktop");
        if (this._app == null || this._permStoreProxy == null) {
            this._completeAuth();

--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -270,7 +270,7 @@ var NMConnectionSection = class NMConnectionSection {
        if (!item)
            return;

-        item.connect('icon-changed', () => this._iconChanged());
+        item.connect('icon-changed', () => { this._iconChanged(); });
        item.connect('activation-failed', (item, reason) => {
            this.emit('activation-failed', reason);
        });
@@ -498,10 +498,9 @@ var NMDeviceWired = class extends NMConnectionDevice {
            } else {
                return 'network-wired-disconnected-symbolic';
            }
-        } else {
+        } else
            return 'network-wired-disconnected-symbolic';
    }
-    }
 };

 var NMDeviceModem = class extends NMConnectionDevice {
@@ -579,7 +578,7 @@ var NMDeviceModem = class extends NMConnectionDevice {
    }

    _getSignalIcon() {
-        return `network-cellular-signal-${signalToIcon(this._mobileDevice.signal_quality)}-symbolic`;
+        return 'network-cellular-signal-' + signalToIcon(this._mobileDevice.signal_quality) + '-symbolic';
    }
 };

@@ -630,9 +629,9 @@ var NMWirelessDialogItem = GObject.registerClass({
                      can_focus: true,
                      reactive: true });

-        this.connect('key-focus-in', () => this.emit('selected'));
+        this.connect('key-focus-in', () => { this.emit('selected'); });
        let action = new Clutter.ClickAction();
-        action.connect('clicked', () => this.grab_key_focus());
+        action.connect('clicked', () => { this.grab_key_focus(); });
        this.add_action(action);

        let title = ssidToLabel(this._ap.get_ssid());
@@ -676,7 +675,7 @@ var NMWirelessDialogItem = GObject.registerClass({
        if (this._ap.mode == NM80211Mode.ADHOC)
            return 'network-workgroup-symbolic';
        else
-            return `network-wireless-signal-${signalToIcon(this._ap.strength)}-symbolic`;
+            return 'network-wireless-signal-' + signalToIcon(this._ap.strength) + '-symbolic';
    }
 });

@@ -917,7 +916,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
                            this._device.get_path(), accessPoints[0].get_path()]);
            } else {
                let connection = new NM.SimpleConnection();
-                this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);
+                this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null)
            }
        }

@@ -937,19 +936,19 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
            return accessPoint._secType;

        let flags = accessPoint.flags;
-        let wpaFlags = accessPoint.wpa_flags;
-        let rsnFlags = accessPoint.rsn_flags;
+        let wpa_flags = accessPoint.wpa_flags;
+        let rsn_flags = accessPoint.rsn_flags;
        let type;
-        if (rsnFlags != NM80211ApSecurityFlags.NONE) {
+        if (rsn_flags != NM80211ApSecurityFlags.NONE) {
            /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */
-            if (rsnFlags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
+            if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
 	        type = NMAccessPointSecurity.WPA2_ENT;
-            else if (rsnFlags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
+	    else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
 	        type = NMAccessPointSecurity.WPA2_PSK;
-        } else if (wpaFlags != NM80211ApSecurityFlags.NONE) {
-            if (wpaFlags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
+        } else if (wpa_flags != NM80211ApSecurityFlags.NONE) {
+            if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
                type = NMAccessPointSecurity.WPA_ENT;
-            else if (wpaFlags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
+            else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
 	        type = NMAccessPointSecurity.WPA_PSK;
        } else {
            if (flags & NM80211ApFlags.PRIVACY)
@@ -1041,7 +1040,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
    _checkConnections(network, accessPoint) {
        this._connections.forEach(connection => {
            if (accessPoint.connection_valid(connection) &&
-                !network.connections.includes(connection)) {
+                network.connections.indexOf(connection) == -1) {
                network.connections.push(connection);
            }
        });
@@ -1060,7 +1059,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {

        if (pos != -1) {
            network = this._networks[pos];
-            if (network.accessPoints.includes(accessPoint)) {
+            if (network.accessPoints.indexOf(accessPoint) != -1) {
                log('Access point was already seen, not adding again');
                return;
            }
@@ -1357,7 +1356,7 @@ var NMDeviceWireless = class {
        }

        if (this._canReachInternet())
-            return `network-wireless-signal-${signalToIcon(ap.strength)}-symbolic`;
+            return 'network-wireless-signal-' + signalToIcon(ap.strength) + '-symbolic';
        else
            return 'network-wireless-no-route-symbolic';
    }
@@ -1675,7 +1674,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
                                                  'network-transmit-receive');
            this._source.policy = new MessageTray.NotificationApplicationPolicy('gnome-network-panel');

-            this._source.connect('destroy', () => this._source = null);
+            this._source.connect('destroy', () => { this._source = null; });
            Main.messageTray.add(this._source);
        }
    }
@@ -1985,7 +1984,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
                } catch(e) { }
            });
        } else {
-            log(`Invalid result from portal helper: ${result}`);
+            log('Invalid result from portal helper: ' + result);
        }
    }

@@ -2020,7 +2019,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
            new PortalHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PortalHelper',
                                  '/org/gnome/Shell/PortalHelper', (proxy, error) => {
                                      if (error) {
-                                          log(`Error launching the portal helper: ${error}`);
+                                          log('Error launching the portal helper: ' + error);
                                          return;
                                      }

--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -21,7 +21,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        super();

        this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' });
-        this._desktopSettings.connect(`changed::${SHOW_BATTERY_PERCENTAGE}`,
+        this._desktopSettings.connect('changed::' + SHOW_BATTERY_PERCENTAGE,
                                      this._sync.bind(this));

        this._indicator = this._addIndicator();
@@ -112,7 +112,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        this._item.icon.icon_name = icon;

        // The icon label
-        let label;
+        let label
        if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED)
          label = _("%d\u2009%%").format(100);
        else
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -15,13 +15,13 @@ var AltSwitcher = class {
        this._standard.connect('notify::visible', this._sync.bind(this));
        if (this._standard instanceof St.Button)
            this._standard.connect('clicked',
-                                   () => this._clickAction.release());
+                                   () => { this._clickAction.release(); });

        this._alternate = alternate;
        this._alternate.connect('notify::visible', this._sync.bind(this));
        if (this._alternate instanceof St.Button)
            this._alternate.connect('clicked',
-                                    () => this._clickAction.release());
+                                    () => { this._clickAction.release(); });

        this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this));

@@ -32,7 +32,7 @@ var AltSwitcher = class {

        this.actor = new St.Bin();
        this.actor.connect('destroy', this._onDestroy.bind(this));
-        this.actor.connect('notify::mapped', () => this._flipped = false);
+        this.actor.connect('notify::mapped', () => { this._flipped = false; });
    }

    _sync() {
@@ -117,9 +117,9 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        this._createSubMenu();

        this._loginScreenItem.connect('notify::visible',
-                                      () => this._updateMultiUser());
+                                      () => { this._updateMultiUser(); });
        this._logoutItem.connect('notify::visible',
-                                 () => this._updateMultiUser());
+                                 () => { this._updateMultiUser(); });
        // Whether shutdown is available or not depends on both lockdown
        // settings (disable-log-out) and Polkit policy - the latter doesn't
        // notify, so we update the menu item each time the menu opens or
@@ -186,7 +186,10 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        let item;

        this._switchUserSubMenu = new PopupMenu.PopupSubMenuMenuItem('', true);
-        this._switchUserSubMenu.icon.icon_name = 'avatar-default-symbolic';
+        this._switchUserSubMenu.icon.set({
+            icon_name: 'avatar-default-symbolic',
+            style_class: 'system-switch-user-submenu-icon'
+        });

        // Since the label of the switch user submenu depends on the width of
        // the popup menu, and we can't easily connect on allocation-changed
@@ -303,13 +306,13 @@ var Indicator = class extends PanelMenu.SystemIndicator {


        this._settingsAction.connect('notify::visible',
-                                     () => this._updateActionsVisibility());
+                                     () => { this._updateActionsVisibility(); });
        this._orientationLockAction.connect('notify::visible',
-                                            () => this._updateActionsVisibility());
+                                            () => { this._updateActionsVisibility(); });
        this._lockScreenAction.connect('notify::visible',
-                                       () => this._updateActionsVisibility());
+                                       () => { this._updateActionsVisibility(); });
        this._altSwitcher.actor.connect('notify::visible',
-                                        () => this._updateActionsVisibility());
+                                        () => { this._updateActionsVisibility(); });
    }

    _onSettingsClicked() {
--- a/js/ui/status/thunderbolt.js
+++ b/js/ui/status/thunderbolt.js
@@ -108,7 +108,8 @@ var Client = class {
    }

    enrollDevice(id, policy, callback) {
-        this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE, (res, error) => {
+	this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE,
+                                       (res, error) => {
 	    if (error) {
 		Gio.DBusError.strip_remote_error(error);
 		callback(null, error);
@@ -259,7 +260,7 @@ var Indicator = class extends PanelMenu.SystemIndicator {
        if (!this._source) {
            this._source = new MessageTray.Source(_("Thunderbolt"),
                                                  'thunderbolt-symbolic');
-            this._source.connect('destroy', () => this._source = null);
+            this._source.connect('destroy', () => { this._source = null; });

            Main.messageTray.add(this._source);
        }
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -10,6 +10,8 @@ const Slider = imports.ui.slider;

 const ALLOW_AMPLIFIED_VOLUME_KEY = 'allow-volume-above-100-percent';

+var VOLUME_NOTIFY_ID = 1;
+
 // Each Gvc.MixerControl is a connection to PulseAudio,
 // so it's better to make it a singleton
 let _mixerControl;
@@ -32,7 +34,7 @@ var StreamSlider = class {
        this._slider = new Slider.Slider(0);

        this._soundSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.sound' });
-        this._soundSettings.connect(`changed::${ALLOW_AMPLIFIED_VOLUME_KEY}`, this._amplifySettingsChanged.bind(this));
+        this._soundSettings.connect('changed::' + ALLOW_AMPLIFIED_VOLUME_KEY, this._amplifySettingsChanged.bind(this));
        this._amplifySettingsChanged();

        this._slider.connect('value-changed', this._sliderChanged.bind(this));
@@ -213,7 +215,7 @@ var OutputStreamSlider = class extends StreamSlider {
        // of different identifiers for headphones, and I could
        // not find the complete list
        if (sink.get_ports().length > 0)
-            return sink.get_port().port.includes('headphone');
+            return sink.get_port().port.indexOf('headphone') >= 0;

        return false;
    }
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -392,7 +392,7 @@ var SwitcherList = GObject.registerClass({
        this._list.add_actor(bbox);

        let n = this._items.length;
-        bbox.connect('clicked', () => this._onItemClicked(n));
+        bbox.connect('clicked', () => { this._onItemClicked(n); });
        bbox.connect('motion-event', () => this._onItemEnter(n));

        bbox.label_actor = label;
@@ -525,8 +525,8 @@ var SwitcherList = GObject.registerClass({

    vfunc_get_preferred_width(forHeight) {
        let themeNode = this.get_theme_node();
-        let [maxChildMin] = this._maxChildWidth(forHeight);
-        let [minListWidth] = this._list.get_preferred_width(forHeight);
+        let [maxChildMin, ] = this._maxChildWidth(forHeight);
+        let [minListWidth, ] = this._list.get_preferred_width(forHeight);

        return themeNode.adjust_preferred_width(maxChildMin, minListWidth);
    }
--- a/Show More
+++ b/Show More