[gnome-shell/wip/overviewTransitions: 1/4] viewSelector: Remove duplicate call to showPage

[Carlos Soriano <csoriano src gnome org>]

commit 25f94dec5321929a5b13da315e7e1229ccf3bcb2
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Mon Jul 14 18:55:34 2014 +0200

    viewSelector: Remove duplicate call to showPage
    
    We were caling twice showPage() with the correct
    page, here and in show() / animateFromOverview given
    that _resetShowAppsbutton was called from the signal
    'showing' of overview.
    Also, this call here doesn't belong at all to reseting
    the button.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732901

 js/ui/viewSelector.js |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 778bb57..7d10f97 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -251,13 +251,11 @@ const ViewSelector = new Lang.Class({
         this._stageKeyPressId = 0;
         Main.overview.connect('showing', Lang.bind(this,
             function () {
-                this._resetShowAppsButton();
                 this._stageKeyPressId = global.stage.connect('key-press-event',
                                                              Lang.bind(this, this._onStageKeyPress));
             }));
         Main.overview.connect('hiding', Lang.bind(this,
             function () {
-                this._resetShowAppsButton();
                 if (this._stageKeyPressId != 0) {
                     global.stage.disconnect(this._stageKeyPressId);
                     this._stageKeyPressId = 0;
@@ -319,6 +317,7 @@ const ViewSelector = new Lang.Class({
     },
 
     zoomFromOverview: function() {
+        this._showAppsButton.checked = false;
         this._workspacesDisplay.zoomFromOverview();
 
         if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
@@ -370,7 +369,7 @@ const ViewSelector = new Lang.Class({
             });
     },
 
-    _showPage: function(page, noFade) {
+    _showPage: function(page) {
         if (page == this._activePage)
             return;
 
@@ -378,7 +377,7 @@ const ViewSelector = new Lang.Class({
         this._activePage = page;
         this.emit('page-changed');
 
-        if (oldPage && !noFade)
+        if (oldPage)
             Tweener.addTween(oldPage,
                              { opacity: 0,
                                time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
@@ -389,7 +388,7 @@ const ViewSelector = new Lang.Class({
                                    })
                              });
         else
-            this._fadePageIn(oldPage);
+            this._fadePageIn();
     },
 
     _a11yFocusPage: function(page) {
@@ -405,14 +404,6 @@ const ViewSelector = new Lang.Class({
                        this._appsPage : this._workspacesPage);
     },
 
-    _resetShowAppsButton: function() {
-        this._showAppsBlocked = true;
-        this._showAppsButton.checked = false;
-        this._showAppsBlocked = false;
-
-        this._showPage(this._workspacesPage, true);
-    },
-
     _onStageKeyPress: function(actor, event) {
         // Ignore events while anything but the overview has
         // pushed a modal (system modals, looking glass, ...)