Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Commits on Aug 15, 2012
FLUID-4744: Changed ToggleButton so that it accepts another option to…
… set a tooltip not to the toggle button but to a custom container provided by a parent containing this ToggleButton
Commits on Aug 20, 2012
Cindy Qi Li
Cindy Qi Li
FLUID-4775: The first cut of making use of media element library to s…
…upport IE8 without breaking the video player on html5 browsers. Also replaced HTML5-backcompat.js with html5shiv.
Commits on Aug 21, 2012
Commits on Aug 22, 2012
Commits on Aug 23, 2012
Cindy Qi Li
Cindy Qi Li
FLUID-4775: Removed html5MediaTime since with media element library i…
…n IE8, the attach of video event listeners must occur in the success callback of the object creation. html5MediaTime was attaching listener for "timeupdate" event outside of this scope, as a result, the listener is never triggered in IE8.
Commits on Aug 24, 2012
FLUID-4779: Hiding fullscreen button for Opera and IE since those bro…
…wsers do not support video full screen mode. Added tests as well.
FLUID-4744: Changing all occurrences of toolTip to be tooltip. Fixed …
…CSS a bit. Tested CSS on Chrome, Safari, IE9 and FF and it looks good.
Cindy Qi Li
Cindy Qi Li
FLUID-4755: Fixed various IE8 issues: click on video container to sta…
…rt/pause video, scrubber bar click to advance/rewind video, mute and volume adjusting, js error thrown by transcript or caption button click, unit tests.
Commits on Aug 30, 2012
Commits on Aug 31, 2012
Commits on Sep 04, 2012
FLUID-4744: Using tooltipContentFunction instead of contentFunction. …
…Adding CSS so that tooltip is always on top of the videoPlayer controls. Movind mouseleave and mouseenter into bindDOMEvents function. Dehydrating bindDOMEvents function. Using string in the options to retreive Volume string for a tooltip
Cindy Qi Li
Cindy Qi Li
FLUID-4775: Merge branch 'demo' into FLUID-4775 and fix conflicts.
Conflicts:
	js/MenuButton.js
	js/VideoPlayer.js
FLUID-4744: Added cleanup for tests by removing focus from the items.…
… Also changed a code a bit so that tooltipContainer always represents a proper container for a tooltip in a toggleButton even when options was not supplied.
Commits on Sep 05, 2012
Commits on Sep 06, 2012
Commits on Sep 07, 2012
Commits on Sep 11, 2012
FLUID-4779: Using IOC setting fullscreen button to be an empty subcom…
…ponent. Also making button to be invisible if the toggleButton is an empty subcomponent through css class modifications. Rewriting tests to reflect that.
Commits on Sep 12, 2012
Commits on Sep 13, 2012
FLUID-4779: Adding requestFullScreen for supportsFullScreenMode flag …
…in case if browsers will be using the same API instead of vendor prefixed functionality.
Merge branch 'FLUID-4779' into demo
* FLUID-4779:
  FLUID-4779: Minor renaming of full screen feature detect to match convention.
  FLUID-4779: missed v.requestFullScreen
  FLUID-4779: Adding requestFullScreen for supportsFullScreenMode flag in case if browsers will be using the same API instead of vendor prefixed functionality.
  FLUID-4779: Using proper demands to hide a fullscreen button. using a proper name for the fullscreen feature
  FLUID-4779: Fixing css rules to be cleaner. Removing useless feature.
  FLUID-4779: Reversed my changes. Showing fullscreen button only if init styling is present on the button.
  FLUID-4779: Removing a comment.
  FLUID-4779: Using IOC setting fullscreen button to be an empty subcomponent. Also making button to be invisible if the toggleButton is an empty subcomponent through css class modifications. Rewriting tests to reflect that.
  FLUID-4779: Making code more robust and less dependent on the browser type
  FLUID-4779: Removing this hideous git add js/VideoPlayer.js! statement
  FLUID-4779: A small test fix.
  FLUID-4779: Hiding fullscreen button for Opera and IE since those browsers do not support video full screen mode. Added tests as well.
Commits on Sep 14, 2012
Commits on Sep 17, 2012
FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondl…
…y now captions should be off be default. And lastly Safari will have default captions turned off be default.
Commits on Sep 18, 2012
Commits on Sep 19, 2012
FLUID-4787: Fixed comments. Removed extra comments. Removed multiline…
… vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5
Commits on Sep 20, 2012
Merge remote-tracking branch 'acheetham/FLUID-4783' into demo
* acheetham/FLUID-4783:
  FLUID-4783: Updating the Infusion Readme to document UI Options HTML customizations
  FLUID-4783: Ensure the basic demo includes the UIO media panel.
Commits on Sep 21, 2012
Commits on Sep 24, 2012
Commits on Sep 25, 2012
Merge remote-tracking branch 'anvk/FLUID-4793' into demo
* anvk/FLUID-4793:
  FLUID-4793: Fixing test JSON and VTT files
  FLUID-4793: Fixing timestamps for vtt files
  FLUID-4793: Fixing time stamps for JSON transcript files
Commits on Sep 26, 2012
Commits on Sep 27, 2012
Commits on Sep 28, 2012
Commits on Oct 01, 2012
Commits on Oct 02, 2012
Commits on Oct 04, 2012
Merge remote-tracking branch 'acheetham/FLUID-4792' into demo
* acheetham/FLUID-4792:
  FLUID-4792: Ensure transcript is not re-rendered unless it has to be
  FLUID-4792: Ensure keyboard-a11y of transcripts each time new transcript is displayed (not just loaded).
Merge remote-tracking branch 'acheetham/FLUID-4801' into demo
* acheetham/FLUID-4801:
  FLUID-4801: Ensure the <object> element inside the <video> element is not in the tab order (for IE9).
Merge remote-tracking branch 'acheetham/FLUID-4749' into demo
* acheetham/FLUID-4749:
  FLUID-4749: Add title to volume controls container.
Merge remote-tracking branch 'anvk/FLUID-4661' into demo
* anvk/FLUID-4661:
  FLUID-4661: One more tiny code dehydration
  FLUID-4661: Code refactoring after FLUID-4779 got in
  FLUID-4661: Making code more readable and using apply() instead of calling function by its name through videoEl object
  FLUID-4661: Refactoring some of the code to be more robust
Commits on Oct 05, 2012
Merge branch 'FLUID-4744' into demo
* FLUID-4744:
  FLUID-4744: Linting.
  FLUID-4744: Removing useless option
  FLUID-4744: Using tooltip component for ToggleButtons instead of hardcoding it in the preInit. Also rewriting tests for volumeControl tooltip checks
  FLUID-4744: Refactoring code according to the pull request comments
  FLUID-4744: Added cleanup for tests by removing focus from the items. Also changed a code a bit so that tooltipContainer always represents a proper container for a tooltip in a toggleButton even when options was not supplied.
  FLUID-4744: Adding tests and changing naming to make options more clear.
  FLUID-4744: Using tooltipContentFunction instead of contentFunction. Adding CSS so that tooltip is always on top of the videoPlayer controls. Movind mouseleave and mouseenter into bindDOMEvents function. Dehydrating bindDOMEvents function. Using string in the options to retreive Volume string for a tooltip
  FLUID-4744: Changing volume control tooltip if mouse hovers over the volume slider
  FLUID-4744: Changing all occurrences of toolTip to be tooltip. Fixed CSS a bit. Tested CSS on Chrome, Safari, IE9 and FF and it looks good.
  FLUID-4744: Changed ToggleButton so that it accepts another option to set a tooltip not to the toggle button but to a custom container provided by a parent containing this ToggleButton
Commits on Oct 09, 2012
Merge branch 'demo' into FLUID-4786
Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_controllers.js
	js/VideoPlayer_transcript.js
Merge remote-tracking branch 'acheetham/FLUID-4786' into demo
* acheetham/FLUID-4786:
  FLUID-4786: A bit more code clean-up
  FLUID-4786: Add one MenuButton test
  FLUID-4786: Add aria-controls to captions menu using same method as transcripts menu.
  FLUID-4786: Code clean-up.
  FLUID-4786: Clean-up, de-linting.
  FLUID-4786: Clean up arguments to events
  FLUID-4786: Code clean-up; move boiled event args specification to a demands block
  FLUID-4786: Start cleaning up MenuButton.js; revert infusion to master
  FLUID-4786: Clean up tests for aria-controls
  FLUID-4786: Working on tests for aria-controls
  FLUID-4786: Get the ID of the transcript area to the aria-controls setup function
  FLUID-4786: More code clean-up
  FLUID-4786: Convey menu and transcrip to menu component, start cleaning up; need to move stuff into demands blocks
  FLUID-4786: Successfully convey controls and transcript to controls-level function
  FLUID-4786: temporary commit
  FLUID-4786: Temporary commit
  FLUID-4786: in-progress commit
  FLUID-4786: Back out the transcript menu 'aria-controls' work
  FLUID-4786: aria-controls on transcript area language drop-down
  FLUID-4786: Replace deferredCall with dom binder reference
  FLUID-4786: Add aria-controls to MenuButton button, referencing the menu
  FLUID-4786: Add comments noting problem with transcript subcomponent instantiation
  FLUID-4786: Fix bug where transcript subcomponent was being instantiated twice.
  FLUID-4786: First pass at setting up the 'aria-controls' attribute.
  FLUID-4786: Use decorators to add aria attributes; use menuitemcheckbox instead of menuitem
  FLUID-4786: Tests for ARIA
  FLUID-4786: Expaning ARIA on MenuButton.
  FLUID-4786: Add ARIA to the MenuButton components.
