Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

FLUID-4607: Fully deforked version of the video player #28

Closed
wants to merge 255 commits into from

5 participants

Antranig Basman Michelle Alexey Novak Anastasia Cheetham Colin Clark
Antranig Basman
Owner
amb26 commented March 28, 2012

No description provided.

and others added some commits February 06, 2012
Alexey Novak #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.
d6fde39
Alexey Novak #FLUID-4554: Cleaned up tests and had to merge with upstream to make …
…my tests to work.
cdc54a8
Alexey Novak #FLUID-4554: Wrote tests. Added some fail checks if no tracks are pre…
…sent in the model or currentTrack is missing. Few more modifications.
57ea11a
Alexey Novak #FLUID-4554: Refactored tests to be smaller and more optimized. Refac…
…tored and optimized the main captionator code to be more compact.
b4ec458
Alexey Novak FLUID-4554: A small conflict resolving after a rebase 7f6f37f
Alexey Novak FLUID-4554: Few more optimizations. 4758c26
Alexey Novak Merge branch 'master' into FLUID-4554
Conflicts:
	css/VideoPlayer.css
	demos/VideoPlayer.html
3d7df6e
Alexey Novak FLUID-4554: Changed code to reflect pull request changes. html5Captio…
…nator is created only if HTML5 detected. Multiple code optimizations.
1a84a2e
Alexey Novak FLUID-4554: Removed browser detection from html5Captioner 1981df1
Alexey Novak Merge branch 'master' into FLUID-4554
Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js
	js/VideoPlayer_captionner.js
5d307aa
Anastasia Cheetham FLUID-4589: First sketch of language menu subcomponent 6eb0eb2
Anastasia Cheetham FLUID-4589: Temporary commit f7085cc
Anastasia Cheetham FLUID-4589: Clean up code, remove unnecessary state from model f57d4b6
Anastasia Cheetham FLUID-4589: Add support for initial caption selection 16354ec
Anastasia Cheetham FLUID-4589: Hide menu on DOWN at bottom. 72d9bcf
Alexey Novak FLUID-4554: Removed unused files and statements as well as CSS. Fixed…
… time update event after talking to Cindy. Addressed pull request comments.
1a6bd14
Anastasia Cheetham FLUID_4589: Expand caption model to include labels, src... Move updat…
…ing into public function; Update "off" label.
6a85c5b
Anastasia Cheetham FLUID-4589: Refactor tests to remove duplication, separate customizat…
…ions from defaults.
aca51b4
Anastasia Cheetham Merge branch 'master' into FLUID-4589-languageControls-subcomponents bd429e9
Anastasia Cheetham FLUID-4589: Beginning to integrate new languageControls into player. 73edd9c
Anastasia Cheetham FLUID-4589: Hide captions when 'none' selected. 3cb5dd2
Anastasia Cheetham FLUID-4589: Beginning to integrate keyboard controls 3c52989
Anastasia Cheetham FLUID-4589: Clean up unused code; properly set languageControls butto…
…n selector.
8ad9272
Anastasia Cheetham FLUID-4589: Return focus to language button when down-arrow hides menu de1d33c
Anastasia Cheetham FLUID-4589: Add styles for menu; place focus on button when menu hidd…
…en through language activation.
8ebcaea
Anastasia Cheetham FLUID-4589: Code clean-up 7096574
Anastasia Cheetham FLUID-4589: Separate the 'none' option from the list of languages 0a7af1f
Anastasia Cheetham FLUID-4589: Fix to ensure languageMenu will work with multiple instan…
…ces.
83b77cc
Anastasia Cheetham FLUID-4589: Comments and some renaming, for improved clarity fa7b6f1
Anastasia Cheetham FLUID-4589: Clean up event binding between button and menu 4abc5cd
Anastasia Cheetham FLUID-4589: Code clean-up b65c62d
Anastasia Cheetham FLUID-4589: Use anchor for captions button, to support blur 5c22ce1
Anastasia Cheetham FLUID-4589: Place a button inside the anchor, for visual styling (FLU…
…ID-4606)
b33d1b6
Anastasia Cheetham FLUID-4589: Fix to correctly upate 'pressed' state of captions button 213e2d9
Anastasia Cheetham FLUID-4589: Removing 'fl-theme' from stylesheet. 92e9232
Anastasia Cheetham FLUID-4589: Remove 'fl-theme' from the html 83e0eba
Alexey Novak Merge branch 'master' into FLUID-4554
Conflicts:
	css/VideoPlayer.css
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js
	js/VideoPlayer_captionner.js
