diff options
| author | Matias Niemelä | 2013-09-25 00:20:18 -0400 |
|---|---|---|
| committer | Misko Hevery | 2013-09-26 11:19:43 -0700 |
| commit | acc2fb84869ac1097434485d56bdc0265120fe34 (patch) | |
| tree | 6a6a57259e0a46b4be81e99ab40350ae903f194d /src/ngScenario | |
| parent | 3b3e89d5d6e7878bd8163631536e761f84255015 (diff) | |
| download | angular.js-acc2fb84869ac1097434485d56bdc0265120fe34.tar.bz2 | |
feat(browserTrigger): allow support for custom timeStamps in events
Diffstat (limited to 'src/ngScenario')
| -rw-r--r-- | src/ngScenario/browserTrigger.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ngScenario/browserTrigger.js b/src/ngScenario/browserTrigger.js index 3da6d5ea..c614218d 100644 --- a/src/ngScenario/browserTrigger.js +++ b/src/ngScenario/browserTrigger.js @@ -101,7 +101,7 @@ } catch(e) { evnt = document.createEvent('TransitionEvent'); - evnt.initTransitionEvent(eventType, null, null, null, eventData.elapsedTime); + evnt.initTransitionEvent(eventType, null, null, null, eventData.elapsedTime || 0); } } } @@ -116,7 +116,7 @@ } catch(e) { evnt = document.createEvent('AnimationEvent'); - evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime); + evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime || 0); } } } @@ -128,6 +128,11 @@ pressed('shift'), pressed('meta'), 0, element); } + /* we're unable to change the timeStamp value directly so this + * is only here to allow for testing where the timeStamp value is + * read */ + evnt.$manualTimeStamp = eventData.timeStamp; + if(!evnt) return; var originalPreventDefault = evnt.preventDefault, |