summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-11-04 10:29:41 -0500
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-11-04 10:29:41 -0500
commit764e0641825812caaa07b2b98b862ff2dff95c75 (patch)
treea6d1b0e105b144e38680b5341f245c40a4f94f53 /www/js
parenta125fc78799b904273a944fe7c8357d77faccbf5 (diff)
#49 - animated event number to show transition - animating the image doesn't look good as it takes time to load the image
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventCtrl.js17
1 files changed, 16 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 3c150d79..df63ed16 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1168,11 +1168,26 @@ angular.module('zmApp.controllers')
slidein = "animated slideInLeft";
}
var element = angular.element(document.getElementById("full-screen-event"));
- element.addClass(slideout).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', function () {element.removeClass(slideout);prepareModalEvent(eid); element.addClass(slidein); });
+ element.addClass(slideout).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', outWithOld);
+ function outWithOld()
+ {
+ element.removeClass(slideout);
+ prepareModalEvent(eid);
+ element.addClass(slidein).one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew );
+ }
+
+ function inWithNew()
+ {
+ element.removeClass(slidein);
+ }
};
+
+
+
+
//--------------------------------------------------------