a9fa9b5
Anastasia Cheetham FLUID-4608: Beginning to restructure controllers to use new model str…
…ucture.
26de02a
Anastasia Cheetham FLUID:4589: First stage of restoring the 'displayCaptions' flag 3d5b550
Anastasia Cheetham FLUID-4589: Remove hard-coded path to show/hide flag b9c5de6
Anastasia Cheetham FLUID-4589: Fix failing tests. 0cb627e
Anastasia Cheetham FLUID-4589: Add button to exclusions list 2e8c761
Anastasia Cheetham Merge branch 'FLUID-4589-caption-controls-refactor' into FLUID-4608+4…
…589-caption-controls-model-restructure
fd1ae1c
Alexey Novak FLUID-4554: First modifications to html5Captionator code to comply wi…
…th the new videoPlayer options redesign
a779a67
Anastasia Cheetham FLUID-4608: Revise languageMenu to new model style; update tests. 3fa2605
Alexey Novak FLUID-4554: Redesign of the videoPlayer to work with new model. Capti…
…on controls do not work. Need code cleaning.
38c74f4
Anastasia Cheetham FLUID-4608: First tests for language controls with new model a10c779
Anastasia Cheetham FLUID-4608: More test for language controls 91cb865
FLUID-4610: Half-completed transcript UI. 87ba52e
FLUID-4610: Added images and transcript json files for transcript work. 0119159
Alexey Novak FLUID-4554: Fixing model of html5Captionator and applier in it 28e6919
Anastasia Cheetham FLUID-4608: More test for language controls with new model ce539c7
Anastasia Cheetham FLUID-4608: More tests 3003219
FLUID-4610: Resolved the conflicts at merging in 'master' 15c9518
FLUID-4610: Fixed the template. a4f84f8
Anastasia Cheetham FLUID-4608: Tests updated and passing 091c6ee
Anastasia Cheetham FLUID-4608: Added some comments 464bd57
Anastasia Cheetham Merge branch 'master' into FLUID-4608+4589-caption-controls-model-res…
…tructure
344f528
Alexey Novak Merge branch 'FLUID-4554m' into FLUID-4608+4589-caption-controls-mode…
…l-restructure

Conflicts:
	css/VideoPlayer.css
	demos/VideoPlayer.html
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js
b612d25
Alexey Novak FLUID-4608-merge: fixing my html5Captionator issues since it was list…
…ening to the wrong elPaths in the model.
14b59bf
Alexey Novak FLUID-4608-merge: Fixed controllers part to work with a new model. c3cb43b
Alexey Novak FLUID-4608-merge: First attempt to fix a mammal page 0637f22
Alexey Novak FLUID-4608-merge: A fix for html5Captionator. Now captions should rer…
…ender properly after video-resize as well as showing/hiding UIO options.
f21490b
Alexey Novak FLUID-4608-merge: Fixed lower case file name issue. Added missing VTT…
… files.
4f0b37d
FLUID-4610: Load and parse the transcript file. a6d1440
Alexey Novak FLUID-4608-merge: Fixed inArray conditions for html5Captionator 500d4ae
Alexey Novak FLUID-4608-merge: Added README and LICENSE files for the Captionator.js 1f3a13b
Michelle Merge remote-tracking branch 'alexn/FLUID-4608-merge' into demo
* alexn/FLUID-4608-merge:
  FLUID-4608-merge: Added README and LICENSE files for the Captionator.js
  FLUID-4608-merge: Fixed inArray conditions for html5Captionator
  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-4608: More tests
  FLUID-4608: More test for language controls with new model
  FLUID-4554: Fixing model of html5Captionator and applier in it
  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.
