|
 |
efe155 |
From 994a37105b333ae9b72f285580a7847cd3ca4c5d Mon Sep 17 00:00:00 2001
|
|
|
efe155 |
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
|
efe155 |
Date: Tue, 23 Jul 2019 19:42:16 +0200
|
|
|
efe155 |
Subject: [PATCH 09/13] appDisplay: Add missing semicolon
|
|
|
efe155 |
|
|
|
efe155 |
This slipped through in commit eaa320 ...
|
|
|
efe155 |
|
|
|
efe155 |
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/640
|
|
|
efe155 |
---
|
|
|
efe155 |
js/ui/appDisplay.js | 3 ++-
|
|
|
efe155 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
efe155 |
|
|
|
efe155 |
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
|
|
|
efe155 |
index 8def0897f..e9c12462d 100644
|
|
|
efe155 |
--- a/js/ui/appDisplay.js
|
|
|
efe155 |
+++ b/js/ui/appDisplay.js
|
|
|
efe155 |
@@ -131,62 +131,63 @@ var BaseAppView = new Lang.Class({
|
|
|
efe155 |
|
|
|
efe155 |
this._items = {};
|
|
|
efe155 |
this._allItems = [];
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
_keyFocusIn(actor) {
|
|
|
efe155 |
// Nothing by default
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
removeAll() {
|
|
|
efe155 |
this._grid.destroyAll();
|
|
|
efe155 |
this._items = {};
|
|
|
efe155 |
this._allItems = [];
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
_redisplay() {
|
|
|
efe155 |
this.removeAll();
|
|
|
efe155 |
this._loadApps();
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
getAllItems() {
|
|
|
efe155 |
return this._allItems;
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
hasItem(id) {
|
|
|
efe155 |
return this._items[id] !== undefined;
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
addItem(icon) {
|
|
|
efe155 |
let id = icon.id;
|
|
|
efe155 |
+
|
|
|
efe155 |
if (this.hasItem(id))
|
|
|
efe155 |
- throw new Error(`icon with id ${id} already added to view`)
|
|
|
efe155 |
+ throw new Error(`icon with id ${id} already added to view`);
|
|
|
efe155 |
|
|
|
efe155 |
this._allItems.push(icon);
|
|
|
efe155 |
this._items[id] = icon;
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
_compareItems(a, b) {
|
|
|
efe155 |
return a.name.localeCompare(b.name);
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
loadGrid() {
|
|
|
efe155 |
this._allItems.sort(this._compareItems);
|
|
|
efe155 |
this._allItems.forEach(item => { this._grid.addItem(item); });
|
|
|
efe155 |
this.emit('view-loaded');
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
_selectAppInternal(id) {
|
|
|
efe155 |
if (this._items[id])
|
|
|
efe155 |
this._items[id].actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
|
|
|
efe155 |
else
|
|
|
efe155 |
log('No such application ' + id);
|
|
|
efe155 |
},
|
|
|
efe155 |
|
|
|
efe155 |
selectApp(id) {
|
|
|
efe155 |
if (this._items[id] && this._items[id].actor.mapped) {
|
|
|
efe155 |
this._selectAppInternal(id);
|
|
|
efe155 |
} else if (this._items[id]) {
|
|
|
efe155 |
// Need to wait until the view is mapped
|
|
|
efe155 |
let signalId = this._items[id].actor.connect('notify::mapped',
|
|
|
efe155 |
actor => {
|
|
|
efe155 |
if (actor.mapped) {
|
|
|
efe155 |
--
|
|
|
efe155 |
2.25.1
|
|
|
efe155 |
|