[gnome-shell/wip/swarm: 7/10] viewSelector: Only animate with swarm on special cases

[Carlos Soriano <csoriano src gnome org>]

commit efff10c653ea7706eef31c378d973dcab75fd812
Author: Carlos Soriano <carlos soriano89 gmail com>
Date:   Tue Jun 17 20:58:50 2014 +0200

    viewSelector: Only animate with swarm on special cases

 js/ui/viewSelector.js |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 4d8684c..3d5cc51 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -229,9 +229,12 @@ const ViewSelector = new Lang.Class({
     },
 
     _animateIn: function(page, oldPage) {
+        log("_animateIn page " + page);
+        log("_animateIn oldPage " + oldPage);
+
         this._activePage.show();
 
-        if (page == this._appsPage) {
+        if (page == this._appsPage && oldPage == this._workspacesPage) {
             this.appDisplay.animate(IconGrid.ANIMATION_DIRECTION_IN);
         } else {
             this._fadePageIn(this._activePage);
@@ -239,7 +242,9 @@ const ViewSelector = new Lang.Class({
     },
 
     _animateOut: function(page, newPage, onComplete) {
-        if (page == this._appsPage) {
+        log("animeOut page " + page);
+        log("animeOut newPage " + newPage);
+        if (page == this._appsPage && newPage == this._workspacesPage) {
             this.appDisplay.animate(IconGrid.ANIMATION_DIRECTION_OUT,
                                     onComplete);
         } else {
@@ -264,11 +269,11 @@ const ViewSelector = new Lang.Class({
         let animateActivePage = Lang.bind(this,
             function() {
                 this._hidePageAndSyncEmpty(oldPage);
-                this._animateIn(this._activePage, oldPage);
+                this._animateIn(page, oldPage);
             });
 
         if (oldPage && animateOut)
-            this._animateOut(oldPage, newPage, animateActivePage)
+            this._animateOut(oldPage, page, animateActivePage)
         else
             animateActivePage();
     },