0fc93b9
Alexey Novak FLUID-4608-merge: Fixed some filenames since they were not capitalized cb91905
Alexey Novak Merge branch 'FLUID-4608-merge' into demo 4968e31
FLUID-4610: Display the load-in transcripts. 4a8ae34
Alexey Novak FLUID-4613: Quick change to the captions of the videoPlayer to be res…
…ponsive 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.
5e98745
Alexey Novak FLUID-4616: Added french captions in .vtt and .json formats 30e9129
Alexey Novak FLUID-4613: Now caption area does not take 100% width space of the vi…
…deo. 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.
b95b53c
FLUID-4610: Resolved the conflicts at merging in michelle/demo' as we…
…ll as improving transcript work to display the concatenated transcript elements.
129c805
Merge remote-tracking branch 'michelle/demo' into FLUID-4610 012b948
FLUID-4610: More merge-in from "michelle/demo" and a bit of language …
…adjustment.
718cafd
FLUID-4610: Removed the inclusion of the unminified infusion lib from…
… the videoPlayer.html.
6d24563
FLUID-4610: Highlight the transcript element that's currently playing. 4fb407f
FLUID-4610: Auto scroll transcript div to the highlighted element. Mo…
…re polish-up is needed.
498922d
FLUID-4610: Recovered "Mammals.js", fixed the Mammal demo styling iss…
…ue in a tacky way, which needs a better solution, modified the caption json files into transcript files.
5d79eb6
Colin Clark 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.
da997ae
Colin Clark 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
5bf6749
Alexey Novak FLUID-4608-merge: Fixing up tests, still need to wait for the transcr…
…ipt fix to make them work.
129d412
Alexey Novak Merge branch 'demo' into FLUID-4596 f306e49
Alexey Novak FLUID-4596: Showing captions on top of the scrubber bar. Placed capti…
…ons into a caption DIV.
0c59c1d
Alexey Novak FLUID-4596: Adding comments. 3772f50
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.
53641dd
Alexey Novak Merge branch 'demo' into FLUID-4596 c312a07
Alexey Novak FLUID-4596: Fixed html5Captionator tests since we changed the contain…
…er which captionator takes.
5eb1870
FLUID-4610: Implemented the auto-scrolling of the transcript DIV onto…
… the highlighted element.
9ef73fa
Colin Clark 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
99f24e5
Colin Clark FLUID-4596: Inner glow for the controls area. b8dcb69
Alexey Novak FLUID-4618: Fixed html5Captionator tests as well as fixed html5Captio…
…nator in order to use proper selectors.
a97663e
Michelle Merge remote-tracking branch 'colinbdclark/FLUID-4596' into demo
* colinbdclark/FLUID-4596:
  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
d278669
FLUID-4610: Synchronized the transcript language selections btw the b…
…utton popup menu and drop down list box.
8fc9bb9
Merge remote-tracking branch 'michelle/demo' into FLUID-4610 90bed3a
FLUID-4610: Removed the line-height from the transcript DIV styling s…
…o that the UIO line spacing setting can be applied onto this DIV.
8b90be4
Alexey Novak FLUID-4619: Experimental code with hiding/showing controls ce4a133
Colin Clark Merge remote-tracking branch 'michelled/demo' into FLUID-4596
* michelled/demo:
  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.
48020bd
Michelle FLUID-4619: Made the controllers show on focus and on mouse enter. dd33fc9
Colin Clark 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
8a635e3
Colin Clark FLUID-4596: Moved time display into the scrubber handle. Gradient for…
… scrubber range.
5aa0028
Colin Clark Merge branch 'FLUID-4596' into demo
* FLUID-4596:
  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-4596: Inner glow for the controls area.
