Jon Buckley
|
1e8c9df865
|
Merge remote-tracking branch 'cadecairos/t551' into develop
|
2011-06-15 14:58:29 -04:00 |
Jon Buckley
|
ce9d71bc7f
|
Merge remote-tracking branch 'ScottDowne/t568' into develop
|
2011-06-15 14:46:08 -04:00 |
Jon Buckley
|
4ef9f228d3
|
Merge remote-tracking branch 'cadecairos/t542' into develop
|
2011-06-15 14:40:57 -04:00 |
Jon Buckley
|
4126af5fa1
|
Merge remote-tracking branch 'ScottDowne/t566' into develop
|
2011-06-15 14:35:43 -04:00 |
Jon Buckley
|
46f10f3636
|
Merge remote-tracking branch 'ScottDowne/wordrivermanifest' into develop
|
2011-06-15 13:07:41 -04:00 |
Jon Buckley
|
721082612f
|
Merge remote-tracking branch 'ScottDowne/t572' into develop
|
2011-06-14 09:51:45 -04:00 |
ScottDowne
|
e72cdde5fa
|
[#572] white space
|
2011-06-14 09:20:23 -04:00 |
ScottDowne
|
3cf18e1eca
|
[#572] fixed addtrackevent typo... and tests for it
|
2011-06-13 18:52:29 -04:00 |
Jon Buckley
|
6e02766e50
|
Merge remote-tracking branch 'cadecairos/t299b' into develop
|
2011-06-13 14:00:09 -04:00 |
Jon Buckley
|
af86d904df
|
Merge remote-tracking branch 'ScottDowne/t567' into develop
|
2011-06-13 12:22:41 -04:00 |
Christopher De Cairos
|
3acaa8f109
|
removed unused var, moved prop declaration to top of method, fixed styles, fixed copy-pasta typo, fixed logic error that I noticed in for loop
|
2011-06-13 12:07:28 -04:00 |
Jon Buckley
|
ece0daef46
|
Merge remote-tracking branch 'dseif/t557' into develop
|
2011-06-13 12:05:43 -04:00 |
Christopher De Cairos
|
0ab5cd3f42
|
modified tests
|
2011-06-13 11:06:09 -04:00 |
ScottDowne
|
7d635d2666
|
[#568] stable target names in manifest
|
2011-06-10 17:13:03 -04:00 |
ScottDowne
|
62b47f3fcf
|
[#567] removed dead code
|
2011-06-10 14:03:29 -04:00 |
ScottDowne
|
3aea6675e5
|
[#566] code plugin manifest function type added
|
2011-06-10 13:40:16 -04:00 |
ScottDowne
|
989bd6b233
|
added manifest to wordriver
|
2011-06-08 21:06:49 -04:00 |
Christopher De Cairos
|
796804d209
|
Merge branch 'master' of github.com:cadecairos/popcorn-js into t542
|
2011-06-08 18:45:53 -04:00 |
David Seifried
|
ef3cdf6f1d
|
[#557] Changed all occurences of tagName to nodeName
|
2011-06-08 10:39:33 -04:00 |
David Seifried
|
0976602b0a
|
[#557] Accidentally added an extra character at the start of the file
|
2011-06-08 10:38:33 -04:00 |
David Seifried
|
130c3d3e47
|
[#557] Fixed issue about an error being thrown when jquery dragable is being used
|
2011-06-08 10:37:17 -04:00 |
Christopher De Cairos
|
3a7f3d0157
|
cleaned up the branch so that the only changes are the tests that I added
|
2011-06-07 13:29:44 -04:00 |
Christopher De Cairos
|
9db72e4f84
|
fixed documentation errors
|
2011-06-07 11:42:12 -04:00 |
Christopher De Cairos
|
c047a72684
|
Merge branch 'develop' of https://github.com/jbuck/popcorn-js
|
2011-06-07 09:56:32 -04:00 |
Jon Buckley
|
29402e7d18
|
Merge remote-tracking branch 'dseif/t469' into develop
|
2011-06-03 16:45:42 -04:00 |
David Seifried
|
192aff6435
|
[#469] Fixed error throwing to use Popcorn.error and also switched to using setTimeout instead of setInterval as per requested
|
2011-06-03 15:28:35 -04:00 |
David Seifried
|
b05b9c34f8
|
Added a check to ensure the script was loaded before the mustache object was being accessed
|
2011-06-03 12:02:22 -04:00 |
Christopher De Cairos
|
d3a7d2a35b
|
Merge branch 'develop' of https://github.com/jbuck/popcorn-js
|
2011-06-03 10:29:50 -04:00 |
Jon Buckley
|
5ee6491d53
|
Merge remote-tracking branch 'rwldrn/t546b' into develop
|
2011-06-02 18:05:24 -04:00 |
Jon Buckley
|
f918216003
|
Merge remote-tracking branch 'cadecairos/t406' into develop
|
2011-06-02 18:01:36 -04:00 |
Jon Buckley
|
9dcb877e94
|
Merge remote-tracking branch 'cadecairos/t481' into develop
|
2011-06-02 18:00:19 -04:00 |
rwldrn
|
41ae819e09
|
Updates tests
|
2011-06-02 11:30:44 -04:00 |
rwldrn
|
d749372844
|
Restores Popcorn.getTrackEvent()
|
2011-06-02 11:30:25 -04:00 |
Christopher De Cairos
|
bf639655e7
|
Merge branch 'develop' of https://github.com/jbuck/popcorn-js
|
2011-06-02 11:27:56 -04:00 |
rwldrn
|
8e100faf9c
|
[#546] Implements track reference hash table, .ref static methods; Unit tests;
|
2011-06-02 11:08:11 -04:00 |
Jon Buckley
|
b5d0d11a82
|
Merge remote-tracking branch 'rwldrn/t540' into develop
|
2011-06-02 09:47:02 -04:00 |
rwldrn
|
f5d870ad46
|
Adds new Popcorn instance member: trackRefs - object, Store track event object references by trackId
|
2011-06-02 09:33:46 -04:00 |
rwldrn
|
b727e193de
|
Relocate Popcorn.removePlugin() to more appropriate location
|
2011-06-02 09:27:14 -04:00 |
Christopher De Cairos
|
64cb585fe4
|
fixed leaking var in unit tests, removed old vars. combined all var declaraitions into the one at the top. fixed single quotes
|
2011-06-01 19:05:13 -04:00 |
Christopher De Cairos
|
2565fac054
|
explicitly retur undefined if no trackEvent is found. minor change to tests
|
2011-06-01 18:53:28 -04:00 |
Christopher De Cairos
|
3034106383
|
fixed leaking var
|
2011-06-01 18:44:41 -04:00 |
Christopher De Cairos
|
b06a3bf667
|
modified the loop
|
2011-06-01 18:35:04 -04:00 |
Christopher De Cairos
|
2f3778484e
|
added getTrackEvent method to popcorn, added unit tests for it.
|
2011-06-01 18:13:56 -04:00 |
Christopher De Cairos
|
b296b12854
|
dried out code, removed baseplayerfrom tests, uses empty audio element instead.
|
2011-05-31 17:22:57 -04:00 |
Christopher De Cairos
|
69e9ea6597
|
fixed bug t481, created tests to enforce behaviour
|
2011-05-31 15:07:38 -04:00 |
Christopher De Cairos
|
d1946ef75c
|
added separate lint targets for plugin, player and parser unit tests. lint-plugin-tests, lint-parser-tests, lint-player-tests, lint-unit-tests (runs previous three)
|
2011-05-30 13:43:54 -04:00 |
Christopher De Cairos
|
7a7f18b077
|
Merge branch 'master' of https://github.com/webmademovies/popcorn-js
|
2011-05-30 13:13:09 -04:00 |
Christopher De Cairos
|
3755086760
|
fixed typo
|
2011-05-30 11:56:14 -04:00 |
Christopher De Cairos
|
0f44ec7ec6
|
made bad type default to like button, updated tests to reflect new behaviour
|
2011-05-30 11:42:46 -04:00 |
rwldrn
|
3556086f5e
|
[#540] Adds unit tests for Popcorn.events.getInterface();
|
2011-05-24 11:58:56 -04:00 |