Commits on Oct 10, 2012
Merge branch 'demo' into FLUID-4701
Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_html5Captionator.js
Merge branch 'demo' into FLUID-4795
Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_html5Captionator.js
FLUID-4803: First pass at qunit upgrade.
Tests don't run in Safari and Chrome on Mac yet.
FLUID-4701: Changing to using 'invoke' instead of 'invokeGlobalFuncti…
…on' so that it would be possible for an integrator to override the function signature.
Merge remote-tracking branch 'michelled/FLUID-4701' into demo
* michelled/FLUID-4701:
  FLUID-4701: Code improvements based on review.
  FLUID-4701: Changing to using 'invoke' instead of 'invokeGlobalFunction' so that it would be possible for an integrator to override the function signature.
  FLUID-4701: Adding a lookup table for track creation functions based on type.
  FLUID-4701: Minor code tidy up.
  FLUID-4701: Tweaking default line height in the Mammals demo.
  FLUID-4701: Overriding Captionator styling so that it will respond to UIO settings for font size and line spacing.
  FLUID-4701: Fixed default styling in the Mammals demo. Fixed a cross browser issue when finding track elements in the DOM. Linting.
  FLUID-4701: Made the transcript feature work with the refactored Amara JSON support.
  FLUID-4701: Updating Captionator to a fork that implements partial data url support.
  FLUID-4701: Encoding the data url.
  FLUID-4701: Clarifying some comments. Fixing the data url being added to the track element with amara sourced captions - not sure if the format is corrrect yet.
  FLUID-4701: Sketch of amara json to vtt support.
  FLUID-4701: Adding overrides for caption colours in high contrast themes.
  FLUID-4701: Swapping in an unchanged version of Captionator and adding a style to position the cues correctly.
Merge remote-tracking branch 'acheetham/FLUID-4803' into demo
* acheetham/FLUID-4803:
  FLUID-4803: Fix title of all-tests file
  FLUID-4803: First pass at qunit upgrade. Tests don't run in Safari and Chrome on Mac yet.
Commits on Oct 11, 2012
Merge branch 'demo' into FLUID-4787
Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/html/TestCaptions.fr.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js
Merge branch 'demo' into FLUID-4787
Conflicts:
	tests/html/VideoPlayerHTML5Captionator-test.html
	tests/js/VideoPlayerControlsTests.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js

Still a couple of tests failing.
Merge branch 'demo' into FLUID-4748
Conflicts:
	tests/js/VideoPlayerTests.js