9d6d478
Colin Clark FLUID-4596: Prevents propagation and the default action on all toggle…
… button-related clicks.
d805d9b
Colin Clark Merge branch 'FLUID-4596' into demo
* FLUID-4596:
  FLUID-4596: Prevents propagation and the default action on all toggle button-related clicks.
b2c5c28
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.
c55017f
Michelle Merge branch 'demo' into FLUID-4619 3f7734b
Michelle FLUID-4619: Better placement of the captions when the controllers hid…
…e and show.
ff9fa29
FLUID-4610: Make transcript elements clickable. a21d842
Michelle FLUID-4616: French translations corrected by Charly Molter. b188bdb
Colin Clark FLUID-4596: Rough workaround for line spacing unresponsiveness. 56e1c2a
Alexey Novak Merge branch 'demo' into FLUID-4616 a9f71e9
Alexey Novak FLUID-4616: French translations corrected by Charly Molter. Alex - re…
…generated vtt files.
e4a48a5
Alexey Novak Merge branch 'm-FLUID-4619' into FLUID-4619
Conflicts:
	js/VideoPlayer.js

Where m-FLUID-4619 is a FLUID-4619 branch in michelled repo
9e4f79b
Alexey Novak FLUID-4619: Changing captionator's dynamic styling, changing videoPla…
…yer 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/
a4b7577
Alexey Novak Merge branch 'demo' into FLUID-4619 71aa5d7
Alexey Novak FLUID-4619: Removing commented out code from videoPlayer.css and vide…
…oPlayer.js files. Fixing styling of the transcript area by removing its horizontal scroll and fixing its height.
eb9d966
Alexey Novak FLUID-4619: Removed fl-videoPlayer-captionArea-up d14c3c4
Michelle Merge remote-tracking branch 'alexn/FLUID-4619' into demo
* alexn/FLUID-4619:
  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-4619: Better placement of the captions when the controllers hide and show.
  FLUID-4619: Made the controllers show on focus and on mouse enter.
  FLUID-4619: Experimental code with hiding/showing controls
72115b2
Alexey Novak Merge branch 'demo' into FLUID-4616 7988c42
Colin Clark Merge remote-tracking branch 'michelled/demo' into FLUID-4596
* michelled/demo:
  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-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-4619: Made the controllers show on focus and on mouse enter.
  FLUID-4619: Experimental code with hiding/showing controls
928b188
FLUID-4610: Converted the caption json files to transcript json files. 5637816
Alexey Novak FLUID-4570: An attempt to make a full screen video using webkit. 1f2e152
Alexey Novak Merge branch 'demo' into FLUID-4570 6d0fbb3
FLUID-4610: Fixed the issue that closing the transcript leaves a grey…
… background behind.
e72d0b7
Alexey Novak FLUID-4570: Fixed maximize button in Chrome, Firefox and Safari. Comm…
…ented on the code which must be moved away from the fullscreen function.
7aaeb0e
Colin Clark Merge remote-tracking branch 'michelled/demo' into FLUID-4596
* michelled/demo:
  FLUID-4610: Fixed the issue that closing the transcript leaves a grey background behind.
  FLUID-4610: Converted the caption json files to transcript json files.
9073207
Michelle FLUID-4607: Upgrading Infusion to the version that has the media panel. 877d03d
Michelle Merge branch 'FLUID-4607' into demo
* FLUID-4607:
  FLUID-4607: Upgrading Infusion to the version that has the media panel.
