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

3981 Commits

Author SHA1 Message Date
brianhw
014089e62a Merge pull request #1364 from edx/ned/cherry-pick-pr-1297 
Add EmptyDataRawDescriptor.
 2013-10-16 09:09:19 -07:00
polesye
de48e4a9d6 Add EmptyDataRawDescriptor. 2013-10-16 10:39:02 -04:00
Valera Rozuvan
4b371d4748 Fixing Jean Michel access. bug. 2013-10-16 15:45:13 +03:00
Valera Rozuvan
30ddaf7757 Enabling showing of captions always when mouse is over CC. 2013-10-16 15:45:08 +03:00
polesye
0bd706b6a1 Tidy up the code. 2013-10-16 15:44:55 +03:00
Valera Rozuvan
c3030e8f94 Fixing minor typo. 2013-10-16 15:44:50 +03:00
Valera Rozuvan
f17a84c965 Minor tweak. 2013-10-16 15:44:45 +03:00
Valera Rozuvan
3b7cc6a419 Furthe addressing comments on PR. 2013-10-16 15:44:40 +03:00
Valera Rozuvan
05eb13f086 Fixing JS. 
There were previous merge conflicts in the file.
 2013-10-16 15:44:35 +03:00
Valera Rozuvan
2a6418ec04 Updated fixtures for Jasmine tests. 2013-10-16 15:44:11 +03:00
Valera Rozuvan
49f4a71178 Added functionality to show captions on "CC" button mousemove. 
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
 2013-10-16 15:44:05 +03:00
Valera Rozuvan
a1e0f7116a Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-16 15:43:58 +03:00
Valera Rozuvan
9f871e53c8 Updated code fomat in test Jasmine. 2013-10-16 15:43:50 +03:00
Valera Rozuvan
6713d6c7e3 Work in progress. 2013-10-16 15:43:42 +03:00
brianhw
7cfe279fb5 Merge pull request #1348 from edx/dhm/bug_publish 
Delete on publish to prevent orphans
 2013-10-15 11:46:57 -07:00
Don Mitchell
5e1f03bb52 Publish removes deleted children 2013-10-02 16:06:58 -04:00
Don Mitchell
18c45879bc Test reproducing orphaning of children 
when draft is deleted and then parent published.
ensure moving doesn't cause deletion
 2013-10-02 16:06:58 -04:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
eeb38302d3 Fixed failing test. 2013-10-02 15:55:22 +02:00
jmclaus
332bfa9627 Added more explanatory states to the Volume, Fullscreen, HD, and CC controls 2013-10-02 15:55:22 +02:00
jmclaus
a3db5da994 Code cleanup 2013-10-02 15:55:22 +02:00
jmclaus
cd12492e08 Disabled one test in video_quality_control 2013-10-02 15:55:22 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
a9b2f2dea0 Volume slider announces its name and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
jmclaus
dfe45d5bd6 First pass at ARIA. Video player buttons announce themselves as button when used with a screen reader 2013-10-02 15:55:22 +02:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04:00
Ned Batchelder
0bb11335b2 We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability. 2013-10-01 13:53:59 -04:00
Ned Batchelder
cdb80bb8ed Fix the new tests to use the new way to make XBlocks. 2013-09-30 21:09:44 -04:00
Ned Batchelder
718328e4e6 Get rid of all mention of XModuleDescriptor. 2013-09-30 21:09:43 -04:00
Ned Batchelder
a1d464aed9 Update XBlock requirement to new XML code. 2013-09-30 21:09:43 -04:00
Ned Batchelder
3a6450c3fc Use XModuleDescriptor.parse_xml to interpret XML. 2013-09-30 21:09:43 -04:00
Ned Batchelder
c36adf84a0 Minor cosmetic code fixes. 2013-09-30 21:09:43 -04:00
Ned Batchelder
d7e441088b Adjust parameters to construct_xblock_from_class to match XBlock repo. 2013-09-30 21:09:43 -04:00
jmclaus
aeac8dddbb All video controls have a full outline when receiving focus 2013-09-30 20:47:05 +02:00
jmclaus
427f1184ae Merge pull request #1150 from edx/jmclaus/bugfix_outline_mouseover_first_caption 
First caption does not display outline on initial mouseover.
 2013-09-30 07:26:30 -07:00
Vik Paruchuri
577749ff80 Merge pull request #1163 from edx/fix/vik/image-upload 
Streamling, test, and fix issues with image uploading
 2013-09-27 15:34:23 -07:00
Vik Paruchuri
19fb2017be Streamline and test uploading ... remove requirement that uploads be images, can now upload any file. 2013-09-27 17:08:34 -04:00
Don Mitchell
d79220122c Change DescriptionLocator to DefinitionLocator 2013-09-27 16:27:02 -04:00
Adam Palay
202e4f94e7 make seq tooltips appear on focus 
remove focus from tab when clicked
 2013-09-27 16:22:46 -04:00
Don Mitchell
f8c7278470 Follow patterns 
Move init to top of class
Change asserts to more meaningful exception types
Refactor hard-to-read fn
 2013-09-27 16:03:57 -04:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard 
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
 2013-09-27 11:29:06 -07:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Calen Pennington
f4dd50826a Merge pull request #1055 from cpennington/cleanup-xml-hotfix 
Clean up after hotfix to fix xml loading for import
 2013-09-27 09:24:22 -07:00
Valera Rozuvan
36fc1a6243 Fix for PR 1119. 
A Jasmine test was falling. It went unnoticed. The PR was merged. This
is a fix for it.
 2013-09-27 18:43:58 +03:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Shiwen Cheng
522cb8b48c fix the video caption lag issue 2013-09-27 22:41:36 +08:00
Shiwen Cheng
77f3e4f964 fix the bug: when click a caption, the previous one will be in bold 2013-09-27 22:41:35 +08:00
Shiwen Cheng
21a9446b99 fix the bug that the first caption and the second one will become current at the same time when displaying right captions 2013-09-27 22:41:35 +08:00