Commits on Oct 15, 2012
Commits on Oct 16, 2012
Commits on Oct 17, 2012
Merge remote-tracking branch 'michelled/FLUID-4647'
* michelled/FLUID-4647:
  FLUID-4701: Code improvements based on review.
  FLUID-4701: Changing to using 'invoke' instead of 'invokeGlobalFunction' so that it would be possible for an integrator to override the function signature.
  FLUID-4701: Adding a lookup table for track creation functions based on type.
  FLUID-4803: Fix title of all-tests file
  FLUID-4803: First pass at qunit upgrade. Tests don't run in Safari and Chrome on Mac yet.
  FLUID-4744: Linting.
  FLUID-4792: Ensure transcript is not re-rendered unless it has to be
  FLUID-4701: Minor code tidy up.
  FLUID-4701: Tweaking default line height in the Mammals demo.
  FLUID-4701: Overriding Captionator styling so that it will respond to UIO settings for font size and line spacing.
  FLUID-4701: Fixed default styling in the Mammals demo. Fixed a cross browser issue when finding track elements in the DOM. Linting.
  FLUID-4749: Add title to volume controls container.
  FLUID-4801: Ensure the <object> element inside the <video> element is not in the tab order (for IE9).
  FLUID-4792: Ensure keyboard-a11y of transcripts each time new transcript is displayed (not just loaded).
  FLUID-4786: A bit more code clean-up
  FLUID-4786: Add one MenuButton test
  FLUID-4786: Add aria-controls to captions menu using same method as transcripts menu.
  FLUID-4786: Code clean-up.
  FLUID-4701: Made the transcript feature work with the refactored Amara JSON support.
  FLUID-4786: Clean-up, de-linting.
  FLUID-4786: Clean up arguments to events
  FLUID-4786: Code clean-up; move boiled event args specification to a demands block
  FLUID-4786: Start cleaning up MenuButton.js; revert infusion to master
  FLUID-4786: Clean up tests for aria-controls
  FLUID-4701: Updating Captionator to a fork that implements partial data url support.
  FLUID-4786: Working on tests for aria-controls
  FLUID-4786: Get the ID of the transcript area to the aria-controls setup function
  FLUID-4786: More code clean-up
  FLUID-4786: Convey menu and transcrip to menu component, start cleaning up; need to move stuff into demands blocks
  FLUID-4786: Successfully convey controls and transcript to controls-level function
  FLUID-4786: temporary commit
  FLUID-4786: Temporary commit
  FLUID-4701: Encoding the data url.
  FLUID-4793: Fixing test JSON and VTT files
  FLUID-4786: in-progress commit
  FLUID-4793: Fixing timestamps for vtt files
  FLUID-4793: Fixing time stamps for JSON transcript files
  FLUID-4783: Updating the Infusion Readme to document UI Options HTML customizations
  FLUID-4701: Clarifying some comments. Fixing the data url being added to the track element with amara sourced captions - not sure if the format is corrrect yet.
  FLUID-4783: Ensure the basic demo includes the UIO media panel.
  FLUID-4701: Sketch of amara json to vtt support.
  FLUID-4661: One more tiny code dehydration
  FLUID-4744: Removing useless option
  FLUID-4744: Using tooltip component for ToggleButtons instead of hardcoding it in the preInit. Also rewriting tests for volumeControl tooltip checks
  FLUID-4661: Code refactoring after FLUID-4779 got in
  FLUID-4779: Minor renaming of full screen feature detect to match convention.
  FLUID-4779: missed v.requestFullScreen
  FLUID-4779: Adding requestFullScreen for supportsFullScreenMode flag in case if browsers will be using the same API instead of vendor prefixed functionality.
  FLUID-4779: Using proper demands to hide a fullscreen button. using a proper name for the fullscreen feature
  FLUID-4779: Fixing css rules to be cleaner. Removing useless feature.
  FLUID-4779: Reversed my changes. Showing fullscreen button only if init styling is present on the button.
  FLUID-4779: Removing a comment.
  FLUID-4779: Using IOC setting fullscreen button to be an empty subcomponent. Also making button to be invisible if the toggleButton is an empty subcomponent through css class modifications. Rewriting tests to reflect that.
  FLUID-4786: Back out the transcript menu 'aria-controls' work
  FLUID-4661: Making code more readable and using apply() instead of calling function by its name through videoEl object
  FLUID-4786: aria-controls on transcript area language drop-down
  FLUID-4786: Replace deferredCall with dom binder reference
  FLUID-4786: Add aria-controls to MenuButton button, referencing the menu
  FLUID-4701: Adding overrides for caption colours in high contrast themes.
  FLUID-4786: Add comments noting problem with transcript subcomponent instantiation
  FLUID-4786: Fix bug where transcript subcomponent was being instantiated twice.
  FLUID-4661: Refactoring some of the code to be more robust
  FLUID-4779: Making code more robust and less dependent on the browser type
  FLUID-4779: Removing this hideous git add js/VideoPlayer.js! statement
  FLUID-4786: First pass at setting up the 'aria-controls' attribute.
  FLUID-4744: Refactoring code according to the pull request comments
  FLUID-4786: Use decorators to add aria attributes; use menuitemcheckbox instead of menuitem
  FLUID-4786: Tests for ARIA
  FLUID-4786: Expaning ARIA on MenuButton.
  FLUID-4744: Added cleanup for tests by removing focus from the items. Also changed a code a bit so that tooltipContainer always represents a proper container for a tooltip in a toggleButton even when options was not supplied.
  FLUID-4744: Adding tests and changing naming to make options more clear.
  FLUID-4786: Add ARIA to the MenuButton components.
  FLUID-4782: Removing DebugFocus.js, which was added in error.
  FLUID-4744: Using tooltipContentFunction instead of contentFunction. Adding CSS so that tooltip is always on top of the videoPlayer controls. Movind mouseleave and mouseenter into bindDOMEvents function. Dehydrating bindDOMEvents function. Using string in the options to retreive Volume string for a tooltip
  FLUID-4782: Force 'select' of current transcript if play has already started.
  FLUID-4744: Changing volume control tooltip if mouse hovers over the volume slider
  FLUID-4782: ensure that user can shift+tab out of the transcript area
  FLUID-4782: Clean-up.
  FLUID-4782: First pass at keyboard-a11y for transcript area.
  FLUID-4778: Make MenuButton responsible for its own keyboard control
  FLUID-4778: Refactor code a bit.
  FLUID-4778: Start improving keyboard-a11y of MenuButton.
  FLUID-4778: Start correcting the keyboard interaction for the captions and transcripts menus.
  FLUID-4745: Clean up binding of press() to click for toggleButton
  FLUID-4778: Fix the kbd interactions for scrubbing when focus is on the video player element
  FLUID-4778: Fix the kbd interactions for volume when focus is on the video player element
  FLUID-4756: Expand linearRangeGuard test.
  FLUID-4756: Add tests for linearRangeGuard
  FLUID-4756: Fix to fluid.linearRangeGuard, which was using the wrong max value for setting.
  FLUID-4745: Restore mute button activation via keyboard.
  FLUID-4777: Fix positioning of button icons as font enlarges
  FLUID-4777: Fix positioning of scrub bar and captions
  FLUID-4777: First pass at correcting tab order. Scrub-bar now between buttons, sliding and captions move correctly.
  FLUID-4747: Extend tooltip fix to other themes
  FLUID-4747: High-contrast focus styling for language menus
  FLUID-4747: Add focus styling for other themes
  FLUID-4701: Swapping in an unchanged version of Captionator and adding a style to position the cues correctly.
  FLUID-4747: yellow-on-black focus styling, plus some basic styling fixes
  FLUID-4747: Adding focus styles to caption and transcript menus, and transcript close button.
  FLUID-4747: Basic focus styles for default theme
  FLUID-4744: Changing all occurrences of toolTip to be tooltip. Fixed CSS a bit. Tested CSS on Chrome, Safari, IE9 and FF and it looks good.
  FLUID-4661: Removing the comment since it is a misleading one. All the details about the problem will be in the JIRA.
  FLUID-4779: A small test fix.
  FLUID-4661: Small code optimization.
  FLUID-4779: Hiding fullscreen button for Opera and IE since those browsers do not support video full screen mode. Added tests as well.
  FLUID-4661: Changing comment for the added code. Added an opera prefixed events to look for once Opera 12.5 support full screen html5 mode.
  FLUID-4751: Applying role="slider" for the proper html element.
  FLUID-4744: Changed ToggleButton so that it accepts another option to set a tooltip not to the toggle button but to a custom container provided by a parent containing this ToggleButton
  FLUID-4661: Adding support for Chrome as well
  FLUID-4661: Change fullscreen button to have a proper styling once fullscreenMode is off. Also added tests for this case.
  FLUID-4652: Hide the caption/transcript menu activated by their toggle buttons by pressing escape key.
  FLUID-4664: Updated un-minified MyInfusion.js with the latest infusion master branch.
  FLUID-4664: Updated minified MyInfusion.js with the latest infusion master branch.
  FLUID-4546: Initial check-in of video player integration test.
  FLUID-4741: Commenting out fluid.log() statements (leaving in the case of error logging).
  FLUID-4741: Convert console.log() to fluid.log() to avoid IE problems.
  FLUID-4643: Added unit test and a bit of the code optimization for transcript component.
  FLUID-4641: Removing extraneous event listener
  FLUID-4640: Move language controls out of 'controllers' namespace
  FLUID-4640: Improve factoring of some tests.
  FLUID-4639: Removing un-used caption files
  FLUID-4640: Removing the setting of tabindex to -1 on the 'button inside the anchor' since that setup is no longer being used.
  FLUID-4640: Linting
  FLUID-4640: Factor existing MenuButton tests into separate file.
  FLUID-4644: Clean up main controls test HTML.
  FLUID-4644: Clean up test HTML file
  FLUID-4644: Clean up text in tests name
  FLUID-4644: Clean up un-used HTML.
  FLUID-4644: Add some ToggleButton tests; remove un-used (and wrong) function.
  FLUID-4644: Factor ToggleButton tests into separate file.
  FLUID-4607: Commenting out the timeouts so video players in the demo get created immediately.
  FLUID-4607: Swapped order of CSS includes to prevent issues with jQuery UI "lightness" style
  FLUID-4607: Fix for issue where zero video players were created on the original page, and the first was not created until after UIOptions has fully initialised
  FLUID-4694: Add commented code for demo, plus comments in the new code.
  FLUID-4694: First sketch of handling Universal Subtitles files for transcripts
  FLUID-4607: Small tweaks to demonstrate that video players can be created arbitrarily late during the page cycle and still be wired up to UIOptions correctly. This is a demonstration fix which delays the 3rd videoPlayer on the page by 5 seconds - this should be reverted once OER demo is stable and we have automated test cases.
  Updated to latest infusion branch build after review fixes
  FLUID-4607: Finished migrating out the last few media-specific icons and CSS from the core framework
  FLUID-4607, FLUID-4531: Successfully deforked framework version of UIOptions and all media panel materials moved back out into videoPlayer project.
  FLUID-4677: Changed the code according to Michelle's feedback. Optimizing and cleaning up the code. Removing a minified version of the captionator since it is not in use.
  FLUID-4677: Added a link to the StackOverflow page where the code was taken to do a JSONP request
  FLUID-4677: Added language to the Universal Subtitles URL to pull EN language, just in case
  FLUID-4677: Removed a testing line from the header
  FLUID-4677: Change function names to more appropriate ones.
  FLUID-4677: Tiny change for error handling
  FLUID-4677: Cleaned up code.
  FLUID-4677: Code before cleaning up
  FLUID-4677: Working captionator with jsonp. Need to clean up code.
  FLUID-4677: Parsing json to vtt format
  FLUID-4677: First working example with jsonp
  FLUID-4677: Adding type to the textTrack so that we can use it in order to get jsonp later on
  FLUID-4607: Fixed up controls test case for rename of volume controls out of condemned "controllers" package
  FLUID-4607: Cleaned up implementation of mute button, verified function and removed logging. Now fix for "anti-jank" at startup uses deferred strategy for constructing video players - this should result in better startup performance. Also, fixes for issue of transcript failing to update highlight state when changing transcript.
  FLUID-4607: Apparently working version which has been returned to using an proper Infusion build (currently from amb26 FLUID-4607 branch). With new framework support for source tracking, mute button appears working. Learner options text extracted to demands block, some tweaks to volume bar styling for Chrome.
  FLUID-4632: Added unit tests as well as code clean-up.
  FLUID-4632: Fixed two issues: 1. In IE9, the buffer progress bar sits on top of the scrubber instead of overlay; 2. In Chrom or IE9, the buffer progress replays when the controller bar is shown from the hidden state.
  FLUID-4635: Commenting out console.log statements which prevent the video player from working in IE when the dev tools are off.
  FLUID-4632: Implemented the buffered progress bar by using fluid.progress component as well as some styling fixes.
  FLUID-4582: Incomplete work on mute button
  FLUID-4632: Removed debug code.
  FLUID-4632: Add/pass/listen to buffered info. The reflection on the scrubber bar is followed.
  FLUID-4596: Fixing the colours for the volume slider and the font size on the scrubber handle.
  FLUID-4582: Adding the new video player framework file to the simple video player demo.
  FLUID-4582: Fix for various issues relating to synchronization of captions and transcript state. Thorough refactoring of toggle button and "language menu" components, with improvement of model idiom. New framework facilities moved into dedicated file VideoPlayer_framework.js including new base grade "fluid.videoPlayer.indirectReader" to temporarily work with prevalent "modelPath" idiom. Some controller tests removed, not all remaining tests are running due to sync issue with creating "tracks".
  FLUID-4610 - Adding 1ms to start time to avoid rounding error removes "can't click on next transcript" bug
  FLUID-4622: Reverting effect of bad merge which regressed track names from "French" back to "French Transcripts"
  FLUID-4582: Added media panel integration into VideoPlayer demo page
  FLUID-4560: Fixed up unit tests for video player. Some were assuming that operating a menu element should cause the menu to become visible, which is illogical since they could not have been operated otherwise. Others were calling "click" on a raw DOM li element, which fails on Chrome and other browsers. These were wrapped in a jQuery before the call. Light cleanup of MenuButton workflow
  FLUID-4627: Removed resizeHandler() which is no longer in use.
  FLUID-4627: Make the mammal demo video larger as well as some code clean-up.
  FLUID-4627: Refactoring CSS in order to remove some of the !important statements as well as remove redundancy.
  FLUID-4627: Applying styling improvements on the transcript area.
  FLUID-4619: Properly named the video player main container.
  FLUID-4587: Mostly working version of media options integration, together with fixes for a number of other demo issues:
  FLUID-4596: Adding a comment to the stylesheet.
  FLUID-4596: Improving the styling of the scrubber in the high contrast themes.
  FLUID-4619: Cindy and Alex worked on the cross-browser styling for the videoPlayer (Chrome, Safari and IE9). Removed some of the CSS which is not in use anymore. Styled videoPlayer differently to show properly on Mammals and in basic demo. Decreased number of dynamic css calls in videoPlayer.js and cleaned up the code. Great success!
  FLUID-4596: Improving the styling of the scrubber handles in the high contrast themes.
  FLUID-4596: Modifying the toggle button to have an inital state. Added styles to show the pressed state for the captions and transcript buttons.
  FLUID-4596: Renaming a couple of the icons to match the convention.
  FLUID-4619: Experimental code with a markup redesign as well as proper styling for transcripts and all together videoPlayer container. WARNING: hiding of the overlay area is disabled. Some text is added to the videoPlayer basic demo to test layouts.
  FLUID-4608-merge: Removing the cause for console error messages which are generated when tests are executed.
  FLUID-4596: high contrast button styles for the video player
  FLUID-4619: Styling height of the transcript content so that it looks better on the Mammals demo page
  FLUID-4619: Fixing the height of the transcript area.
  FLUID-4622: Making html5Captionator tests up to date since videoPlayer turns off captions and transcripts by default now.
  FLUID-4619: Moving captions a bit higher on top of the time div.
  FLUID-4596: fixes language menu styles in Firefox 10, related to percentage-based widths
  FLUID-4570: Fixing the regression by introducing an invoker and attaching listeners to the new function since fullscreen is not an option anymore
  FLUID-4622: Disabling captions by setting them to false in the videoPlayer.js and removing from the videoPlayer schemes in HTML
  FLUID-4596: adds reasonable styling to the language and caption menus. Also:  * removes horrendous red focus outline in favour of the default for now  * removes apparently unnecessary call to nonexistent event (eek) to avoid console errors when navigating with the keybooard  * improved labels for the language menu items
  FLUID-4622: Disabling captions and transcripts by default.
  FLUID-4587: Barely working integration of UIOptions media panel with video player. This has involved various "hot patching" to the framework and has got to the point where at least checkboxes can be demonstrated to affect all players on the page. A lot of cleanup and fixes needed from here.
  FLUID-4570: Removing transcript height configuration from the fullscreen function.
  FLUID-4621: Added toggle button and language menu files to the Mammals demo.
  FLUID-4610: Fixed the typo of "langaugeDropdown".
  FLUID-4621: Adds Anastasia's version of the ToggleButton from her FLUID-4556 branch. https://github.com/acheetham/videoPlayer/blob/b6f72ef9a7bff4c4500f32787bf3092473cb58e5/js/VideoPlayer_controllers.js
  FLUID-4607: Adding in the media panel CSS file.
  FLUD-4621: Splits toggle button, language menu, and language button into two separate files.
  FLUID-4607: Changing the fat panel frame html to link in MyInfusion instead of the individual javascript files.
  FLUID-4610: Fixed the interval event queuing-up issue when the scrubber bar is slid back and forth quickly.
  FLUID-4607: Upgrading Infusion to the version that has the media panel.
  FLUID-4570: Fixed maximize button in Chrome, Firefox and Safari. Commented on the code which must be moved away from the fullscreen function.
  FLUID-4610: Fixed the issue that closing the transcript leaves a grey background behind.
  FLUID-4570: An attempt to make a full screen video using webkit.
  FLUID-4610: Converted the caption json files to transcript json files.
  FLUID-4619: Removed fl-videoPlayer-captionArea-up
  FLUID-4619: Removing commented out code from videoPlayer.css and videoPlayer.js files. Fixing styling of the transcript area by removing its horizontal scroll and fixing its height.
  FLUID-4619: Changing captionator's dynamic styling, changing videoPlayer HTML markup and CSS so that caption div and controller div is in the same container. Hence, captions slides up and down automatically when controller bar hides/shows/
  FLUID-4616: French translations corrected by Charly Molter. Alex - regenerated vtt files.
  FLUID-4596: Rough workaround for line spacing unresponsiveness.
  FLUID-4616: French translations corrected by Charly Molter.
  FLUID-4610: Make transcript elements clickable.
  FLUID-4619: Better placement of the captions when the controllers hide and show.
  FLUID-4610: Synchronized the "show/hide transcript" action btw button popup menu and transcript area close button. Also fixed the bug at synchronizing selected transcript language.
  FLUID-4596: Prevents propagation and the default action on all toggle button-related clicks.
  FLUID-4596: Moved time display into the scrubber handle. Gradient for scrubber range.
  FLUID-4596: Implemented Joanna's hifi button graphics. Other changes included:  * Temporarily made buttons a fixed size--will make them responsive in the next few commits  * Add the jQuery UI lightness style to Mammals demo until we can put in a proper theme  * Proper hover styling for all buttons, including the nice inner glow
  FLUID-4619: Made the controllers show on focus and on mouse enter.
  FLUID-4619: Experimental code with hiding/showing controls
  FLUID-4610: Removed the line-height from the transcript DIV styling so that the UIO line spacing setting can be applied onto this DIV.
  FLUID-4610: Synchronized the transcript language selections btw the button popup menu and drop down list box.
  FLUID-4618: Fixed html5Captionator tests as well as fixed html5Captionator in order to use proper selectors.
  FLUID-4596: Inner glow for the controls area.
  FLUID-4596: More small CSS tweaks:  * Removed unncessary z-indices from the volume slider and controls area  * Pushed the scrubber directly against the control buttons  * Corrected borders for the scrubber
  FLUID-4610: Implemented the auto-scrolling of the transcript DIV onto the highlighted element.
  FLUID-4596: Fixed html5Captionator tests since we changed the container which captionator takes.
  FLUID-4610: Fixed the unit tests as well as transcript styling change and little fixes. The tests still fail in IE8 (and believe other non-html5 browsers) due to the inclusion of html5Captionator component.
  FLUID-4596: Adding comments.
  FLUID-4596: Showing captions on top of the scrubber bar. Placed captions into a caption DIV.
  FLUID-4608-merge:  Fixing up tests, still need to wait for the transcript fix to make them work.
  FLUID-4596: More small tweaks to the scrubber and button styling. Changes include:  * range highlighting for the scrubber  * removal of rounded corners for the scrubber and volume control wells  * removal of scrubber handle (in preparation for a nice new one)  * correct positioning of the volume slider above the volume button
  FLUID-4596: A tiny step towards the buttons matching the hifi mockups.  * Buttons are now positioned on the right and left of the toolbar.  * The whole control panel now floats above the video.  * The scrub bar stretches (almost) the whole width of the screen  * Bug: the controls area covers over captionator's captions.
  FLUID-4610: Recovered "Mammals.js", fixed the Mammal demo styling issue in a tacky way, which needs a better solution, modified the caption json files into transcript files.
  FLUID-4610: Auto scroll transcript div to the highlighted element. More polish-up is needed.
  FLUID-4610: Highlight the transcript element that's currently playing.
  FLUID-4610: Removed the inclusion of the unminified infusion lib from the videoPlayer.html.
  FLUID-4610: More merge-in from "michelle/demo" and a bit of language adjustment.
  FLUID-4613: Now caption area does not take 100% width space of the video. Now caption cue have width equal to the width required for the caption text to show up. Fixed issue by captionator hack to solve the issue when the last caption line got cut after UIO modifications.
  FLUID-4616: Added french captions in .vtt and .json formats
  FLUID-4613: Quick change to the captions of the videoPlayer to be responsive to UIO. Hacked captionator to remove a dynamic css styling and line-height from the cue creation section. Also removed License and fixed a link in a Readme files of the captionator lib we are using.
  FLUID-4610: Display the load-in transcripts.
  FLUID-4608-merge: Fixed some filenames since they were not capitalized
  FLUID-4608-merge: Added README and LICENSE files for the Captionator.js
  FLUID-4608-merge: Fixed inArray conditions for html5Captionator
  FLUID-4610: Load and parse the transcript file.
  FLUID-4608-merge: Fixed lower case file name issue. Added missing VTT files.
  FLUID-4608-merge: A fix for html5Captionator. Now captions should rerender properly after video-resize as well as showing/hiding UIO options.
  FLUID-4608-merge: First attempt to fix a mammal page
  FLUID-4608-merge: Fixed controllers part to work with a new model.
  FLUID-4608-merge: fixing my html5Captionator issues since it was listening to the wrong elPaths in the model.
  FLUID-4608: Added some comments
  FLUID-4608: Tests updated and passing
  FLUID-4610: Fixed the template.
  FLUID-4608: More tests
  FLUID-4608: More test for language controls with new model
  FLUID-4554: Fixing model of html5Captionator and applier in it
  FLUID-4610: Added images and transcript json files for transcript work.
  FLUID-4610: Half-completed transcript UI.
  FLUID-4608: More test for language controls
  FLUID-4608: First tests for language controls with new model
  FLUID-4554: Redesign of the videoPlayer to work with new model. Caption controls do not work. Need code cleaning.
  FLUID-4608: Revise languageMenu to new model style; update tests.
  FLUID-4554: First modifications to html5Captionator code to comply with the new videoPlayer options redesign
  FLUID-4589: Add button to exclusions list
  FLUID-4589: Fix failing tests.
  FLUID-4589: Remove hard-coded path to show/hide flag
  FLUID:4589: First stage of restoring the 'displayCaptions' flag
  FLUID-4608: Beginning to restructure controllers to use new model structure.
  FLUID-4589: Remove 'fl-theme' from the html
  FLUID-4589: Removing 'fl-theme' from stylesheet.
  FLUID-4589: Fix to correctly upate 'pressed' state of captions button
  FLUID-4589: Place a button inside the anchor, for visual styling (FLUID-4606)
  FLUID-4589: Use anchor for captions button, to support blur
  FLUID-4589: Code clean-up
  FLUID-4589: Clean up event binding between button and menu
  FLUID-4589: Comments and some renaming, for improved clarity
  FLUID-4589: Fix to ensure languageMenu will work with multiple instances.
  FLUID-4589: Separate the 'none' option from the list of languages
  FLUID-4589: Code clean-up
  FLUID-4589: Add styles for menu; place focus on button when menu hidden through language activation.
  FLUID-4589: Return focus to language button when down-arrow hides menu
  FLUID-4589: Clean up unused code; properly set languageControls button selector.
  FLUID-4589: Beginning to integrate keyboard controls
  FLUID-4589: Hide captions when 'none' selected.
  FLUID-4589: Beginning to integrate new languageControls into player.
  FLUID-4589: Refactor tests to remove duplication, separate customizations from defaults.
  FLUID_4589: Expand caption model to include labels, src... Move updating into public function; Update "off" label.
  FLUID-4554: Removed unused files and statements as well as CSS. Fixed time update event after talking to Cindy. Addressed pull request comments.
  FLUID-4589: Hide menu on DOWN at bottom.
  FLUID-4589: Add support for initial caption selection
  FLUID-4589: Clean up code, remove unnecessary state from model
  FLUID-4589: Temporary commit
  FLUID-4589: First sketch of language menu subcomponent
  FLUID-4554: Removed browser detection from html5Captioner
  FLUID-4554: Changed code to reflect pull request changes. html5Captionator is created only if HTML5 detected. Multiple code optimizations.
  FLUID-4554: Few more optimizations.
  FLUID-4554: A small conflict resolving after a rebase
  #FLUID-4554: Refactored tests to be smaller and more optimized. Refactored and optimized the main captionator code to be more compact.
  #FLUID-4554: Wrote tests. Added some fail checks if no tracks are present in the model or currentTrack is missing. Few more modifications.
  #FLUID-4554: Cleaned up tests and had to merge with upstream to make my tests to work.
  #FLUID-4554: Fixed CSS of the captions being on top of videoPlayer UI controllers. Added a block for videoPlayer to avoid modification of the html dom for captionator in case if browser is non HTML5. Added test files which should be extended further.
  FLUID-4554: Cleaned up the code by removing old files. Cindy came up with a great idea of how to fix captionator's big sizes when it is initialized. All code is done, next step is tests.
  #FLUID-4554: ALex and Cindy, paired up and made captionator to work as an infusion component part of the videoPlayer. TODO: fix captionator size by default. Remove old unused captionner files from videoPlayer.
  #FLUID-4554: Extended html5Captionator with functions. Changed currentTrack to currentTracks since we can have multiple active languages showed.
  FLUID-4554: Fully converted 2 JSON caption files into WEBVTT format so that we have full tracks. Added a french track through the captions option in the demo. Also fixed the bug with html5Captionator since it would treat multiple track tags as only one before.
  FLUID-4554: The first working draft of captionator integration.