13ffb6b
FLUID-4610: Fixed the interval event queuing-up issue when the scrubb…
…er bar is slid back and forth quickly.
be6b204
Merge remote-tracking branch 'michelle/demo' into FLUID-4610 fd58fab
Michelle FLUID-4607: Changing the fat panel frame html to link in MyInfusion i…
…nstead of the individual javascript files.
0779689
Michelle Merge branch 'FLUID-4607' into demo c40a4a5
Merge remote-tracking branch 'michelle/demo' into FLUID-4610 ed3dd7a
Alexey Novak Merge branch 'demo' into FLUID-4570
Conflicts:
	js/VideoPlayer.js
b0aff7d
Colin Clark FLUD-4621: Splits toggle button, language menu, and language button i…
…nto two separate files.
52db579
Michelle FLUID-4607: Adding in the media panel CSS file. 85bb8e7
Michelle Merge branch 'FLUID-4607' into demo
* FLUID-4607:
  FLUID-4607: Adding in the media panel CSS file.
8ad4b41
Merge remote-tracking branch 'michelle/demo' into FLUID-4610 ac362bd
Michelle Merge remote-tracking branch 'alexn/FLUID-4570' into demo
* alexn/FLUID-4570:
  FLUID-4570: Fixed maximize button in Chrome, Firefox and Safari. Commented on the code which must be moved away from the fullscreen function.
  FLUID-4570: An attempt to make a full screen video using webkit.
f46853f
Colin Clark FLUID-4621: Adds Anastasia's version of the ToggleButton from her FLU… e0f7538
FLUID-4610: Fixed the typo of "langaugeDropdown". 4e7f609
Colin Clark FLUID-4621: Added toggle button and language menu files to the Mammal…
…s demo.
b3b2bc9
Colin Clark Merge branch 'FLUID-4621' into demo
* FLUID-4621:
  FLUID-4621: Added toggle button and language menu files to the Mammals demo.
  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
  FLUD-4621: Splits toggle button, language menu, and language button into two separate files.
35b9996
Alexey Novak FLUID-4570: Removing transcript height configuration from the fullscr…
…een function.
eeefd19
Alexey Novak Merge branch 'demo' into FLUID-4570
Conflicts:
	js/VideoPlayer.js
141712a
Colin Clark Merge remote-tracking branch 'michelled/demo' into FLUID-4596
* michelled/demo:
  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-4570: An attempt to make a full screen video using webkit.
e0e0d45
Antranig Basman 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.
e2d5126
Michelle Merge remote-tracking branch 'alexn/FLUID-4570' into demo
* alexn/FLUID-4570:
  FLUID-4570: Removing transcript height configuration from the fullscreen function.
5e8007d
Alexey Novak FLUID-4622: Disabling captions and transcripts by default. 1b50d57
Colin Clark 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
3cf9300
Alexey Novak FLUID-4622: Disabling captions by setting them to false in the videoP…
…layer.js and removing from the videoPlayer schemes in HTML
f4a0ade
Colin Clark Merge remote-tracking branch 'michelled/demo' into FLUID-4596
* michelled/demo:
  FLUID-4570: Removing transcript height configuration from the fullscreen function.
d609558
Alexey Novak FLUID-4570: Fixing the regression by introducing an invoker and attac…
…hing listeners to the new function since fullscreen is not an option anymore
913d98b
Colin Clark FLUID-4596: fixes language menu styles in Firefox 10, related to perc…
…entage-based widths
761e49b
Michelle Merge remote-tracking branch 'alexn/FLUID-4570' into demo
* alexn/FLUID-4570:
  FLUID-4570: Fixing the regression by introducing an invoker and attaching listeners to the new function since fullscreen is not an option anymore
209cd5e
Alexey Novak FLUID-4619: Moving captions a bit higher on top of the time div. 6215907
Michelle Merge remote-tracking branch 'alexn/FLUID-4619' into demo
* alexn/FLUID-4619:
  FLUID-4619: Moving captions a bit higher on top of the time div.
