Commit Graph

4320 Commits

Author SHA1 Message Date
Valera Rozuvan
417bf6dd85 Removed some more comments. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
f9f9123ce4 Removed unnecessary commented out code from Jasmine tests. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
4f207299db Changed back handling of Video by original Video code. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
1f238b953b Fixed test for height of player when CC is disabled.
It turned out that we were reading the heights of the contols and other elements
before we initialized the heights.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
326d958727 Replaced Video with VideoAlpha.
Now all Video tags and VideoAlpha tags will be handled by VideoAlpha.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
f08394ac2c Volume and speeds dialogs are fully extended.
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
740a343b76 Styling improvements. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
6f431df910 Fixed bug dealing with empty subtitles Url string.
Now when subs parameter is empty or the YouTube IDs are not specified,
captions will not try to fetch non-existent file.
2013-08-09 09:22:56 +03:00
Valera Rozuvan
fb0efd1b16 Made it so that keyboard also prolongs auto hiding of controls. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
594ed6e0c3 Fixed failing test for VideoAlpha caption heiht.
It turns out that there was wrong invocation of toBeCloseTo() function. Most likely a typo.
Updated the readme.
2013-08-09 09:22:56 +03:00
Valera Rozuvan
d46542cba8 Removing JavaScript qTip tooltips.
Because sometimes the tooltips generated by qTip get in the way, and the controls becomes
not responsive, it was decided to use standard title attributes for tips.

Also along the way, an error was discoevered in Jasmine tests. It was fixed, but that test is
failing so it was marked specifically to be skipped when all VideoAlpha tests run.
2013-08-09 09:22:56 +03:00
Valera Rozuvan
b24ee15568 Fixed styling for volume button.
For some reason the "muted" icon was not showing. Styles have been corrected.Now on focus background color is also simplified for div
.volume control.
2013-08-09 09:22:56 +03:00
Valera Rozuvan
bc503c88c6 Making it possible to tab to captions.
When a VideoAlpha is present on the page, if the user tries to tab through out the entire page, eventually he will land on the VideoAlpha controls. The tab index order has been set up so that all control receive focus eventually in the order from left to right. When a control receives focus, it is hilighted. The last tab focuses the captions dialog. When the captions dialog has focus, the Up and Down arrows can scroll it up and down.
2013-08-09 09:22:56 +03:00
Chris Dodge
481eac7fc8 address PR feedback 2013-08-08 21:25:42 -04:00
Chris Dodge
55bfe46e79 need to filter out non-own metadata. Also we need to clone draft content 2013-08-08 21:25:42 -04:00
Christina Roberts
36b889349d Merge pull request #610 from edx/christina/popup-css
Workaround for popup CSS path being wrong (tinymce).
2013-08-08 07:40:16 -07:00
Vik Paruchuri
17c77dd157 Merge pull request #392 from edx/fix/vik/answer-unknown
Simplify save_grade and pass through answer_unknown
2013-08-08 07:28:03 -07:00
cahrens
1bb29e5414 Workaround for popup CSS path being wrong (tinymce).
STUD-178
2013-08-08 09:50:54 -04:00
chrisndodge
ece4ec3f57 Merge pull request #533 from edx/fix/cdodge/use-static-shorthand-for-asset-urls
To increase portability of courses, have the Asset Index page display the classic /static/... URL shorthand.
2013-08-08 06:32:35 -07:00
Vik Paruchuri
c9ddcd7868 Fix some pep8 violations 2013-08-08 08:34:40 -04:00
Vik Paruchuri
62c7255ac4 Use getlist 2013-08-08 08:34:40 -04:00
Vik Paruchuri
8b228dd64b Fix bad key naming 2013-08-08 08:34:39 -04:00
Vik Paruchuri
018601777b Simplify peer grading service calibration 2013-08-08 08:34:39 -04:00
Vik Paruchuri
dadb128bf8 Simplify save_grade and pass through answer_unknown 2013-08-08 08:34:39 -04:00
Sef Kloninger
fcb215a6df Merge pull request #547 from edx/sef/peer-eval-xmodule-date-error-master
fix crash in peer eval xmodule
2013-08-07 20:51:37 -07:00
Chris Dodge
c1e037918c add docstring on StaticContent utility method 2013-08-07 21:07:51 -04:00
Chris Dodge
bffec584f7 add docstring 2013-08-07 21:01:14 -04:00
Sarina Canelake
3a34529958 Need to call .save when modifying descriptor 2013-08-07 13:14:30 -04:00
Alexander Kryklia
495b5a366f Fix videoalpha import from xml
VideoAlphaDescriptor inherits from EmptyDataRawDescriptor.
EmptyDataRawDescriptor is used for modules which might not have any
XML data, but require XmlDescriptor's functionality for
export/import. Without it, VideoAlphaModule would cause a crash on
export if any modules had an empty `self.data` field.