Merge remote-tracking branch 'acheetham/FLUID-4807'
* acheetham/FLUID-4807:
  FLUID-4807: File renaming and cleanup to ensure tests run when served from build server
FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency…
…. Adding 'async' flag to testCaseWithEnv for individual tests.
Commits on Oct 18, 2012
Commits on Oct 19, 2012
Commits on Oct 22, 2012
Merge remote-tracking branch 'acheetham/FLUID-4748'
* acheetham/FLUID-4748:
  FLUID-4748: Add a title for the video as an option, added to the video element as an 'aria-label'
Merge remote-tracking branch 'acheetham/FLUID-4811'
* acheetham/FLUID-4811:
  FLUID-4811: Fix background of volume slider, now noticable since slider enlarges
  FLUID-4811: Fixes to CSS so that controls properly enlarge with UIO adjustments.
Merge remote-tracking branch 'acheetham/FLUID-4805'
* acheetham/FLUID-4805:
  FLUID-4805: Specify pointer-events so the overlay doesn't capture clicks
Merge remote-tracking branch 'acheetham/FLUID-4812'
* acheetham/FLUID-4812:
  FLUID-4812: Cleaning unnecessary jQuery wrappers.
  FLUID-4812: Refactor TestUtils.js a bit.
  FLUID-4812: De-linting and other clean-up.
  FLUID-4812: Don't automatically display transcripts if choice of transcript hasn't changed.
