grouped-window-list: Make appGroup's flashButton sane, fix invalid

source id.

There's no need for nesting here, or starting a new timeout
for each iteration.

Also, the highlight should stay active until the user focuses the
window, not removed at the end of the flash cycle.

Author: mtwebster

files/usr/share/cinnamon/applets/[email protected]/appGroup.js

@@ -1,6 +1,7 @@
 const Cinnamon = imports.gi.Cinnamon;
 const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
 const St = imports.gi.St;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -304,35 +305,40 @@ class AppGroup {
         if (this._needsAttention) return;
 
         this._needsAttention = true;
-        let counter = 0;
-        this.flashButton(counter);
+        this.flashButton();
     }
 
-    flashButton(counter) {
-        if (!this._needsAttention || !this.actor) return;
+    flashButton() {
+        if (!this._needsAttention || !this.actor || this._flashTimer)
+            return;
 
-        // If the app was closed during a flash sequence, stop looping.
-        if (!this.groupState.groupReady && this.groupState.isFavoriteApp) {
-            this.actor.remove_style_class_name('grouped-window-list-item-demands-attention');
+        if (!this.groupState.groupReady && this.groupState.isFavoriteApp)
             return;
-        }
 
-        this.actor.remove_style_pseudo_class('active');
-        this.actor.add_style_class_name('grouped-window-list-item-demands-attention');
-        if (counter < FLASH_MAX_COUNT) {
-            this.flashTimer = Mainloop.timeout_add(FLASH_INTERVAL, () => {
-                if (this.actor && this.actor.has_style_class_name('grouped-window-list-item-demands-attention')) {
-                    this.actor.remove_style_class_name('grouped-window-list-item-demands-attention');
-                    this.actor.add_style_pseudo_class('active');
-                }
+        let counter = 0;
+        const sc = "grouped-window-list-item-demands-attention";
 
-                this.flashTimer = Mainloop.timeout_add(FLASH_INTERVAL, () => {
-                    this.flashButton(++counter);
-                });
-            });
-        } else {
-            this.flashTimer = 0;
-        }
+        this.flashTimer = Mainloop.timeout_add(FLASH_INTERVAL, () => {
+            if (!this._needsAttention) {
+                this.flashTimer = 0;
+                return GLib.SOURCE_REMOVE;
+            }
+
+            if (this.actor.has_style_class_name(sc)) {
+                this.actor.add_style_class_name("active");
+                this.actor.remove_style_class_name(sc);
+            }
+            else {
+                this.actor.remove_style_class_name("active")
+                this.actor.add_style_class_name(sc);
+            }
+
+            const continueFlashing = (counter++ < FLASH_MAX_COUNT);
+            if (!continueFlashing) {
+                this.flashTimer = 0;
+            }
+            return continueFlashing;
+        });
     }
 
     getPreferredWidth(actor, forHeight, alloc) {
@@ -597,9 +603,7 @@ class AppGroup {
         if (hasFocus) {
             this.listState.trigger('updateFocusState', appId);
             this.actor.add_style_pseudo_class('focus');
-            if (this.actor.has_style_class_name('grouped-window-list-item-demands-attention')) {
-                this.actor.remove_style_class_name('grouped-window-list-item-demands-attention');
-            }
+            this.actor.remove_style_class_name('grouped-window-list-item-demands-attention');
             this._needsAttention = false;
         } else {
             this.actor.remove_style_pseudo_class('focus');