Don't use default video if HTML5 sources are given.
2013-08-07 18:00:59 +03:00
Adam
147f7ed959 Merge pull request #573 from edx/fix/adam/ORA-load-image
tz fix in openendedchild
2013-08-06 12:15:54 -07:00
Peter Fogg
ae517fee01 Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml
Peter fogg/remove videoalpha xml
2013-08-06 11:06:46 -07:00
chrisndodge
c4d6102af6 Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module
tie in the normal courseware link url rewriting in capa module since tha...
2013-08-06 10:55:46 -07:00
Chris Dodge
6db1be6e00 add jasmine tests to verify link rewriting in HTML editor 2013-08-06 13:38:14 -04:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4 Convert Video Alpha to metadata-only. 2013-08-06 13:23:33 -04:00
Peter Fogg
74b815274f Add a list view for metadata editor.
This is to be used with VideoAlpha's functionality allowing a choice
of multiple HTML5 video sources.
2013-08-06 13:23:33 -04:00
Adam Palay
402d50bbf1 tz fix in openendedchild 2013-08-06 11:17:39 -04:00
Chris Dodge
7a180c290b handle cases where the 'base-asset-url' is undefined, e.g. in Jasmine tests 2013-08-06 11:16:37 -04:00
Alexander Kryklia
f3a4d49591 Adds RawDescriptro for VideoAlpha 2013-08-06 11:29:51 +03:00
Chris Dodge
dff3312178 refactor the coffeescript a bit more. Hopefully to resolve Jasmine failures 2013-08-05 21:50:55 -04:00
Chris Dodge
d2f911211e fix cut/paste comment confusion 2013-08-05 16:15:04 -04:00
Chris Dodge
da9a4b5d4f alter the HTML editor so that it can do the /static/ <--> /c4x/ substitutions when toggling back and forth between the visual and advanced editors 2013-08-05 16:15:03 -04:00
Chris Dodge
d329e3c833 don't attempt to do URL rewriting in the import step, let the LMS/CMS runtimes do it on the fly on reference 2013-08-05 16:15:03 -04:00
Chris Dodge
6200b2903f have the Files and Upload pages surface a 'portable_url' which uses the /static/ shorthand which is more portable across course runs 2013-08-05 16:15:03 -04:00
Chris Dodge
9e96b9525b tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py 2013-08-05 15:24:19 -04:00
Alexander Kryklia
16cee198b1 Merge pull request #386 from edx/alex/editor-tabs-for-videoalpha
adds TabsEditingDescriptor, pluggen in VideoAlphaDescriptor
2013-08-05 08:57:53 -07:00
Valera Rozuvan
a0aa652df4 Fixed typo of function call. Added comment why it is necessary. 2013-08-05 15:00:18 +03:00
Alexander Kryklia
6225c2a532 Fixes 2013-08-05 13:38:32 +03:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha
Updates comment
Make Model descriptor class property.
Fix tests
2013-08-05 13:38:32 +03:00