VesperOS/gnome-shell-extensions
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apps-menu: Clean up code

Browse Source 
The empty array is created and inserted into the hashtable before
every call to _loadCategory. No need to check for it and create it
again inside the function.

Don't mix up negated if conditions with continue while skipping stuff
that should not be displayed. Follow one style for consistency.

https://bugzilla.gnome.org/show_bug.cgi?id=693346
This commit is contained in:
Debarshi Ray
2013-02-01 14:51:25 +01:00
parent 92ccfc0e0d
commit c626cc2a1d
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/apps-menu/extension.js
+16 -20
View File
@@ -318,21 +318,18 @@ const ApplicationsButton = new Lang.Class({
if (!entry.get_app_info().get_nodisplay()) {
let app = appSys.lookup_app_by_tree_entry(entry);
let menu_id = dir.get_menu_id();
if (!this.applicationsByCategory[menu_id])
this.applicationsByCategory[menu_id] = new Array();
this.applicationsByCategory[menu_id].push(app);
}
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
let subdir = iter.get_directory();
if (subdir.get_is_nodisplay())
continue;
let menu_id = subdir.get_menu_id();
this.applicationsByCategory[menu_id] = new Array();
this._loadCategory(subdir);
if (this.applicationsByCategory[menu_id].length > 0) {
let categoryMenuItem = new CategoryMenuItem(this, subdir);
this.categoriesBox.add_actor(categoryMenuItem.actor);
if (!subdir.get_is_nodisplay()) {
let menu_id = subdir.get_menu_id();
this.applicationsByCategory[menu_id] = new Array();
this._loadCategory(subdir);
if (this.applicationsByCategory[menu_id].length > 0) {
let categoryMenuItem = new CategoryMenuItem(this, subdir);
this.categoriesBox.add_actor(categoryMenuItem.actor);
}
}
}
}
@@ -431,15 +428,14 @@ const ApplicationsButton = new Lang.Class({
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
if (nextType == GMenu.TreeItemType.DIRECTORY) {
let dir = iter.get_directory();
if (dir.get_is_nodisplay())
continue;
let menu_id = dir.get_menu_id();
this.applicationsByCategory[menu_id] = new Array();
this._loadCategory(dir);
if (this.applicationsByCategory[menu_id].length > 0) {
let categoryMenuItem = new CategoryMenuItem(this, dir);
this.categoriesBox.add_actor(categoryMenuItem.actor);
if (!dir.get_is_nodisplay()) {
let menu_id = dir.get_menu_id();
this.applicationsByCategory[menu_id] = new Array();
this._loadCategory(dir);
if (this.applicationsByCategory[menu_id].length > 0) {
let categoryMenuItem = new CategoryMenuItem(this, dir);
this.categoriesBox.add_actor(categoryMenuItem.actor);
}
}
}
}