Merge remote-tracking branch 'acheetham/FLUID-4816'
* acheetham/FLUID-4816:
  FLUID-4816: Fix to size of transcript area close button.
Merge branch 'master' into FLUID-4775
Conflicts:
	js/VideoPlayer.js
Commits on Oct 23, 2012
Commits on Oct 24, 2012
FLUID-4797: Quick fix to the console error that gets thrown when the …
…scrubber is clicked on. We need to improve this fix by refactoring the code to ensure that the TimeRanges objects is not stored in the model.
Merge remote-tracking branch 'michelled/FLUID-4797'
* michelled/FLUID-4797:
  FLUID-4797: Quick fix to the console error that gets thrown when the scrubber is clicked on. We need to improve this fix by refactoring the code to ensure that the TimeRanges objects is not stored in the model.
Merge branch 'master' into FLUID-4775
Conflicts:
	js/VideoPlayer_controllers.js
Merge remote-tracking branch 'acheetham/FLUID-4775'
* acheetham/FLUID-4775:
  FLUID-4775: Adding missing JS file to test.
  FLUID-4775: Removing commented-out CSS (the styles were added to a new JIRA, FLUID-4817.
  FLUID-4775: Reinstate deadMansBlur on menu.
  FLUID-4775: Final fixes to bring Cindy's 4665 branch up to current master
  FLUID-4775: Add comment clarifying problem with scrub-bar in IE8
  Fixing the menuButton code.
  FLUID-4775: Get tests passing in FF again.
  FLUID-4775: Get tests mostly running after merge
  FLUID-4775: Added the media element library.
  FLUID-4775: Fixed the integration test.
  FLUID-4755: Fixed various IE8 issues: click on video container to start/pause video, scrubber bar click to advance/rewind video, mute and volume adjusting, js error thrown by transcript or caption button click, unit tests.
  FLUID-4775: Removed html5MediaTime since with media element library in IE8, the attach of video event listeners must occur in the success callback of the object creation. html5MediaTime was attaching listener for "timeupdate" event outside of this scope, as a result, the listener is never triggered in IE8.
  FLUID-4775: Fixed the play button and some stylings in IE8.
  FLUID-4775: removed the un-necessary files from media element library.
  FLUID-4775: "loadedmetadata" event is a better place to retrieve the initial total/current/start times since it's when all the meta data is ready.
  FLUID-4775: replace the "durationchange" event that is not implemented by media element with "loadeddata" event.
  FLUID-4775: clean up media component.
  FLUID-4775: Fixed the unit tests for controllers as well as the code clean-up.
  FLUID-4775: Fixed mammals demo and most unit tests. One unit test for controls still fails. More commits are followed.
  FLUID-4775: The first cut of making use of media element library to support IE8 without breaking the video player on html5 browsers. Also replaced HTML5-backcompat.js with html5shiv.
Merge branch 'master' into FLUID-4787
Conflicts:
	js/VideoPlayer.js
	tests/js/VideoPlayerHTML5CaptionatorTests.js
Commits on Oct 26, 2012
Merge remote-tracking branch 'acheetham/FLUID-4787'
* acheetham/FLUID-4787:
  FLUID-4787: Finish some of the refactoring.
  FLUID-4787: Changing the testCaseWithEnv implementation so that setup and teardown use the same strategy.
  FLUID-4787: Renaming 'cleanupEnv' to 'clearStaticEnv' for consistency. Adding 'async' flag to testCaseWithEnv for individual tests.
  FLUID-4787: Slight cleanup of the testInit function.
  FLUID-4787: Removing setupTestEnvironmentFeature in favour of setStaticEnv and cleanupEnv
  FLUID-4787: Generalizing the implementation of setStaticEnv and cleanupEnv.
  FLUID-4787: Changing the naming and structure of the test utilities function which runs tests with an environment.
  FLUID-4787: Fixing a merge bug and an unfortunately corresponding merge bug in the test.
  FLUID-4787: Clean up after merge conflict resolution.
  FLUID-4787: First steps towards interim step for creating a configurable test enviornment
  FLUID-4787: Fixed comments. Removed extra comments. Removed multiline vars and using single line ones instead. Put a setupEnvironment function into testUtils. Renamed html5 featore to be supportHtml5
  FLUID-4787: Added a comment to show that some of the tests should be ran from localhost
  FLUID-4787: Added tests to check that captions are not present in HTML when displayCaptions is set to false and also when some of the options are missing. Also revamped tests.
  FLUID-4787: Fixing multiple issues here. First fixing a typo. Secondly now captions should be off be default. And lastly Safari will have default captions turned off be default.
Merge remote-tracking branch 'acheetham/FLUID-4814'
* acheetham/FLUID-4814:
  FLUID-4814: Refactor tests to use initVideoPlayer from TestUtils
  FLUID-4814: Refactor the Controls test to use declarative structure.
  FLUID-4814: Refactor VideoPlayerTests.js to use the declarative structure.
Commits on Oct 30, 2012
Commits on Oct 31, 2012
Commits on Nov 05, 2012
FLUID-4825: replaced shadow on controls with border for themes. Remov…
…ed temporary css for initial overlay no longer needed.
Merge remote-tracking branch 'michelled/FLUID-4818'
* michelled/FLUID-4818:
  FLUID-4818: Replacing 'buffered' in the model which was an object that can not be safely passed around, with 'bufferEnd' which is a simple property.
Merge branch 'master' into FLUID-4795
Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js
Commits on Nov 06, 2012
Commits on Nov 07, 2012
Merge branch 'FLUID-4835'
* FLUID-4835:
  FLUID-4835: Linting
  FLUID-4835: Update processing of Amara timecodes to reflect switch to milliseconds.
Commits on Nov 08, 2012
Commits on Nov 09, 2012
Merge branch 'FLUID-4819'
* FLUID-4819:
  FLUID-4819: Removing the dynamically set width which forces the transcript below the video player.
Merge remote-tracking branch 'acheetham/FLUID-4835'
* acheetham/FLUID-4835:
  FLUID-4835: Small code clean-up
  FLUID-4835: Fix to timecodes for clickable transcripts, with test.
Merge remote-tracking branch 'acheetham/FLUID-4831'
* acheetham/FLUID-4831:
  FLUID-4831: Ensure menus are on top of captions.
Commits on Nov 12, 2012
Merge remote-tracking branch 'acheetham/FLUID-4837'
* acheetham/FLUID-4837:
  FLUID-4837: Fix to move CSS from code into CSS file.
  FLUID-4837: Ensure the scrub-bar is in front of the progress bar, so that it receives click events.
Commits on Nov 28, 2012
Commits on Dec 04, 2012
Commits on Dec 05, 2012
Commits on Dec 06, 2012
Merge remote-tracking branch 'michelle/FLUID-4839'
* michelle/FLUID-4839:
  FLUID-4839: Reducing string concatenation for the aria label containing the video title.
  FLUID-4839: Minor changes based on code review - uncommenting some commented out lines and putting in a comment.
  FLUID-4839: Fixed an error being thrown in the mammals demo. Styling tweaks.
  FLUID-4839: Removing the specialized youtube markup so that media element can take care of youtube videos for us.
Merge remote-tracking branch 'heidi/FLUID-4829'
* heidi/FLUID-4829:
  FLUID-4829: Adapts to text-size increase.
  FLUID-4829: Fixed width and position of volume slider to align with volume button
  FLUID-4829: Fixed width and position of volume slider to align with volume button
Commits on Dec 10, 2012
Commits on Dec 11, 2012
Merge remote-tracking branch 'anastasia/FLUID-4795'
* anastasia/FLUID-4795:
  FLUID-4795: Refactor captionator tests
  FLUID-4795: Modify captionator tests so most don't run in browsers with native track support
  FLUID-4795: Removing wayward 'console.log'
  FLUID-4795: Bring captionator tests up to latest changes
  FLUID-4795: Upgrade Captionator, to make captions work in Safari.
  FLUID-4795: Upgrade captionator to version that is more in line with spec, update VideoPlayer to new API.
  FLUID-4701: Adding the callback parameter that was accidentally removed back to the Amara url.
  FLUID-4701: Minor code tidy up.
Merge remote-tracking branch 'heidi/FLUID-4813'
* heidi/FLUID-4813:
  FLUID-4813: Merge conflicts resolved.
  FLUID-4813: tested on Win xp and Win 7, cleaned up reset styles
  FLUID-4813: Added theming for the volume slider.
Merge remote-tracking branch 'heidi/FLUID-4825'
* heidi/FLUID-4825:
  FLUID-4825: Margin width adjustment on scrubber only, not timecode as well
  FLUID-4825: Box-shadow removed for bw by themes.
  FLUID-4825: height for controller buttons kept same as before
  FLUID-4825: height 100% changed to inherit due to Safari height differences
  FLUID-4825: Edited to keep video border, and instead explicitly set the height of the video to be the height of its container. Bottom border now visible.
  FLUID-4825: replaced shadow on controls with border for themes. Removed temporary css for initial overlay no longer needed.
Commits on Dec 12, 2012
Commits on Dec 13, 2012
Merge remote-tracking branch 'acheetham/FLUID-4862'
* acheetham/FLUID-4862:
  FLUID-4862: More clean-up
  FLUID-4862: Cleanup of tests
  FLUID-4862: Ensure volume controls say something reasonable with screen readers
  FLUID-4862: use aria-label instead of a hidden span
  FLUID-4862: add label span to mute button, to ensure consistent positioning amongst buttons.
  FLUID-4862: Ensure buttons have labels for screen readers to read; move video label out so Safari will see it
Commits on Dec 14, 2012
Merge branch 'master' into FLUID-4649
Conflicts:
	html/videoPlayer_template.html
Commits on Dec 18, 2012
FLUID-4870: Upgraded infusion.
Pulled a new snapshot from the latest code in the master of the Infusion repo (725fd98d6cc3ebbe92f378b8c05738b178dc6516). Also removed the dependency on Uploader and now just pulled in directly the modules that are needed (added: progress and jQueryScrollToPlugin).
Merge remote-tracking branch 'jobara/FLUID-4870'
* jobara/FLUID-4870:
  FLUID-4870: Upgraded infusion.
Commits on Dec 19, 2012
Merge remote-tracking branch 'anastasia/FLUID-4649'
* anastasia/FLUID-4649:
  FLUID-4649: Ensure buttons enlarge with 'make inputs bigger'; height of control bar still doesn't enlarge
Commits on Jan 02, 2013
Showing with 12,072 additions and 13,879 deletions.
  1. +117 −31 css/VideoPlayer.css
  2. +31 −0 css/ltie9.css
  3. +3 −8 demos/Mammals.css
  4. +5 −1 demos/Mammals.html
  5. +7 −4 demos/Mammals.js
  6. +21 −10 demos/VideoPlayer.html
  7. +109 −110 demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
  8. +109 −110 demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
  9. +216 −216 demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
  10. +216 −216 demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
  11. +36 −39 html/videoPlayer_template.html
  12. BIN images/black/sliderbg_blackonwhite.jpg
  13. BIN images/black/sliderbg_blackonyellow.jpg
  14. BIN images/white/sliderbg_whiteonblack.jpg
  15. BIN images/yellow/sliderbg_yellowonblack.jpg
  16. +82 −27 js/MenuButton.js
  17. +29 −14 js/ToggleButton.js
  18. +191 −151 js/VideoPlayer.js
  19. +79 −31 js/VideoPlayer_controllers.js
  20. +0 −1 js/VideoPlayer_framework.js
  21. +65 −87 js/VideoPlayer_html5Captionator.js
  22. +10 −17 js/VideoPlayer_intervalEventsConductor.js
  23. +118 −68 js/VideoPlayer_media.js
  24. +18 −8 js/VideoPlayer_transcript.js
  25. +3 −1 lib/captionator/README.txt
  26. +86 −68 lib/captionator/js/captionator.js
  27. +288 −0 lib/html5shiv/js/html5shiv.js
  28. +5,257 −9,782 lib/infusion/MyInfusion.js
  29. +35 −3 lib/infusion/README.txt
  30. +1 −0 lib/infusion/components/tableOfContents/html/TableOfContents.html
  31. +8 −2 lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  32. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  33. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  34. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  35. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  36. +4 −4 lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  37. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  38. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  39. +6 −6 lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  40. +1 −1 lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  41. +6 −0 lib/infusion/framework/fss/css/fss-text.css
  42. BIN lib/mediaelement/js/flashmediaelement.swf
  43. +1,544 −0 lib/mediaelement/js/mediaelement.js
  44. +59 −0 lib/mediaelement/js/mediaelement.min.js
  45. +33 −0 tests/all-tests.html
  46. +1 −1 tests/html/MenuButton-test.html
  47. +4 −4 tests/html/TestCaption.en.json
  48. +2 −431 tests/html/TestCaptions.en.vtt
  49. +2 −431 tests/html/TestCaptions.fr.vtt
  50. +216 −216 tests/html/TestTranscripts.en.json
  51. +216 −216 tests/html/TestTranscripts.fr.json
  52. +1 −1 tests/html/ToggleButton-test.html
  53. +1 −1 tests/html/VideoFramework-test.html
  54. +3 −2 tests/html/VideoPlayer-test.html
  55. +48 −0 tests/html/VideoPlayerAria-test.html
  56. +2 −1 tests/html/VideoPlayerControls-test.html
  57. +4 −28 tests/html/VideoPlayerHTML5Captionator-test.html
  58. +4 −3 tests/html/{VideoPlayer-IntegrationTest.html → VideoPlayerIntegration-test.html}
  59. +1 −1 tests/html/VideoPlayerIntervalEventsConductor-test.html
  60. +1 −1 ...alEventsConductor-integrationTest.html → VideoPlayerIntervalEventsConductorIntegration-test.html}
  61. +1 −2 tests/html/VideoPlayerTranscript-test.html
  62. +66 −0 tests/html/VideoPlayerTranscriptIntegration-test.html
  63. +5 −5 tests/js/IntervalEventsConductor-IntegrationTests.js
  64. +44 −13 tests/js/MenuButtonTests.js
  65. +112 −6 tests/js/TestUtils.js
  66. +49 −7 tests/js/ToggleButtonTests.js
  67. +2 −2 tests/js/VideoFrameworkTests.js
  68. +144 −0 tests/js/VideoPlayerAriaTests.js
  69. +135 −121 tests/js/VideoPlayerControlsTests.js
  70. +200 −247 tests/js/VideoPlayerHTML5CaptionatorTests.js
  71. +23 −83 tests/js/VideoPlayerIntegrationTests.js
  72. +6 −6 tests/js/VideoPlayerIntervalEventsConductorTests.js
  73. +177 −102 tests/js/VideoPlayerTests.js
  74. +106 −0 tests/js/VideoPlayerTranscriptIntegrationTests.js
  75. +33 −8 tests/js/VideoPlayerTranscriptTests.js
  76. +4 −3 tests/lib/jqUnit/js/jqUnit.js
  77. +2 −1 tests/lib/qunit/VERSION
  78. +12 −0 tests/lib/qunit/addons/composite/README.md
  79. +33 −0 tests/lib/qunit/addons/composite/index.html
  80. +13 −0 tests/lib/qunit/addons/composite/qunit-composite.css
  81. +102 −0 tests/lib/qunit/addons/composite/qunit-composite.js
  82. +65 −27 tests/lib/qunit/css/qunit.css
  83. +1,403 −857 tests/lib/qunit/js/qunit.js
