Merge branch 'dev' into beta

2016-01-06 12:28:05 -05:00
parent 8faeb9acd2 e85478586e
commit 24a456b877
1 changed files with 4 additions and 4 deletions
@@ -91,10 +91,10 @@
            elem.classList.add('hide');
        };

-        //if (!browserInfo.animate || browserInfo.mobile) {
+        if (!browserInfo.animate || browserInfo.mobile) {
            onfinish();
            return;
-        //}
+        }

        requestAnimationFrame(function () {
            var keyframes = [
@@ -113,9 +113,9 @@

        elem.classList.remove('hide');

-        //if (!browserInfo.animate || browserInfo.mobile) {
+        if (!browserInfo.animate || browserInfo.mobile) {
            return;
-        //}
+        }

        requestAnimationFrame(function () {