[BUG #6075] Showcase now uses the new animation layer.

qooxdoo · Apr 3, 2012 · c895a2e · c895a2e
1 parent 052724a
commit c895a2e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 290 deletions.
diff --git a/application/showcase/config.json b/application/showcase/config.json
@@ -71,10 +71,6 @@
           {
             "include" : ["showcase.page.databinding.Content"]
           },
-          "animation": 
-          {
-            "include" : ["showcase.page.animation.Content"]
-          },
           "dragdrop": 
           {
             "include" : ["showcase.page.dragdrop.Content"]

diff --git a/application/showcase/source/class/showcase/Application.js b/application/showcase/source/class/showcase/Application.js
@@ -223,35 +223,27 @@ qx.Class.define("showcase.Application",
     __cancelFade : function()
     {
       if (this.__effect) {
-        this.__effect.cancel();
-        this.__effect.dispose();
+        this.__effect.stop();
         this.__effect = null;
       }
     },
 
 
     __fadeIn : function(view)
     {
-      // no fades for IE, sorry!
-      if (qx.core.Environment.get("engine.name") == "mshtml") {
-        return;
-      }
-
-      view.getContentElement().setStyle("display", "none", true);
+      view.getContentElement().setStyle("opacity", 0, true);
       this.__cancelFade();
 
       qx.event.Timer.once(function() {
         var element = view.getContentElement().getDomElement();
-        this.__effect = new qx.fx.effect.core.Fade(element);
-        this.__effect.set({
-          from: 0,
-          to: 1
+        this.__effect = qx.bom.element.Animation.animate(element, {
+          duration: 1000,
+          keep: 100,
+          keyFrames : {
+            0 : {opacity: 0},
+            100 : {opacity: 1, display: "block"}
+          }
         });
-        this.__effect.addListenerOnce("update", function() {
-          view.getContentElement().setStyle("display", "block");
-        }, this);
-
-        this.__effect.start();
       }, this, 0);
     }
   },

diff --git a/application/showcase/source/class/showcase/page/animation/Content.js b/application/showcase/source/class/showcase/page/animation/Content.js
diff --git a/application/showcase/source/class/showcase/page/animation/Page.js b/application/showcase/source/class/showcase/page/animation/Page.js