90f040f
Alexey Novak Merge branch 'demo' into FLUID-4622 185977e
Alexey Novak FLUID-4622: Making html5Captionator tests up to date since videoPlaye…
…r turns off captions and transcripts by default now.
97f7543
Michelle Merge remote-tracking branch 'alexn/FLUID-4622' into demo
* alexn/FLUID-4622:
  FLUID-4622: Making html5Captionator tests up to date since videoPlayer turns off captions and transcripts by default now.
  FLUID-4622: Disabling captions by setting them to false in the videoPlayer.js and removing from the videoPlayer schemes in HTML
  FLUID-4622: Disabling captions and transcripts by default.
5e39660
Alexey Novak FLUID-4619: Fixing the height of the transcript area. 59e13e0
Alexey Novak FLUID-4619: Styling height of the transcript content so that it looks…
… better on the Mammals demo page
4d5f97c
Michelle Merge remote-tracking branch 'alexn/FLUID-4619' into demo
* alexn/FLUID-4619:
  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.
1e6b597
Alexey Novak Merge branch 'demo' into FLUID-4619 25215ef
Michelle Merge remote-tracking branch 'colinbdclark/FLUID-4596' into demo
* colinbdclark/FLUID-4596:
  FLUID-4596: fixes language menu styles in Firefox 10, related to percentage-based widths
  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-4596: Rough workaround for line spacing unresponsiveness.
e99ad13
Colin Clark FLUID-4596: high contrast button styles for the video player 58556bf
Antranig Basman Merged up with latest demo branch
Language selection now working!
Integration is quite close - requires work on volume, and correct idiom for interaction of checkboxes and language control

Merge remote-tracking branch 'michelled/demo' into demo

Conflicts:
	demos/Mammals.js
	js/VideoPlayer.js
d54629c
Alexey Novak FLUID-4608-merge: Removing the cause for console error messages which…
… are generated when tests are executed.
3f6f424
Michelle Merge remote-tracking branch 'alexn/FLUID-4608-merge' into demo
* alexn/FLUID-4608-merge:
  FLUID-4608-merge: Removing the cause for console error messages which are generated when tests are executed.
cbdda27
Alexey Novak FLUID-4619: Experimental code with a markup redesign as well as prope…
…r 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.
e2c527e
Michelle FLUID-4596: Renaming a couple of the icons to match the convention. d8b00d2
Michelle Merge branch 'FLUID-4596' into demo
* FLUID-4596:
  FLUID-4596: Renaming a couple of the icons to match the convention.
  FLUID-4596: high contrast button styles for the video player
eaa9dbd
Michelle Merge remote-tracking branch 'alexn/FLUID-4619' into FLUID-4596 63f36bc
Michelle FLUID-4596: Modifying the toggle button to have an inital state. Adde…
…d styles to show the pressed state for the captions and transcript buttons.
da2e1ee
Antranig Basman Merge remote-tracking branch 'michelled/demo' into demo d7f3076
Alexey Novak Merge branch 'demo' into FLUID-4619 e8cab58
Michelle FLUID-4596: Improving the styling of the scrubber handles in the high…
… contrast themes.
a89fdab
Alexey Novak FLUID-4619: Cindy and Alex worked on the cross-browser styling for th…
…e 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!
1d8ba3e
Michelle FLUID-4596: Improving the styling of the scrubber in the high contras…
…t themes.
bf84a82
Michelle Merge remote-tracking branch 'alexn/FLUID-4619' into demo
* alexn/FLUID-4619:
  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-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.
a00d8b4
Michelle Merge branch 'demo' into FLUID-4596 98e0e2c
Antranig Basman Merge remote-tracking branch 'michelled/demo' into demo e5b9034
Michelle FLUID-4596: Adding a comment to the stylesheet. 49841c6
Michelle Merge remote-tracking branch 'origin/FLUID-4596' into demo
* origin/FLUID-4596:
  FLUID-4596: Adding a comment to the stylesheet.
  FLUID-4596: Improving the styling of the scrubber in the high contrast themes.
  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.
b38e160
Antranig Basman FLUID-4587: Mostly working version of media options integration, toge…
…ther with fixes for a number of other demo issues:

