* Fixed Bug: IE10 did not finish animation. Back navigation did not w…

…ork.
qooxdoo · Nov 13, 2012 · 7282cc9 · 7282cc9
1 parent 5805810
commit 7282cc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/framework/source/class/qx/core/Environment.js b/framework/source/class/qx/core/Environment.js
@@ -282,6 +282,10 @@
  *       <td>event.pointer</td><td><i>Boolean</i></td><td><code>true</code></td>
  *       <td>{@link qx.bom.client.Event#getPointer}</td>
  *     </tr>
+ *      <tr>
+ *       <td>event.mspointer</td><td><i>Boolean</i></td><td><code>true</code></td>
+ *       <td>{@link qx.bom.client.Event#getMsPointer}</td>
+ *     </tr>
  *     <tr>
  *       <td>event.touch</td><td><i>Boolean</i></td><td><code>false</code></td>
  *       <td>{@link qx.bom.client.Event#getTouch}</td>

diff --git a/framework/source/class/qx/ui/mobile/layout/Card.js b/framework/source/class/qx/ui/mobile/layout/Card.js
@@ -268,12 +268,19 @@ qx.Class.define("qx.ui.mobile.layout.Card",
       var fromElement = this.__currentWidget.getContainerElement();
       var toElement = widget.getContainerElement();
 
-      var fromCssClasses = this.__getAnimationClasses("out");
-      var toCssClasses = this.__getAnimationClasses("in");
+      var onAnimationEnd = qx.lang.Function.bind(this._onAnimationEnd, this);
+
+      if(qx.core.Environment.get("event.mspointer")) {
+        qx.bom.Event.addNativeListener(fromElement, "MSAnimationEnd", onAnimationEnd, false);
+        qx.bom.Event.addNativeListener(toElement, "MSAnimationEnd", onAnimationEnd, false);
+      }
 
       qx.event.Registration.addListener(fromElement, "animationEnd", this._onAnimationEnd, this);
       qx.event.Registration.addListener(toElement, "animationEnd", this._onAnimationEnd, this);
 
+      var fromCssClasses = this.__getAnimationClasses("out");
+      var toCssClasses = this.__getAnimationClasses("in");
+
       this._widget.addCssClass("animationParent");
       qx.bom.element.Class.addClasses(toElement, toCssClasses);
       qx.bom.element.Class.addClasses(fromElement, fromCssClasses);