View
@@ -1,5 +1,6 @@
.fl-videoPlayer {
font-family: sans-serif;
+ height: 22.5em;
}
/*
@@ -9,6 +10,7 @@
.fl-videoPlayer-main {
position: relative;
display: inline-block;
+ height: inherit;
}
/*
@@ -17,14 +19,16 @@
.fl-videoPlayer-video {
float: left;
+ height: inherit;
}
.fl-videoPlayer-video-element {
top: 0;
left: 0;
- width: 100%;
- height: 100%;
+ height: inherit;
+ width: 29.75em;
}
+
.fl-videoPlayer-video-element:focus,
.fl-videoPlayer-transcript-element-selected {
outline: solid 3px #3195C7;
@@ -41,6 +45,7 @@
.fl-videoPlayer-tooltip {
position : absolute;
padding : 3px 5px;
+ z-index : 1000; /* Tooltips should be always shown above any other videoPlayer html element */
}
.fl-theme-uio-yb .fl-videoPlayer-tooltip,
.fl-theme-uio-by .fl-videoPlayer-tooltip,
@@ -50,19 +55,25 @@
.fl-videoPlayer-controller {
width:100%;
position: relative;
+ pointer-events: all;
+ background-color: rgba(242, 242, 242, 0.75);
+ height: 2.05em;
+ box-shadow: inset 0 0 0.5em rgba(0, 0, 0, 0.15);
+ padding-bottom: 1px; /* For Safari and Chrome. Without padding, button overlaps container border */
}
/***********
* Buttons *
***********/
-
+
.fl-videoPlayer-button {
- width: 30px;
- height: 30px;
+ width: 2em;
+ height: 2em;
border: 0;
cursor: pointer;
background-color: rgba(0, 0, 0, 0);
+ font-size: 1em;
}
.fl-videoPlayer-button:focus {
background-color: #3195C7;
@@ -72,40 +83,41 @@
.fl-theme-uio-by .fl-videoPlayer-button:focus,
.fl-theme-uio-bw .fl-videoPlayer-button:focus { background-color: #000000 !important; }
-.fl-videoPlayer-controller-buttons .fl-videoPlayer-button,
-.fl-videoPlayer-controller-buttons .fl-videoPlayer-button:hover {
+.fl-videoPlayer-controller .fl-videoPlayer-button,
+.fl-videoPlayer-controller .fl-videoPlayer-button:hover {
background-size: cover;
}
-.fl-videoPlayer-controller-buttons .fl-videoPlayer-button:hover {
+.fl-videoPlayer-controller .fl-videoPlayer-button:hover {
background-color: rgba(153, 153, 153, 0.45);
box-shadow: inset 0 0 0.25em rgba(0, 0, 0, 0.30);
}
-.fl-videoPlayer-controller-buttons {
- background-color: rgba(242, 242, 242, 0.75);
- width: 100%;
- height: 2.05em;
- box-shadow: inset 0 0 0.5em rgba(0, 0, 0, 0.15);
+.fl-theme-uio-by .fl-videoPlayer-controller,
+.fl-theme-uio-bw .fl-videoPlayer-controller { box-shadow: none !important; }
+
+.fl-videoPlayer-controller * {
+ display: inline-block;
}
-.fl-videoPlayer-controller-buttons * {
+.fl-videoPlayer-optional {
+ display: none;
+}
+.fl-videoPlayer-fullscreen.fl-videoPlayer-optional,
+.fl-videoPlayer-fullscreen-on.fl-videoPlayer-optional {
display: inline;
}
.fl-videoPlayer-controller-buttons-main,
.fl-videoPlayer-controller-buttons-secondary {
- height: 100%;
- position: absolute;
- bottom: 0;
+ height: inherit;
}
.fl-videoPlayer-controller-buttons-main {
- left: 0;
+ float: left;
}
.fl-videoPlayer-controller-buttons-secondary {
- right: 0;
+ float: right;
}
-
a.fl-videoPlayer-button-wrapper {
text-decoration: none;
}
@@ -247,19 +259,19 @@ a.fl-videoPlayer-button-wrapper {
.fl-videoPlayer-volumeContainer {
position: relative;
- top: 2px;
}
.fl-videoPlayer-volumeControl {
display: none;
z-index: 1000;
- border-width: 5px 11px;
+ border-width: 5px 0.55em;
border-style: solid;
border-color: #c2c2c2;
position: absolute;
- bottom: 19px; /* 20px is right on FF */
- right: 1px; /* 5px is right on FF */
- width: 25%;
+ bottom: 1.8em;
+ left: 0;
+ height: 6em;
+ background: none;
background-color: #F2F2F2;
}
.fl-videoPlayer-volumeContainer:focus .fl-videoPlayer-volumeControl {
@@ -312,14 +324,77 @@ a.fl-videoPlayer-button-wrapper {
}
.fl-videoPlayer-volumeControl .ui-slider-handle {
height: 10%;
- left: -8px;
+ margin-bottom: 0;
}
.fl-videoPlayer-volumeContainer:hover .fl-videoPlayer-volumeControl,
.fl-videoPlayer-volumeContainer:focus .fl-videoPlayer-volumeControl {
display: inline;
}
+/* Volume slider theming */
+.fl-theme-uio-yb .fl-videoPlayer-volumeControl,
+.fl-theme-uio-wb .fl-videoPlayer-volumeControl {
+ box-shadow: inset 0 0 0 2px #000000;
+ outline: 1px solid #000000;
+}
+.fl-theme-uio-yb .fl-videoPlayer-volumeControl {
+ background-image: url('../images/yellow/sliderbg_yellowonblack.jpg') !important;
+}
+.fl-theme-uio-wb .fl-videoPlayer-volumeControl {
+ background-image: url('../images/white/sliderbg_whiteonblack.jpg') !important;
+}
+.fl-theme-uio-yb .fl-videoPlayer-volumeControl .ui-slider-handle,
+.fl-theme-uio-wb .fl-videoPlayer-volumeControl .ui-slider-handle {
+ background-image: none !important;
+ border: 2px solid #000000 !important;
+}
+.fl-theme-uio-yb .fl-videoPlayer-volumeControl .ui-slider-handle {
+ background-color: #FFFF00 !important;
+}
+.fl-theme-uio-wb .fl-videoPlayer-volumeControl .ui-slider-handle {
+ background-color: #FFFFFF !important;
+}
+.fl-theme-uio-yb .fl-videoPlayer-volumeControl .ui-slider-range-min,
+.fl-theme-uio-wb .fl-videoPlayer-volumeControl .ui-slider-range-min {
+ background-image: none !important;
+ background-color: #000000 !important;
+}
+
+.fl-theme-uio-by .fl-videoPlayer-volumeControl {
+ box-shadow: inset 0 0 0 2px #FFFF00;
+ outline: 1px solid #FFFF00;
+}
+.fl-theme-uio-bw .fl-videoPlayer-volumeControl {
+ box-shadow: inset 0 0 0 2px #FFFFFF;
+ outline: 1px solid #FFFFFF;
+}
+.fl-theme-uio-by .fl-videoPlayer-volumeControl {
+ background-image: url('../images/black/sliderbg_blackonyellow.jpg') !important;
+}
+.fl-theme-uio-bw .fl-videoPlayer-volumeControl {
+ background-image: url('../images/black/sliderbg_blackonwhite.jpg') !important;
+}
+.fl-theme-uio-by .fl-videoPlayer-volumeControl .ui-slider-handle,
+.fl-theme-uio-bw .fl-videoPlayer-volumeControl .ui-slider-handle {
+ background-image: none !important;
+ background-color: #000000 !important;
+}
+.fl-theme-uio-by .fl-videoPlayer-volumeControl .ui-slider-handle {
+ border: 2px solid #FFFF00 !important;
+}
+.fl-theme-uio-bw .fl-videoPlayer-volumeControl .ui-slider-handle {
+ border: 2px solid #FFFFFF !important;
+}
+.fl-theme-uio-by .fl-videoPlayer-volumeControl .ui-slider-range-min {
+ background-image: none !important;
+ background-color: #FFFF00 !important;
+}
+.fl-theme-uio-bw .fl-videoPlayer-volumeControl .ui-slider-range-min {
+ background-image: none !important;
+ background-color: #FFFFFF !important;
+}
+
/**********************************
* Captions and Transcripts Menus *
@@ -403,7 +478,6 @@ ul.fl-videoPlayer-transcripts-languageList li {
top: 1px;
position: absolute;
width: 100%;
- pointer-events:none;
}
/* progress bar */
@@ -430,8 +504,8 @@ ul.fl-videoPlayer-transcripts-languageList li {
height: 100%;
width: 100%;
background-color: #F2F2F2;
- opacity: 0.3;
- filter: alpha(opacity=30);
+ opacity: 0.7;
+ filter: alpha(opacity=70);
}
/************
@@ -454,6 +528,7 @@ ul.fl-videoPlayer-transcripts-languageList li {
.fl-videoPlayer-scrubber {
width: 100%;
+ z-index: 999;
}
.fl-videoPlayer-scrubber.ui-slider-horizontal {
height: 1em;
@@ -535,7 +610,8 @@ ul.fl-videoPlayer-transcripts-languageList li {
.fl-videoPlayer-overlay {
bottom: 0em;
position: absolute;
- width: 100%;
+ width: 29.75em;
+ pointer-events: none;
}
.fl-theme-uio-yb .fl-videoPlayer-overlay, .fl-theme-uio-yb .fl-videoPlayer-captionArea, .fl-theme-uio-yb .captionator-cue-canvas,
.fl-theme-uio-wb .fl-videoPlayer-overlay, .fl-theme-uio-wb .fl-videoPlayer-captionArea, .fl-theme-uio-wb .captionator-cue-canvas,
@@ -605,6 +681,7 @@ ul.fl-videoPlayer-transcripts-languageList li {
background-image: url('../images/default/transcriptclose.png');
background-repeat: no-repeat;
background-position: center center;
+ width: auto;
}
.fl-videoPlayer-transcripts-close-button:hover {
background-image: url('../images/default/transcriptclose_hover.png');
@@ -636,8 +713,13 @@ ul.fl-videoPlayer-transcripts-languageList li {
pointer-events:none;
color: #FFFFFF;
position: relative !important;
+ font-size: inherit !important;
+ line-height: inherit !important;
}
+.captionator-cue {
+ line-height: inherit !important;
+}
/********************
* UIO theme styling
@@ -663,7 +745,11 @@ ul.fl-videoPlayer-transcripts-languageList li {
.fl-theme-uio-bw .fl-videoPlayer-scrubber,
.fl-theme-uio-wb .fl-videoPlayer-scrubber,
.fl-theme-uio-by .fl-videoPlayer-scrubber,
-.fl-theme-uio-yb .fl-videoPlayer-scrubber,
+.fl-theme-uio-yb .fl-videoPlayer-scrubber {
+ border-width: 1px;
+ margin: 0 -2px; /* To compensate for the additional border width, so div stays within container */
+}
+
.fl-theme-uio-bw .fl-videoPlayer-scrubber .ui-slider-handle,
.fl-theme-uio-wb .fl-videoPlayer-scrubber .ui-slider-handle,
.fl-theme-uio-by .fl-videoPlayer-scrubber .ui-slider-handle,
View
@@ -0,0 +1,31 @@
+/***********
+ * Buttons *
+ ***********/
+
+.fl-videoPlayer-button {
+ background-color: transparent;
+}
+
+.fl-videoPlayer-controller-buttons .fl-videoPlayer-button:hover {
+ background-color: rgb(153, 153, 153);
+}
+
+.fl-videoPlayer-controller-buttons {
+ background-color: rgb(242, 242, 242);
+}
+
+/************
+ * Scrubber *
+ ************/
+
+.fl-videoPlayer-scrubber.ui-widget-content {
+ background: rgb(0, 0, 0);
+}
+
+.fl-videoPlayer-scrubber .ui-slider-handle {
+ background: rgb(0, 0, 0);
+}
+
+.fl-videoPlayer-buffered-progress {
+ z-index: -1;
+}
View
@@ -3,7 +3,6 @@ body {
font-family: "Helvetica Neue",Arial,"Liberation Sans",FreeSans,sans-serif;
color: #333333;
font-size: .9em;
- line-height: 1.4em;
}
nav li {
@@ -189,19 +188,15 @@ footer a {
margin-bottom: 1em;
text-align: center;
max-width: 100%;
+ height: 31.25em;
}
-.fl-videoPlayer-captionArea {
- background-color: #000000;
- color: #FFFFFF;
-}
.fl-videoPlayer-main {
border: 2px solid #808080;
background-color: #808080;
}
-.fl-videoPlayer-video {
- width: 500px;
- height: 500px;
+.fl-videoPlayer-video-element, .fl-videoPlayer-overlay {
+ width: 31.25em;
}
View
@@ -16,15 +16,19 @@
<link rel="stylesheet" type="text/css" href="../lib/infusion/components/uiOptions/css/FatPanelUIOptions.css" />
<link rel="stylesheet" type="text/css" href="../css/UIOptions-media.css" />
<link rel="stylesheet" type="text/css" href="../css/VideoPlayer.css" />
+ <!--[if lt IE 9]>
+ <link type="text/css" href="../css/ltie9.css" rel="stylesheet" />
+ <![endif]-->
<link rel="stylesheet" type="text/css" href="Mammals.css" />
<!-- Fluid and jQuery Dependencies -->
<script type="text/javascript" src="../lib/infusion/MyInfusion.js"></script>
<!-- Utils -->
<script type="text/javascript" src="../lib/jquery-ui/js/jquery.ui.button.js"></script>
<script type="text/javascript" src="../lib/captionator/js/captionator.js"></script>
+ <script type="text/javascript" src="../lib/mediaelement/js/mediaelement.js"></script>
<!--[if lt IE 9]>
- <script type="text/javascript" src="../js/HTML5-backcompat.js"></script>
+ <script type="text/javascript" src="../lib/html5shiv/js/html5shiv.js"></script>
<![endif]-->
<!-- VideoPlayer dependencies -->
<script type="text/javascript" src="../js/VideoPlayer_framework.js"></script>
Oops, something went wrong.

No commit comments for this range