"selecting the already select option does not hide the menu for transcripts and captions"
"volume slider needs a background - too easy to have it disappear when trying to change the volume"
"volume slider should be above scrubbing handle"
"multiple quick hovers cause ghosting of appearance/disappearance of controls"
81ecb07
FLUID-4619: Properly named the video player main container. 6bf2a3e
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  FLUID-4587: Mostly working version of media options integration, together with fixes for a number of other demo issues:
  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.
f90960e
Alexey Novak FLUID-4627: Applying styling improvements on the transcript area. bea7a79
Alexey Novak Merge branch 'demo' into FLUID-4627 af8ab11
Alexey Novak FLUID-4627: Refactoring CSS in order to remove some of the !important…
… statements as well as remove redundancy.
f459f60
Michelle Merge remote-tracking branch 'alexn/FLUID-4627' into demo
* alexn/FLUID-4627:
  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.
772eb37
FLUID-4627: Make the mammal demo video larger as well as some code cl…
…ean-up.
9184424
Merge branch 'demo' into FLUID-4610 d886fd0
FLUID-4627: Removed resizeHandler() which is no longer in use. 7e9a306
Michelle Merge remote-tracking branch 'cindyli/FLUID-4610' into demo
* cindyli/FLUID-4610:
  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-4619: Properly named the video player main container.
04c6def
Antranig Basman 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
66729a8
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  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
7d613a0
Antranig Basman FLUID-4582: Added media panel integration into VideoPlayer demo page aed8316
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  FLUID-4582: Added media panel integration into VideoPlayer demo page
79f87d3
Antranig Basman FLUID-4622: Reverting effect of bad merge which regressed track names…
… from "French" back to "French Transcripts"
3194540
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  FLUID-4622: Reverting effect of bad merge which regressed track names from "French" back to "French Transcripts"
996b31f
Antranig Basman FLUID-4610 - Adding 1ms to start time to avoid rounding error removes…
… "can't click on next transcript" bug
78e30f7
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  FLUID-4610 - Adding 1ms to start time to avoid rounding error removes "can't click on next transcript" bug
db05e6d
Antranig Basman FLUID-4582: Fix for various issues relating to synchronization of cap…
…tions 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".
cc955fe
Michelle FLUID-4582: Adding the new video player framework file to the simple …
…video player demo.
89b8020
Michelle Merge branch 'demo-integration-sketch' into demo
* demo-integration-sketch:
  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".
05deea2
Michelle FLUID-4596: Fixing the colours for the volume slider and the font siz…
…e on the scrubber handle.
58f71c9
FLUID-4632: Add/pass/listen to buffered info. The reflection on the s…
…crubber bar is followed.
9b8ed91
Merge remote-tracking branch 'michelle/demo' into demo 1719c82
FLUID-4632: Removed debug code. 7f78138
Michelle Merge branch 'FLUID-4596' into demo
* FLUID-4596:
  FLUID-4596: Fixing the colours for the volume slider and the font size on the scrubber handle.
62b63aa
Merge remote-tracking branch 'michelle/demo' into FLUID-4632 7273b55
Antranig Basman FLUID-4582: Incomplete work on mute button a36ef94
FLUID-4632: Implemented the buffered progress bar by using fluid.prog…
…ress component as well as some styling fixes.
b453c42
Michelle FLUID-4635: Commenting out console.log statements which prevent the v…
…ideo player from working in IE when the dev tools are off.
c636863
Michelle Merge branch 'FLUID-4635' into demo
* FLUID-4635:
  FLUID-4635: Commenting out console.log statements which prevent the video player from working in IE when the dev tools are off.
