Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,007 Commits 1 Branch 0 Tags
c380bd82aa1d6637e438367daa2e82d4e8ede394
Commit Graph

2007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prem Sichanugrist
c380bd82aa Fix subtitle scroll and hide subtitle transition 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
6f9870f75f Hide the caption first when on the iOS browser 
This prevent user from prematurely seeking the video.
 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3b0a1b7ee2 Fix test variable leakage 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3f7dc68828 Lazily build video slider when on iOS device 
This will fix the problem when user trying to click the seek button on
the iOS, as the video need to be started first before it can be
seekable.
 2012-06-04 15:30:56 -04:00
Kyle Fiedler
382dc62173 Added styles for non play button 2012-06-04 15:30:56 -04:00
Kyle Fiedler
a6852eefb8 Sprited vcr controlls and added default bg image 2012-06-04 15:30:55 -04:00
Prem Sichanugrist
fe849dedd9 Do not display play/pause button on iOS Device 
iOS devices has a restriction that user has to click on the video
element to initiate playback. By visually disable the button, user will
be forced to click on the video itself, and everything will be worked as
expected.

Fixes https://www.pivotaltracker.com/story/show/30334381
 2012-06-04 15:30:55 -04:00
Calen Pennington
7cf4b1597c Be more direct about where modx_dispatch is located and where it is used 2012-06-04 09:19:00 -04:00
Bridger Maxwell
e24df47b0b Small bug fix causing crash when generating problem histogram. 2012-06-01 17:34:04 -04:00
Bridger Maxwell
0ad31f556f The modx_dispatch import hack is added back in. Without it, the urls.py file was broken. 2012-06-01 17:22:34 -04:00
Calen Pennington
54ccffcb4c Merge pull request #80 from MITx/pmitros/dexml 
Pmitros/dexml
 2012-06-01 13:37:56 -07:00
Calen Pennington
b2477de7b4 Remove unused imports 2012-06-01 16:37:11 -04:00
Calen Pennington
d49d0b9119 Remove render_module in favor of render_x_module 2012-06-01 16:37:03 -04:00
Calen Pennington
794022733d Do json dumping and </script> replacement as close to the template as possible 2012-06-01 16:34:00 -04:00
Piotr Mitros
0a8a7795ff Fixed run script 2012-06-01 16:02:23 -04:00
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
Calen Pennington
725cbe14d1 Merge pull request #73 from MITx/create-dev-env 
Create dev env
 2012-06-01 12:47:22 -07:00
Calen Pennington
0cb316353d Merge pull request #79 from MITx/ps-fix-page-jumping 
Fix page jumping bug when click on the speeds list
 2012-06-01 12:46:56 -07:00
Calen Pennington
83b0c84e45 Merge pull request #78 from MITx/ps-fix-youtube-click 
Trigger a pause event when user click Youtube logo
 2012-06-01 12:46:23 -07:00
Calen Pennington
ff7068d81c Merge pull request #77 from MITx/ps-fix-courseware-nav-ios 
Fix problem with sequence navigation on iOS
 2012-06-01 12:45:28 -07:00
Prem Sichanugrist
d7043ea27f Fix page jumping bug when click on the speeds list 2012-06-01 13:36:14 -04:00
Prem Sichanugrist
bb18c854f7 Trigger a pause event when user click Youtube logo 
This will make sure that the play button is in the paused state.

Fixes https://www.pivotaltracker.com/story/show/26236143
 2012-06-01 13:33:27 -04:00
Piotr Mitros
be1e308dc9 Cale's fix for eval/extra json encode 2012-06-01 12:56:20 -04:00
Calen Pennington
b574dcb8e8 Check for None with is rather than == 2012-06-01 12:18:43 -04:00
Prem Sichanugrist
d20147932e Fix problem with sequence navigation on iOS 
* Add `touch-based-device` class to the <body> when running on iOS.
* Do not show the tooltip if we're on the iOS.
 2012-06-01 12:06:31 -04:00
Calen Pennington
71e25d9b4b According to the elementtree spec, elements with no children test as false. We only want to skip checking for module ids if the module is actually not found 2012-06-01 12:02:40 -04:00
Piotr Mitros
7567e5ebf9 Working snapshot. Simple get_children. get_module taken out of render_module. 2012-06-01 10:29:12 -04:00
Piotr Mitros
98d8f4b55b Unstable commit; syncing computers 2012-05-31 21:12:08 -04:00
John Jarvis
6c4a3cf618 updating for coffeescript 2012-05-31 14:54:38 -04:00
John Jarvis
178cdc877e removing mercurial from brew install list 2012-05-31 14:36:23 -04:00
John Jarvis
a385dc4d2e added install.txt, updated env script for better error handling 2012-05-31 14:34:50 -04:00
Piotr Mitros
97c6a26c2b Merge master 2012-05-31 13:47:50 -04:00
Piotr Mitros
34dc32e5aa Unstable state; need to merge from master 2012-05-31 13:44:45 -04:00
pmitros
585e4c8d52 Merge pull request #68 from MITx/enable-enrollment 
Add enrollment link back to main page for development purposes, until we...
 2012-05-31 10:43:21 -07:00
Calen Pennington
6eb2914043 Merge pull request #40 from MITx/courseware_module 
Courseware module rewrite
 2012-05-31 10:32:22 -07:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix 
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
0baa6293b5 Fix some failing spec after sequence module change 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
6d83534863 Fix bug on flashing speed selector 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
89194892e6 Move CoffeeScripts to asset pipeline 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
60094a1772 Add test coverage for JavaScript 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
b1daa59cea Refactor video caption to use binary search 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
8a87a4ba8b Make staff problem histogram work again 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
4298c920b8 Make show answer button toggleable 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
fc4d4c8295 Fix section convention and code highlight 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
5eac6ffa1d Refactor Problem from changes upstream 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
2bc68c0f25 Add path prefix to all AJAX requests 
This will handle the case where the site was deployed under a
path prefix.
 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
80ba9bd0ff Remove unused init_js and destroy_js 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
d393a503e6 Remove unused JavaScript on the page bottom 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
1abe15d4d9 Rewrite Problem module 2012-05-31 13:24:24 -04:00