ccb0c86
Merge branch 'demo' of https://github.com/michelled/videoPlayer into …
…FLUID-4632
4ff1d84
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.
96315d0
FLUID-4632: Added unit tests as well as code clean-up. 9f9b90a
Michelle Merge remote-tracking branch 'cindyli/FLUID-4632' into demo
* cindyli/FLUID-4632:
  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-4632: Implemented the buffered progress bar by using fluid.progress component as well as some styling fixes.
  FLUID-4632: Removed debug code.
  FLUID-4632: Add/pass/listen to buffered info. The reflection on the scrubber bar is followed.
520b082
Antranig Basman Merge remote-tracking branch 'michelled/demo' into demo 68600e3
Antranig Basman FLUID-4607: Apparently working version which has been returned to usi…
…ng 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.
dad9da7
Antranig Basman FLUID-4607: Cleaned up implementation of mute button, verified functi…
…on 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.
5053d98
Antranig Basman FLUID-4607: Fixed up controls test case for rename of volume controls…
… out of condemned "controllers" package
d9cca47
Alexey Novak FLUID-4677: Adding type to the textTrack so that we can use it in ord…
…er to get jsonp later on
54aba86
Alexey Novak FLUID-4677: First working example with jsonp 6479ee0
Alexey Novak FLUID-4677: Parsing json to vtt format 3a25f3c
Alexey Novak FLUID-4677: Working captionator with jsonp. Need to clean up code. 0ddc687
Alexey Novak FLUID-4677: Code before cleaning up d5ae0f2
Alexey Novak FLUID-4677: Cleaned up code. 58bc0af
Alexey Novak FLUID-4677: Tiny change for error handling 8cf77c8
Alexey Novak FLUID-4677: Change function names to more appropriate ones. f2e8f7e
Michelle Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo
* amb26/demo-integration-sketch:
  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-4582: Incomplete work on mute button
cbb5fee
Alexey Novak FLUID-4677: Removed a testing line from the header 2701055
Alexey Novak FLUID-4677: Added language to the Universal Subtitles URL to pull EN …
…language, just in case
459cdd4
Alexey Novak FLUID-4677: Added a link to the StackOverflow page where the code was…
… taken to do a JSONP request
8eb5053
Alexey Novak FLUID-4677: Changed the code according to Michelle's feedback. Optimi…
…zing and cleaning up the code. Removing a minified version of the captionator since it is not in use.
e4327cb
Michelle Merge remote-tracking branch 'alexn/FLUID-4677' into demo
* alexn/FLUID-4677:
  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
41072d5
Antranig Basman FLUID-4607, FLUID-4531: Successfully deforked framework version of UI…
…Options and all media panel materials moved back out into videoPlayer project.
a52ce5e
Antranig Basman FLUID-4607: Finished migrating out the last few media-specific icons …
…and CSS from the core framework
7a30a01
Antranig Basman Updated to latest infusion branch build after review fixes 0e0f140
Antranig Basman FLUID-4607: Small tweaks to demonstrate that video players can be cre…
…ated 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.
a68fb05
Anastasia Cheetham FLUID-4694: First sketch of handling Universal Subtitles files for tr…
…anscripts
e4453ee
Anastasia Cheetham FLUID-4694: Add commented code for demo, plus comments in the new code. 0d3a661
Michelle Merge remote-tracking branch 'acheetham/FLUID-4694-demo-unisub-transc…
…ripts' into demo

* acheetham/FLUID-4694-demo-unisub-transcripts:
  FLUID-4694: Add commented code for demo, plus comments in the new code.
  FLUID-4694: First sketch of handling Universal Subtitles files for transcripts
0d585c5
Antranig Basman FLUID-4607: Fix for issue where zero video players were created on th…
…e original page, and the first was not created until after UIOptions has fully initialised
21c5121
Antranig Basman Merge remote-tracking branch 'origin/demo' into demo 4814567
Antranig Basman FLUID-4607: Swapped order of CSS includes to prevent issues with jQue…
…ry UI "lightness" style
f429a1b
Michelle
Collaborator

Merged into demo branch at 1e8d05c

Michelle michelled closed this April 17, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.