[Commits] [fluid-project/videoPlayer] 74ac7e: FLUID-4554: The first working draft of captionator...

GitHub noreply at github.com
Thu Mar 22 20:11:25 UTC 2012


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 74ac7e2810cb704dd6f2cf3bef2a7e18fb32e336
      https://github.com/fluid-project/videoPlayer/commit/74ac7e2810cb704dd6f2cf3bef2a7e18fb32e336
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/ReorganizeFuture.en.vtt
  M demos/VideoPlayer.html
  M js/VideoPlayer.js
  A js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  A lib/captionator/css/captions.css
  A lib/captionator/js/captionator-min.js
  A lib/captionator/js/captionator.js

  Log Message:
  -----------
  FLUID-4554: The first working draft of captionator integration.


  Commit: b27991a7fc823968961b4efb2fa36eebd77ebd0e
      https://github.com/fluid-project/videoPlayer/commit/b27991a7fc823968961b4efb2fa36eebd77ebd0e
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M demos/ReorganizeFuture.en.vtt
  A demos/ReorganizeFuture.fr.vtt
  M demos/VideoPlayer.html
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  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.


  Commit: 5e9167a009a1302594af7c0c55c6bbf4fb38c200
      https://github.com/fluid-project/videoPlayer/commit/5e9167a009a1302594af7c0c55c6bbf4fb38c200
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  #FLUID-4554: Extended html5Captionator with functions. Changed currentTrack to currentTracks since we can have multiple active languages showed.


  Commit: 8e798514165fee9a292588f832ced5522232aa72
      https://github.com/fluid-project/videoPlayer/commit/8e798514165fee9a292588f832ced5522232aa72
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  #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.


  Commit: 46d3f29fdd74a6a35e9ed54570235ce55e92d13b
      https://github.com/fluid-project/videoPlayer/commit/46d3f29fdd74a6a35e9ed54570235ce55e92d13b
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  R js/VideoPlayer_captionLoader.js
  R js/VideoPlayer_captionner.js
  M js/VideoPlayer_html5Captionator.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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.


  Commit: d6fde390436f5968bf02605d49c84525b2e398d4
      https://github.com/fluid-project/videoPlayer/commit/d6fde390436f5968bf02605d49c84525b2e398d4
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_html5Captionator.js
  A tests/html/TestCaptions.en.vtt
  A tests/html/TestCaptions.fr.vtt
  A tests/html/TestVideo.mp4
  A tests/html/VideoPlayerHTML5Captionator-test.html
  A tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  #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.


  Commit: cdc54a8ce16f2fc2c4b99ffd5a83565c76d7e39c
      https://github.com/fluid-project/videoPlayer/commit/cdc54a8ce16f2fc2c4b99ffd5a83565c76d7e39c
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  #FLUID-4554: Cleaned up tests and had to merge with upstream to make my tests to work.


  Commit: 57ea11a0d25732934bae5cd747fd9eb525826a0c
      https://github.com/fluid-project/videoPlayer/commit/57ea11a0d25732934bae5cd747fd9eb525826a0c
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  #FLUID-4554: Wrote tests. Added some fail checks if no tracks are present in the model or currentTrack is missing. Few more modifications.


  Commit: b4ec458b00494a0bfbbc7baeb870e576ce04b4a9
      https://github.com/fluid-project/videoPlayer/commit/b4ec458b00494a0bfbbc7baeb870e576ce04b4a9
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  #FLUID-4554: Refactored tests to be smaller and more optimized. Refactored and optimized the main captionator code to be more compact.


  Commit: 7f6f37f5d270d97457e5b9b61bd93ab7f5a63faf
      https://github.com/fluid-project/videoPlayer/commit/7f6f37f5d270d97457e5b9b61bd93ab7f5a63faf
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4554: A small conflict resolving after a rebase


  Commit: 4758c26dfaedb191cad6f7e46bf429131946d670
      https://github.com/fluid-project/videoPlayer/commit/4758c26dfaedb191cad6f7e46bf429131946d670
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_media.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4554: Few more optimizations.


  Commit: 3d7df6ea7f476b1920fa27d75ead9f213d8f89fe
      https://github.com/fluid-project/videoPlayer/commit/3d7df6ea7f476b1920fa27d75ead9f213d8f89fe
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/ReorganizeFuture.fr.json
  M demos/VideoPlayer.html
  M js/VideoPlayer_media.js
  M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  A lib/infusion/components/tableOfContents/css/TableOfContents.css
  A lib/infusion/components/tableOfContents/html/TableOfContents.html
  A lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  A lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  A lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  A lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  A lib/infusion/components/uiOptions/css/FullUIOptions.css
  A lib/infusion/components/uiOptions/css/UIOptions.css
  A lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  A lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  A lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  A lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  A lib/infusion/components/uiOptions/html/FullNoPreviewUIOptions.html
  A lib/infusion/components/uiOptions/html/FullPreviewUIOptions.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_cancel_hc_13x13.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_save_hc_13x13.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_cancel_blackYellow_13x13.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_save_blackYellow_13x13.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
  A lib/infusion/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_cancel_default_13x13.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_save_default_13x13.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_sliderhandle.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
  A lib/infusion/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_cancel_hci_13x13.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_reset_hci_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_save_hci_13x13.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_cancel_yellowBlack_13x13.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_save_yellowBlack_13x13.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
  A lib/infusion/framework/fss/css/fss-JSR168Bridge.css
  A lib/infusion/framework/fss/css/fss-base-context.css
  A lib/infusion/framework/fss/css/fss-base-global.css
  A lib/infusion/framework/fss/css/fss-layout.css
  A lib/infusion/framework/fss/css/fss-mobile-layout.css
  A lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  A lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  A lib/infusion/framework/fss/css/fss-reset-context.css
  A lib/infusion/framework/fss/css/fss-reset-global.css
  A lib/infusion/framework/fss/css/fss-reset.css
  A lib/infusion/framework/fss/css/fss-text.css
  A lib/infusion/framework/fss/css/fss-theme-bw.css
  A lib/infusion/framework/fss/css/fss-theme-by.css
  A lib/infusion/framework/fss/css/fss-theme-coal.css
  A lib/infusion/framework/fss/css/fss-theme-debug.css
  A lib/infusion/framework/fss/css/fss-theme-hc.css
  A lib/infusion/framework/fss/css/fss-theme-hci.css
  A lib/infusion/framework/fss/css/fss-theme-mist.css
  A lib/infusion/framework/fss/css/fss-theme-rust.css
  A lib/infusion/framework/fss/css/fss-theme-slate.css
  A lib/infusion/framework/fss/css/fss-theme-wb.css
  A lib/infusion/framework/fss/css/fss-theme-yb.css
  A lib/infusion/framework/fss/css/fss-transitions.css
  A lib/infusion/framework/fss/images/exclamation.png
  A lib/infusion/framework/fss/images/gripper.png
  A lib/infusion/framework/fss/images/themes/_common/exclamation.png
  A lib/infusion/framework/fss/images/themes/_common/gloss_25_repeater.png
  A lib/infusion/framework/fss/images/themes/_common/gripper.png
  A lib/infusion/framework/fss/images/themes/android/backbutton_mask.png
  A lib/infusion/framework/fss/images/themes/android/button_bg_insetShadow.png
  A lib/infusion/framework/fss/images/themes/android/listmenu_arrow.png
  A lib/infusion/framework/fss/images/themes/android/listmenu_loader.gif
  A lib/infusion/framework/fss/images/themes/android/listmenu_loader.png
  A lib/infusion/framework/fss/images/themes/android/navbar_back_button_insetShadow.png
  A lib/infusion/framework/fss/images/themes/android/navbar_normal_button_insetShadow.png
  A lib/infusion/framework/fss/images/themes/bw/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/bw/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/bw/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/bw/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/bw/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/bw/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/bw/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/by/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/by/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/by/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/by/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/by/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/by/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/by/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-light-bg.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-light-cap.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/coal/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/coal/icon-menu-Delete.png
  A lib/infusion/framework/fss/images/themes/coal/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/coal/icon-widget-Less.png
  A lib/infusion/framework/fss/images/themes/coal/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/coal/icon-widget-ShowSettings.png
  A lib/infusion/framework/fss/images/themes/coal/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-active-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-active-cap.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-cap.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-container-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-light-content-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-active-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-active-cap.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-cap.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-container-bg.png
  A lib/infusion/framework/fss/images/themes/coal/tabs-med-content-bg.png
  A lib/infusion/framework/fss/images/themes/coal/widget-bg.png
  A lib/infusion/framework/fss/images/themes/iphone/backbutton_mask.png
  A lib/infusion/framework/fss/images/themes/iphone/button_bg_insetShadow.png
  A lib/infusion/framework/fss/images/themes/iphone/listmenu_arrow.png
  A lib/infusion/framework/fss/images/themes/iphone/listmenu_loader.gif
  A lib/infusion/framework/fss/images/themes/iphone/listmenu_loader.png
  A lib/infusion/framework/fss/images/themes/iphone/navbar_back_button_insetShadow.png
  A lib/infusion/framework/fss/images/themes/iphone/navbar_normal_button_insetShadow.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-light-bg.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-light-cap.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/mist/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/mist/icon-menu-Delete.png
  A lib/infusion/framework/fss/images/themes/mist/icon-options-ListOrGrid.png
  A lib/infusion/framework/fss/images/themes/mist/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/mist/icon-widget-Less.png
  A lib/infusion/framework/fss/images/themes/mist/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/mist/icon-widget-ShowSettings.png
  A lib/infusion/framework/fss/images/themes/mist/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-light-active-bg.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-light-active-cap.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-light-bg.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-light-cap.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-light-container-bg.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-med-active-bg.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-med-active-cap.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-med-bg.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-med-cap.png
  A lib/infusion/framework/fss/images/themes/mist/tabs-med-container-bg.png
  A lib/infusion/framework/fss/images/themes/mist/widget-bg.png
  A lib/infusion/framework/fss/images/themes/rust/gripper.png
  A lib/infusion/framework/fss/images/themes/rust/icon-menu-Delete.png
  A lib/infusion/framework/fss/images/themes/rust/icon-options-ListOrGrid.png
  A lib/infusion/framework/fss/images/themes/rust/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/rust/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/rust/icon-widget-Settings.png
  A lib/infusion/framework/fss/images/themes/rust/menu-hover.png
  A lib/infusion/framework/fss/images/themes/rust/widget-earmark.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-light-bg.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-light-cap.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/slate/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/slate/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/slate/icon-widget-Less.png
  A lib/infusion/framework/fss/images/themes/slate/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/slate/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/slate/sprites.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-light-active-bg.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-light-active-cap.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-light-bg.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-light-cap.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-light-container-bg.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-med-active-bg.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-med-active-cap.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-med-bg.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-med-cap.png
  A lib/infusion/framework/fss/images/themes/slate/tabs-med-container-bg.png
  A lib/infusion/framework/fss/images/themes/slate/widget-bg.png
  A lib/infusion/framework/fss/images/themes/slate/widget-earmark.png
  A lib/infusion/framework/fss/images/themes/wb/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/wb/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/wb/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/wb/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/wb/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/wb/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/wb/icon-widget-gripper.png
  A lib/infusion/framework/fss/images/themes/yb/buttons-med-bg.png
  A lib/infusion/framework/fss/images/themes/yb/buttons-med-cap.png
  A lib/infusion/framework/fss/images/themes/yb/buttons-titlebar-bg.png
  A lib/infusion/framework/fss/images/themes/yb/buttons-titlebar-cap.png
  A lib/infusion/framework/fss/images/themes/yb/icon-widget-Close.png
  A lib/infusion/framework/fss/images/themes/yb/icon-widget-More.png
  A lib/infusion/framework/fss/images/themes/yb/icon-widget-gripper.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
  A lib/infusion/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
  A lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_75_cccccc_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_25_575757_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_55_cccccc_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_65_000000_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_333333_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_666666_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_2e83ff_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_75_ffffff_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_65_ffffff_1x400.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_d9e8f7_1x400.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_666666_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_999999_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_cccccc_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ffffff_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_glass_75_666666_1x400.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-hard_100_ebebeb_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-soft_75_999999_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  A lib/infusion/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
  A lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  A lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4554

Conflicts:
	css/VideoPlayer.css
	demos/VideoPlayer.html


  Commit: 1a84a2ea06d381606f95ed57899701d2398b7b69
      https://github.com/fluid-project/videoPlayer/commit/1a84a2ea06d381606f95ed57899701d2398b7b69
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4554: Changed code to reflect pull request changes. html5Captionator is created only if HTML5 detected. Multiple code optimizations.


  Commit: 1981df1e2ff3e3001c3934b52e25171db9b757e8
      https://github.com/fluid-project/videoPlayer/commit/1981df1e2ff3e3001c3934b52e25171db9b757e8
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4554: Removed browser detection from html5Captioner


  Commit: 5d307aaa2de9e171e26855e905f3adba66cbb36d
      https://github.com/fluid-project/videoPlayer/commit/5d307aaa2de9e171e26855e905f3adba66cbb36d
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M docs/index.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_intervalEventsConductor.js
  M js/VideoPlayer_media.js
  A tests/html/TestCaption.en.json
  A tests/html/VideoPlayerCaptionLoader-test.html
  A tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
  A tests/html/VideoPlayerIntervalEventsConductor-test.html
  A tests/js/IntervalEventsConductor-IntegrationTests.js
  A tests/js/VideoPlayerCaptionLoaderTests.js
  A tests/js/VideoPlayerIntervalEventsConductorTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4554

Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js
	js/VideoPlayer_captionner.js


  Commit: 6eb0eb2fc166a5956993219398b086f5e0dbf0c7
      https://github.com/fluid-project/videoPlayer/commit/6eb0eb2fc166a5956993219398b086f5e0dbf0c7
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  A tests/html/VideoPlayerControls-test.html
  A tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: First sketch of language menu subcomponent


  Commit: f7085cc20846c29bcd3dab1dc97571f7a03eb21c
      https://github.com/fluid-project/videoPlayer/commit/f7085cc20846c29bcd3dab1dc97571f7a03eb21c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Temporary commit


  Commit: f57d4b6d5679ef79a7142431e5960950e7e584cc
      https://github.com/fluid-project/videoPlayer/commit/f57d4b6d5679ef79a7142431e5960950e7e584cc
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Clean up code, remove unnecessary state from model


  Commit: 16354ec33f8959512403e7aafee2f4af7c333cbf
      https://github.com/fluid-project/videoPlayer/commit/16354ec33f8959512403e7aafee2f4af7c333cbf
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Add support for initial caption selection


  Commit: 72d9bcf3288e750a59c4a35879b87db95aa91d28
      https://github.com/fluid-project/videoPlayer/commit/72d9bcf3288e750a59c4a35879b87db95aa91d28
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Hide menu on DOWN at bottom.


  Commit: 1a6bd149f3a6fe3e26b8f946fc95af4e348c2783
      https://github.com/fluid-project/videoPlayer/commit/1a6bd149f3a6fe3e26b8f946fc95af4e348c2783
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  R tests/html/VideoPlayerCaptionLoader-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html

  Log Message:
  -----------
  FLUID-4554: Removed unused files and statements as well as CSS. Fixed time update event after talking to Cindy. Addressed pull request comments.


  Commit: 6a85c5b61951dfec4848b62a3d523b4be89f2047
      https://github.com/fluid-project/videoPlayer/commit/6a85c5b61951dfec4848b62a3d523b4be89f2047
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID_4589: Expand caption model to include labels, src... Move updating into public function; Update "off" label.


  Commit: aca51b4b1ab64db181398a5c60ba17e6d1c2f0f9
      https://github.com/fluid-project/videoPlayer/commit/aca51b4b1ab64db181398a5c60ba17e6d1c2f0f9
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Refactor tests to remove duplication, separate customizations from defaults.


  Commit: bd429e9853dcc43402701499e020ff9b7c5e7c78
      https://github.com/fluid-project/videoPlayer/commit/bd429e9853dcc43402701499e020ff9b7c5e7c78
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M docs/index.html
  M html/videoPlayer_template.html
  A images/captions-black.png
  A images/captions-white.png
  A images/captions-yellow.png
  A images/fullscreen-black.png
  A images/fullscreen-on-black.png
  A images/fullscreen-on-white.png
  A images/fullscreen-on-yellow.png
  A images/fullscreen-white.png
  A images/fullscreen-yellow.png
  A images/pause-black.png
  A images/pause-white.png
  A images/pause-yellow.png
  A images/play-black.png
  A images/play-white.png
  A images/play-yellow.png
  A images/volume-black.png
  A images/volume-muted-black.png
  A images/volume-muted-white.png
  A images/volume-muted-yellow.png
  A images/volume-white.png
  A images/volume-yellow.png
  M js/VideoPlayer.js
  M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_captionner.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4589-languageControls-subcomponents


  Commit: 73edd9c9dc3f1ea0f42d303da165b22dd2a2fcae
      https://github.com/fluid-project/videoPlayer/commit/73edd9c9dc3f1ea0f42d303da165b22dd2a2fcae
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Beginning to integrate new languageControls into player.


  Commit: 3cb5dd2d68e61c96523dd72ef98a092b618f4f0e
      https://github.com/fluid-project/videoPlayer/commit/3cb5dd2d68e61c96523dd72ef98a092b618f4f0e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Hide captions when 'none' selected.


  Commit: 3c529896fcf87ca4f8d3151d114ff3d61228115b
      https://github.com/fluid-project/videoPlayer/commit/3c529896fcf87ca4f8d3151d114ff3d61228115b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Beginning to integrate keyboard controls


  Commit: 8ad9272e8339bdfa34457e9b04644e143a6849e6
      https://github.com/fluid-project/videoPlayer/commit/8ad9272e8339bdfa34457e9b04644e143a6849e6
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html

  Log Message:
  -----------
  FLUID-4589: Clean up unused code; properly set languageControls button selector.


  Commit: de1d33c9a1cf61870fe8eff477ea96240c1bf93a
      https://github.com/fluid-project/videoPlayer/commit/de1d33c9a1cf61870fe8eff477ea96240c1bf93a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Return focus to language button when down-arrow hides menu


  Commit: 8ebcaea5d77e933ffe25f4f180e3360f144038be
      https://github.com/fluid-project/videoPlayer/commit/8ebcaea5d77e933ffe25f4f180e3360f144038be
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Add styles for menu; place focus on button when menu hidden through language activation.


  Commit: 7096574aaaf13734e1a3bb367f27c3e1c372dd02
      https://github.com/fluid-project/videoPlayer/commit/7096574aaaf13734e1a3bb367f27c3e1c372dd02
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html
  M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Code clean-up


  Commit: 0a7af1fbbdc785d0a660552987564ca058876d59
      https://github.com/fluid-project/videoPlayer/commit/0a7af1fbbdc785d0a660552987564ca058876d59
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html
  M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Separate the 'none' option from the list of languages


  Commit: 83b77cca961c36487d3a6af2df7d826201ba68d8
      https://github.com/fluid-project/videoPlayer/commit/83b77cca961c36487d3a6af2df7d826201ba68d8
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Fix to ensure languageMenu will work with multiple instances.


  Commit: fa7b6f17848a90e5339bf99cd4b3d6439621e631
      https://github.com/fluid-project/videoPlayer/commit/fa7b6f17848a90e5339bf99cd4b3d6439621e631
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Comments and some renaming, for improved clarity


  Commit: 4abc5cd73b7a81fb7300c8202b5577e6454eba5f
      https://github.com/fluid-project/videoPlayer/commit/4abc5cd73b7a81fb7300c8202b5577e6454eba5f
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Clean up event binding between button and menu


  Commit: b65c62d15f0eb8ad03e5a6148ef484a67439156b
      https://github.com/fluid-project/videoPlayer/commit/b65c62d15f0eb8ad03e5a6148ef484a67439156b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Code clean-up


  Commit: 5c22ce18386be2c49bb5c4fcde3b061d4c9221f4
      https://github.com/fluid-project/videoPlayer/commit/5c22ce18386be2c49bb5c4fcde3b061d4c9221f4
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html
  M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Use anchor for captions button, to support blur


  Commit: b33d1b6eb019f5ab81ac998f0e283406f8a08d03
      https://github.com/fluid-project/videoPlayer/commit/b33d1b6eb019f5ab81ac998f0e283406f8a08d03
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html
  M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Place a button inside the anchor, for visual styling (FLUID-4606)


  Commit: 213e2d96f74ef8d0fc62afa2d0fd7b96ca5d8d11
      https://github.com/fluid-project/videoPlayer/commit/213e2d96f74ef8d0fc62afa2d0fd7b96ca5d8d11
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Fix to correctly upate 'pressed' state of captions button


  Commit: 92e9232be2a1f8ea25356e18f703b5374453e4f7
      https://github.com/fluid-project/videoPlayer/commit/92e9232be2a1f8ea25356e18f703b5374453e4f7
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4589: Removing 'fl-theme' from stylesheet.


  Commit: 83e0ebac7c069145b808ae719fad2a06d65b1dde
      https://github.com/fluid-project/videoPlayer/commit/83e0ebac7c069145b808ae719fad2a06d65b1dde
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html

  Log Message:
  -----------
  FLUID-4589: Remove 'fl-theme' from the html


  Commit: a9fa9b555836d9ecaf75d3b2aca9a67236e25f26
      https://github.com/fluid-project/videoPlayer/commit/a9fa9b555836d9ecaf75d3b2aca9a67236e25f26
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M docs/index.html
  M html/videoPlayer_template.html
  A images/captions-black.png
  A images/captions-white.png
  A images/captions-yellow.png
  A images/fullscreen-black.png
  A images/fullscreen-on-black.png
  A images/fullscreen-on-white.png
  A images/fullscreen-on-yellow.png
  A images/fullscreen-white.png
  A images/fullscreen-yellow.png
  A images/pause-black.png
  A images/pause-white.png
  A images/pause-yellow.png
  A images/play-black.png
  A images/play-white.png
  A images/play-yellow.png
  A images/volume-black.png
  A images/volume-muted-black.png
  A images/volume-muted-white.png
  A images/volume-muted-yellow.png
  A images/volume-white.png
  A images/volume-yellow.png
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M tests/html/VideoPlayer-test.html
  A tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerCaptionLoaderTests.js
  A tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4554

Conflicts:
	css/VideoPlayer.css
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js
	js/VideoPlayer_captionner.js


  Commit: 26de02adcb3469db925a1852308a1f2bea5bce80
      https://github.com/fluid-project/videoPlayer/commit/26de02adcb3469db925a1852308a1f2bea5bce80
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: Beginning to restructure controllers to use new model structure.


  Commit: 3d5b550cc455d89c16b4b969739ada86b11cc66c
      https://github.com/fluid-project/videoPlayer/commit/3d5b550cc455d89c16b4b969739ada86b11cc66c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID:4589: First stage of restoring the 'displayCaptions' flag


  Commit: b9c5de6c32449ffdc8a08ef5501e42b87f0a296a
      https://github.com/fluid-project/videoPlayer/commit/b9c5de6c32449ffdc8a08ef5501e42b87f0a296a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Remove hard-coded path to show/hide flag


  Commit: 0cb627e54a0c6755a4d42031178ee784fad9724b
      https://github.com/fluid-project/videoPlayer/commit/0cb627e54a0c6755a4d42031178ee784fad9724b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4589: Fix failing tests.


  Commit: 2e8c761f748ec81d21b43296d2efa695d0ac4181
      https://github.com/fluid-project/videoPlayer/commit/2e8c761f748ec81d21b43296d2efa695d0ac4181
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4589: Add button to exclusions list


  Commit: fd1ae1cd124f4d3818816d87a5f0e2dc31e441f4
      https://github.com/fluid-project/videoPlayer/commit/fd1ae1cd124f4d3818816d87a5f0e2dc31e441f4
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4589-caption-controls-refactor' into FLUID-4608+4589-caption-controls-model-restructure


  Commit: a779a6719b4476a6ac6b8a7bacb77ad12c854cd6
      https://github.com/fluid-project/videoPlayer/commit/a779a6719b4476a6ac6b8a7bacb77ad12c854cd6
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4554: First modifications to html5Captionator code to comply with the new videoPlayer options redesign


  Commit: 3fa26050e47a57892a89eec5ecd09e3d109dcf1c
      https://github.com/fluid-project/videoPlayer/commit/3fa26050e47a57892a89eec5ecd09e3d109dcf1c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: Revise languageMenu to new model style; update tests.


  Commit: 38c74f414cc4829a1c4180bd2f2959990b8e17d6
      https://github.com/fluid-project/videoPlayer/commit/38c74f414cc4829a1c4180bd2f2959990b8e17d6
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4554: Redesign of the videoPlayer to work with new model. Caption controls do not work. Need code cleaning.


  Commit: a10c779a182fb00073d6ea4adc88e662587b0abc
      https://github.com/fluid-project/videoPlayer/commit/a10c779a182fb00073d6ea4adc88e662587b0abc
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: First tests for language controls with new model


  Commit: 91cb865377cf91fc5a6834ecadfe36f32d02efef
      https://github.com/fluid-project/videoPlayer/commit/91cb865377cf91fc5a6834ecadfe36f32d02efef
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: More test for language controls


  Commit: 87ba52e202adfcee382244e3d2ba15422f5559c7
      https://github.com/fluid-project/videoPlayer/commit/87ba52e202adfcee382244e3d2ba15422f5559c7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M docs/index.html
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4610: Half-completed transcript UI.


  Commit: 0119159f52108259c2b889476f73100059a21cdb
      https://github.com/fluid-project/videoPlayer/commit/0119159f52108259c2b889476f73100059a21cdb
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    A demos/ReorganizeFuture.transcripts.en.json
  A demos/ReorganizeFuture.transcripts.fr.json
  A images/close-black.png
  A images/transcripts-black.png
  A images/transcripts-white.png
  A images/transcripts-yellow.png

  Log Message:
  -----------
  FLUID-4610: Added images and transcript json files for transcript work.


  Commit: 28e6919d9825eef9bf7b7702d57140fce5f6b8e1
      https://github.com/fluid-project/videoPlayer/commit/28e6919d9825eef9bf7b7702d57140fce5f6b8e1
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4554: Fixing model of html5Captionator and applier in it


  Commit: ce539c78a07e0a80540e270f6d86ca13ba538c1b
      https://github.com/fluid-project/videoPlayer/commit/ce539c78a07e0a80540e270f6d86ca13ba538c1b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: More test for language controls with new model


  Commit: 3003219cd8996acc7c8f5b52c987e67e6e045567
      https://github.com/fluid-project/videoPlayer/commit/3003219cd8996acc7c8f5b52c987e67e6e045567
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: More tests


  Commit: 15c951880bedc6ba7f97bd77223ff92c0cac03da
      https://github.com/fluid-project/videoPlayer/commit/15c951880bedc6ba7f97bd77223ff92c0cac03da
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/Mammals.html
  R demos/ReorganizeFuture.en.json
  R demos/ReorganizeFuture.fr.json
  R demos/ReorganizeFuture.mp4
  R demos/ReorganizeFuture.webm
  M demos/VideoPlayer.html
  A demos/images/bg-header.png
  A demos/images/bg-iceberg.jpg
  A demos/images/logo.png
  A demos/images/search.png
  A demos/mammals.css
  A demos/mammals.js
  A demos/videos/Mammals/Mammals.en.json
  A demos/videos/Mammals/mammals.mp4
  A demos/videos/Mammals/mammals.webm
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.mp4
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.webm
  A demos/videos/PolarMammals/PolarMammals.en.json
  A demos/videos/PolarMammals/PolarMammals.mp4
  A demos/videos/PolarMammals/PolarMammals.webm
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.mp4
  A demos/videos/ReorganizeFuture/ReorganizeFuture.webm
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html

  Log Message:
  -----------
  FLUID-4610: Resolved the conflicts at merging in 'master'


  Commit: a4f84f80454cf8714b7c493c0a13100b682f20ea
      https://github.com/fluid-project/videoPlayer/commit/a4f84f80454cf8714b7c493c0a13100b682f20ea
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html

  Log Message:
  -----------
  FLUID-4610: Fixed the template.


  Commit: 091c6ee34c017db31811a27efd915491cd83a972
      https://github.com/fluid-project/videoPlayer/commit/091c6ee34c017db31811a27efd915491cd83a972
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-19 (Sun, 19 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: Tests updated and passing


  Commit: 464bd57414a0f4042d7e4b27b5188599fcea1bcf
      https://github.com/fluid-project/videoPlayer/commit/464bd57414a0f4042d7e4b27b5188599fcea1bcf
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-19 (Sun, 19 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4608: Added some comments


  Commit: 344f5284a2ca16227cc8b13f5c4a3c71c3ceeecb
      https://github.com/fluid-project/videoPlayer/commit/344f5284a2ca16227cc8b13f5c4a3c71c3ceeecb
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-02-19 (Sun, 19 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/Mammals.html
  R demos/ReorganizeFuture.en.json
  R demos/ReorganizeFuture.fr.json
  R demos/ReorganizeFuture.mp4
  R demos/ReorganizeFuture.webm
  M demos/VideoPlayer.html
  A demos/images/bg-header.png
  A demos/images/bg-iceberg.jpg
  A demos/images/logo.png
  A demos/images/search.png
  A demos/mammals.css
  A demos/mammals.js
  A demos/videos/Mammals/Mammals.en.json
  A demos/videos/Mammals/mammals.mp4
  A demos/videos/Mammals/mammals.webm
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.mp4
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.webm
  A demos/videos/PolarMammals/PolarMammals.en.json
  A demos/videos/PolarMammals/PolarMammals.mp4
  A demos/videos/PolarMammals/PolarMammals.webm
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.mp4
  A demos/videos/ReorganizeFuture/ReorganizeFuture.webm
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
  M tests/js/IntervalEventsConductor-IntegrationTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4608+4589-caption-controls-model-restructure


  Commit: b612d258ef44c9f546016c754bc025d75e367479
      https://github.com/fluid-project/videoPlayer/commit/b612d258ef44c9f546016c754bc025d75e367479
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/ReorganizeFuture.en.vtt
  A demos/ReorganizeFuture.fr.vtt
  M demos/VideoPlayer.html
  M js/VideoPlayer.js
  R js/VideoPlayer_captionLoader.js
  R js/VideoPlayer_captionner.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  A lib/captionator/css/captions.css
  A lib/captionator/js/captionator-min.js
  A lib/captionator/js/captionator.js
  A tests/html/TestCaptions.en.vtt
  A tests/html/TestCaptions.fr.vtt
  A tests/html/TestVideo.mp4
  R tests/html/VideoPlayerCaptionLoader-test.html
  A tests/html/VideoPlayerHTML5Captionator-test.html
  A tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge branch 'FLUID-4554m' into FLUID-4608+4589-caption-controls-model-restructure

Conflicts:
	css/VideoPlayer.css
	demos/VideoPlayer.html
	js/VideoPlayer.js
	js/VideoPlayer_captionLoader.js


  Commit: 14b59bfa3c3c5d5d3f6b5af80899675dce57fe60
      https://github.com/fluid-project/videoPlayer/commit/14b59bfa3c3c5d5d3f6b5af80899675dce57fe60
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4608-merge: fixing my html5Captionator issues since it was listening to the wrong elPaths in the model.


  Commit: c3cb43b0cf040a40a16ccffecec41db63477e638
      https://github.com/fluid-project/videoPlayer/commit/c3cb43b0cf040a40a16ccffecec41db63477e638
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4608-merge: Fixed controllers part to work with a new model.


  Commit: 0637f22c2a53d36b725cc1c403f96470f6c7bd3c
      https://github.com/fluid-project/videoPlayer/commit/0637f22c2a53d36b725cc1c403f96470f6c7bd3c
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/mammals.js

  Log Message:
  -----------
  FLUID-4608-merge: First attempt to fix a mammal page


  Commit: f21490b21156148203103a47f923f0919e1fc10d
      https://github.com/fluid-project/videoPlayer/commit/f21490b21156148203103a47f923f0919e1fc10d
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4608-merge: A fix for html5Captionator. Now captions should rerender properly after video-resize as well as showing/hiding UIO options.


  Commit: 4f0b37d4f53b205b4855425daf27d87e37b635b0
      https://github.com/fluid-project/videoPlayer/commit/4f0b37d4f53b205b4855425daf27d87e37b635b0
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  A demos/videos/Mammals/Mammals.en.vtt
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.vtt
  A demos/videos/PolarMammals/PolarMammals.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt

  Log Message:
  -----------
  FLUID-4608-merge: Fixed lower case file name issue. Added missing VTT files.


  Commit: a6d144005ed92b1811c65bc7961a5639e6c35870
      https://github.com/fluid-project/videoPlayer/commit/a6d144005ed92b1811c65bc7961a5639e6c35870
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  R demos/ReorganizeFuture.transcripts.en.json
  R demos/ReorganizeFuture.transcripts.fr.json
  M demos/VideoPlayer.html
  A demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
  A demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_intervalEventsConductor.js
  A js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Load and parse the transcript file.


  Commit: 500d4aee205340b5fceaa120d89eccfa5f7deb60
      https://github.com/fluid-project/videoPlayer/commit/500d4aee205340b5fceaa120d89eccfa5f7deb60
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4608-merge: Fixed inArray conditions for html5Captionator


  Commit: 1f3a13b5f988e235e306331522ed474f0b029849
      https://github.com/fluid-project/videoPlayer/commit/1f3a13b5f988e235e306331522ed474f0b029849
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    A lib/captionator/LICENSE.txt
  A lib/captionator/README.txt

  Log Message:
  -----------
  FLUID-4608-merge: Added README and LICENSE files for the Captionator.js


  Commit: 0fc93b9cccef4bf35e817aae8ea303f7712724dd
      https://github.com/fluid-project/videoPlayer/commit/0fc93b9cccef4bf35e817aae8ea303f7712724dd
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  A demos/ReorganizeFuture.en.vtt
  A demos/ReorganizeFuture.fr.vtt
  M demos/VideoPlayer.html
  M demos/mammals.js
  A demos/videos/Mammals/Mammals.en.vtt
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.vtt
  A demos/videos/PolarMammals/PolarMammals.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  R js/VideoPlayer_captionLoader.js
  R js/VideoPlayer_captionner.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  A lib/captionator/LICENSE.txt
  A lib/captionator/README.txt
  A lib/captionator/css/captions.css
  A lib/captionator/js/captionator-min.js
  A lib/captionator/js/captionator.js
  A tests/html/TestCaptions.en.vtt
  A tests/html/TestCaptions.fr.vtt
  A tests/html/TestVideo.mp4
  R tests/html/VideoPlayerCaptionLoader-test.html
  M tests/html/VideoPlayerControls-test.html
  A tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerControlsTests.js
  A tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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.


  Commit: cb9190595c83711c69ab54b8ae7e5b1cc0de6ad5
      https://github.com/fluid-project/videoPlayer/commit/cb9190595c83711c69ab54b8ae7e5b1cc0de6ad5
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    A demos/Mammals.css
  A demos/Mammals.js
  R demos/mammals.css
  R demos/mammals.js
  A demos/videos/Mammals/Mammals.mp4
  A demos/videos/Mammals/Mammals.webm
  R demos/videos/Mammals/mammals.mp4
  R demos/videos/Mammals/mammals.webm

  Log Message:
  -----------
  FLUID-4608-merge: Fixed some filenames since they were not capitalized


  Commit: 4968e317f5f8b8dbab6fbaa8f6573b16acb1e0b1
      https://github.com/fluid-project/videoPlayer/commit/4968e317f5f8b8dbab6fbaa8f6573b16acb1e0b1
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    A demos/Mammals.css
  A demos/Mammals.js
  R demos/mammals.css
  R demos/mammals.js
  A demos/videos/Mammals/Mammals.mp4
  A demos/videos/Mammals/Mammals.webm
  R demos/videos/Mammals/mammals.mp4
  R demos/videos/Mammals/mammals.webm

  Log Message:
  -----------
  Merge branch 'FLUID-4608-merge' into demo


  Commit: 4a8ae34c1eed4937a68b52cda3d4968a354275ea
      https://github.com/fluid-project/videoPlayer/commit/4a8ae34c1eed4937a68b52cda3d4968a354275ea
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
  M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
  M images/transcripts-black.png
  M images/transcripts-white.png
  M images/transcripts-yellow.png
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Display the load-in transcripts.


  Commit: 5e98745caac6d4dc1c3254326585f17c36bdec00
      https://github.com/fluid-project/videoPlayer/commit/5e98745caac6d4dc1c3254326585f17c36bdec00
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  R lib/captionator/LICENSE.txt
  M lib/captionator/README.txt
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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.


  Commit: 30e91298c1c1470a6a2738f538ec9631589c6656
      https://github.com/fluid-project/videoPlayer/commit/30e91298c1c1470a6a2738f538ec9631589c6656
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    A demos/videos/Mammals/Mammals.fr.json
  A demos/videos/Mammals/Mammals.fr.vtt
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.vtt
  A demos/videos/PolarMammals/PolarMammals.fr.json
  A demos/videos/PolarMammals/PolarMammals.fr.vtt

  Log Message:
  -----------
  FLUID-4616: Added french captions in .vtt and .json formats


  Commit: b95b53c095982925612aa76fb60f00198ff94b64
      https://github.com/fluid-project/videoPlayer/commit/b95b53c095982925612aa76fb60f00198ff94b64
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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.


  Commit: 129c805c50b1e9dbd6e5dcb51995fbcbeca99207
      https://github.com/fluid-project/videoPlayer/commit/129c805c50b1e9dbd6e5dcb51995fbcbeca99207
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/Mammals.css
  M demos/Mammals.html
  A demos/ReorganizeFuture.en.vtt
  A demos/ReorganizeFuture.fr.vtt
  M demos/VideoPlayer.html
  R demos/mammals.css
  R demos/mammals.js
  A demos/videos/Mammals/Mammals.en.vtt
  A demos/videos/Mammals/Mammals.mp4
  A demos/videos/Mammals/Mammals.webm
  R demos/videos/Mammals/mammals.mp4
  R demos/videos/Mammals/mammals.webm
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.vtt
  A demos/videos/PolarMammals/PolarMammals.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
  A demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  R js/VideoPlayer_captionLoader.js
  R js/VideoPlayer_captionner.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  A lib/captionator/LICENSE.txt
  A lib/captionator/README.txt
  A lib/captionator/css/captions.css
  A lib/captionator/js/captionator-min.js
  A lib/captionator/js/captionator.js
  A tests/html/TestCaptions.en.vtt
  A tests/html/TestCaptions.fr.vtt
  A tests/html/TestVideo.mp4
  R tests/html/VideoPlayerCaptionLoader-test.html
  M tests/html/VideoPlayerControls-test.html
  A tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerControlsTests.js
  A tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4610: Resolved the conflicts at merging in michelle/demo' as well as improving transcript work to display the concatenated transcript elements.


  Commit: 012b94872ccfb3366c6c52810689de44e074e8ea
      https://github.com/fluid-project/videoPlayer/commit/012b94872ccfb3366c6c52810689de44e074e8ea
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/videos/Mammals/Mammals.fr.json
  A demos/videos/Mammals/Mammals.fr.vtt
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.vtt
  A demos/videos/PolarMammals/PolarMammals.fr.json
  A demos/videos/PolarMammals/PolarMammals.fr.vtt
  M js/VideoPlayer_html5Captionator.js
  R lib/captionator/LICENSE.txt
  M lib/captionator/README.txt
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4610


  Commit: 718cafd924a8d874dd356b9130a727f7a59dffc5
      https://github.com/fluid-project/videoPlayer/commit/718cafd924a8d874dd356b9130a727f7a59dffc5
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: More merge-in from "michelle/demo" and a bit of language adjustment.


  Commit: 6d24563738efcd55aa9c0d863b21bc8633cc7fe3
      https://github.com/fluid-project/videoPlayer/commit/6d24563738efcd55aa9c0d863b21bc8633cc7fe3
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Removed the inclusion of the unminified infusion lib from the videoPlayer.html.


  Commit: 4fb407fd1abaaceb5b70ab1b2cd82c8097c1792c
      https://github.com/fluid-project/videoPlayer/commit/4fb407fd1abaaceb5b70ab1b2cd82c8097c1792c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Highlight the transcript element that's currently playing.


  Commit: 498922dd5b74891bdffa36af744fd2b85e421aaa
      https://github.com/fluid-project/videoPlayer/commit/498922dd5b74891bdffa36af744fd2b85e421aaa
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Auto scroll transcript div to the highlighted element. More polish-up is needed.


  Commit: 5d79eb6c3fab662602de93de694e12fee1004c0c
      https://github.com/fluid-project/videoPlayer/commit/5d79eb6c3fab662602de93de694e12fee1004c0c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A demos/Mammals.js
  R demos/videos/Mammals/Mammals.en.json
  R demos/videos/Mammals/Mammals.fr.json
  A demos/videos/Mammals/Mammals.transcripts.en.json
  A demos/videos/Mammals/Mammals.transcripts.fr.json
  R demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.en.json
  R demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.transcripts.en.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.transcripts.fr.json
  R demos/videos/PolarMammals/PolarMammals.en.json
  R demos/videos/PolarMammals/PolarMammals.fr.json
  A demos/videos/PolarMammals/PolarMammals.transcripts.en.json
  A demos/videos/PolarMammals/PolarMammals.transcripts.fr.json
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: da997ae489f7a493bb0ead5612fa4948afe2aad9
      https://github.com/fluid-project/videoPlayer/commit/da997ae489f7a493bb0ead5612fa4948afe2aad9
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html

  Log Message:
  -----------
  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.


  Commit: 5bf67498986d81bf5a719418744f977b2a1c9b26
      https://github.com/fluid-project/videoPlayer/commit/5bf67498986d81bf5a719418744f977b2a1c9b26
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  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


  Commit: 129d412f0cbd88c7e1c02dde2f16170bb32c5ab0
      https://github.com/fluid-project/videoPlayer/commit/129d412f0cbd88c7e1c02dde2f16170bb32c5ab0
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  R tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4608-merge:  Fixing up tests, still need to wait for the transcript fix to make them work.


  Commit: f306e4978f43f4274f212bdbf82b640846c387c3
      https://github.com/fluid-project/videoPlayer/commit/f306e4978f43f4274f212bdbf82b640846c387c3
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  R tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4596


  Commit: 0c59c1db79c7b69bee6a204d6f86cd8c3f59b5ed
      https://github.com/fluid-project/videoPlayer/commit/0c59c1db79c7b69bee6a204d6f86cd8c3f59b5ed
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4596: Showing captions on top of the scrubber bar. Placed captions into a caption DIV.


  Commit: 3772f50f7365cdbfde1fd74387789c3e5ed91ef3
      https://github.com/fluid-project/videoPlayer/commit/3772f50f7365cdbfde1fd74387789c3e5ed91ef3
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4596: Adding comments.


  Commit: 53641dd60abd29c3d6915692d0d6ff6247a20786
      https://github.com/fluid-project/videoPlayer/commit/53641dd60abd29c3d6915692d0d6ff6247a20786
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M js/VideoPlayer_transcript.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  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.


  Commit: c312a07b6c0a56cea88b8e1659b66595b37191a3
      https://github.com/fluid-project/videoPlayer/commit/c312a07b6c0a56cea88b8e1659b66595b37191a3
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M js/VideoPlayer_transcript.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4596


  Commit: 5eb1870ac2f182d05396f16b9e57b2b03b64e34f
      https://github.com/fluid-project/videoPlayer/commit/5eb1870ac2f182d05396f16b9e57b2b03b64e34f
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4596: Fixed html5Captionator tests since we changed the container which captionator takes.


  Commit: 9ef73fada7b8d6a846782afb2b711449bf869cea
      https://github.com/fluid-project/videoPlayer/commit/9ef73fada7b8d6a846782afb2b711449bf869cea
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Implemented the auto-scrolling of the transcript DIV onto the highlighted element.


  Commit: 99f24e5368c5b9eaa612c5eee2ec8627d936bee0
      https://github.com/fluid-project/videoPlayer/commit/99f24e5368c5b9eaa612c5eee2ec8627d936bee0
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  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


  Commit: b8dcb699849915c2203c2849943fd72852555fa4
      https://github.com/fluid-project/videoPlayer/commit/b8dcb699849915c2203c2849943fd72852555fa4
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: Inner glow for the controls area.


  Commit: a97663ec4f7ebd67daef7ac36aa717601a940935
      https://github.com/fluid-project/videoPlayer/commit/a97663ec4f7ebd67daef7ac36aa717601a940935
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4618: Fixed html5Captionator tests as well as fixed html5Captionator in order to use proper selectors.


  Commit: d2786692cf15f05ba565e45cd8b146cb0724eb47
      https://github.com/fluid-project/videoPlayer/commit/d2786692cf15f05ba565e45cd8b146cb0724eb47
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  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


  Commit: 8fc9bb94da13225ca236f2b16e364f470dfc6093
      https://github.com/fluid-project/videoPlayer/commit/8fc9bb94da13225ca236f2b16e364f470dfc6093
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4610: Synchronized the transcript language selections btw the button popup menu and drop down list box.


  Commit: 90bed3a4d8c8e0915efceb63827dd29c8563f1ab
      https://github.com/fluid-project/videoPlayer/commit/90bed3a4d8c8e0915efceb63827dd29c8563f1ab
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_html5Captionator.js
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4610


  Commit: 8b90be4cb60e3c0048be4dd1ae8703239e05438e
      https://github.com/fluid-project/videoPlayer/commit/8b90be4cb60e3c0048be4dd1ae8703239e05438e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4610: Removed the line-height from the transcript DIV styling so that the UIO line spacing setting can be applied onto this DIV.


  Commit: ce4a133669828cc139565dbb83c9a1f848af371b
      https://github.com/fluid-project/videoPlayer/commit/ce4a133669828cc139565dbb83c9a1f848af371b
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4619: Experimental code with hiding/showing controls


  Commit: 48020bd0b3a17cb1b6b22dad5a6d0722289c54f6
      https://github.com/fluid-project/videoPlayer/commit/48020bd0b3a17cb1b6b22dad5a6d0722289c54f6
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  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.


  Commit: dd33fc95ad46635001ee0d2787e374fc2a320308
      https://github.com/fluid-project/videoPlayer/commit/dd33fc95ad46635001ee0d2787e374fc2a320308
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4619: Made the controllers show on focus and on mouse enter.


  Commit: 8a635e3498b92ca3a8ed5370754f2776e48af7c0
      https://github.com/fluid-project/videoPlayer/commit/8a635e3498b92ca3a8ed5370754f2776e48af7c0
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  R images/captions-black.png
  R images/captions-white.png
  R images/captions-yellow.png
  A images/captions.png
  A images/captions_hover.png
  A images/captions_on.png
  R images/close-black.png
  R images/fullscreen-black.png
  R images/fullscreen-on-black.png
  R images/fullscreen-on-white.png
  R images/fullscreen-on-yellow.png
  R images/fullscreen-white.png
  R images/fullscreen-yellow.png
  A images/fullscreen.png
  A images/fullscreen_hover.png
  R images/pause-black.png
  R images/pause-white.png
  R images/pause-yellow.png
  A images/pause.png
  A images/pause_hover.png
  R images/play-black.png
  R images/play-white.png
  R images/play-yellow.png
  A images/play.png
  A images/play_hover.png
  A images/smallscreen.png
  A images/smallscreen_hover.png
  A images/transcript.png
  A images/transcript_hover.png
  A images/transcript_on.png
  A images/transcriptclose.png
  A images/transcriptclose_hover.png
  R images/transcripts-black.png
  R images/transcripts-white.png
  R images/transcripts-yellow.png
  A images/uio.png
  A images/uio_hover.png
  A images/videodescription.png
  A images/videodescription_hover.png
  A images/videodescription_on.png
  R images/volume-black.png
  R images/volume-muted-black.png
  R images/volume-muted-white.png
  R images/volume-muted-yellow.png
  R images/volume-white.png
  R images/volume-yellow.png
  A images/volume.png
  A images/volume_off.png

  Log Message:
  -----------
  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


  Commit: 5aa0028f63beea7eb1a2c02987cbe9517f32e653
      https://github.com/fluid-project/videoPlayer/commit/5aa0028f63beea7eb1a2c02987cbe9517f32e653
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html

  Log Message:
  -----------
  FLUID-4596: Moved time display into the scrubber handle. Gradient for scrubber range.


  Commit: 9d6d47886ca16005b11a6d7940e6b76b927827ef
      https://github.com/fluid-project/videoPlayer/commit/9d6d47886ca16005b11a6d7940e6b76b927827ef
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M html/videoPlayer_template.html
  R images/captions-black.png
  R images/captions-white.png
  R images/captions-yellow.png
  A images/captions.png
  A images/captions_hover.png
  A images/captions_on.png
  R images/close-black.png
  R images/fullscreen-black.png
  R images/fullscreen-on-black.png
  R images/fullscreen-on-white.png
  R images/fullscreen-on-yellow.png
  R images/fullscreen-white.png
  R images/fullscreen-yellow.png
  A images/fullscreen.png
  A images/fullscreen_hover.png
  R images/pause-black.png
  R images/pause-white.png
  R images/pause-yellow.png
  A images/pause.png
  A images/pause_hover.png
  R images/play-black.png
  R images/play-white.png
  R images/play-yellow.png
  A images/play.png
  A images/play_hover.png
  A images/smallscreen.png
  A images/smallscreen_hover.png
  A images/transcript.png
  A images/transcript_hover.png
  A images/transcript_on.png
  A images/transcriptclose.png
  A images/transcriptclose_hover.png
  R images/transcripts-black.png
  R images/transcripts-white.png
  R images/transcripts-yellow.png
  A images/uio.png
  A images/uio_hover.png
  A images/videodescription.png
  A images/videodescription_hover.png
  A images/videodescription_on.png
  R images/volume-black.png
  R images/volume-muted-black.png
  R images/volume-muted-white.png
  R images/volume-muted-yellow.png
  R images/volume-white.png
  R images/volume-yellow.png
  A images/volume.png
  A images/volume_off.png

  Log Message:
  -----------
  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.


  Commit: d805d9b5986a2f4c859254e2c53f0dac51c829b6
      https://github.com/fluid-project/videoPlayer/commit/d805d9b5986a2f4c859254e2c53f0dac51c829b6
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4596: Prevents propagation and the default action on all toggle button-related clicks.


  Commit: b2c5c28101a6c3535cd074b4ce47839b655e3ebe
      https://github.com/fluid-project/videoPlayer/commit/b2c5c28101a6c3535cd074b4ce47839b655e3ebe
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  Merge branch 'FLUID-4596' into demo

* FLUID-4596:
  FLUID-4596: Prevents propagation and the default action on all toggle button-related clicks.


  Commit: c55017fca51741cc7c5a70f51213ba2943605fd7
      https://github.com/fluid-project/videoPlayer/commit/c55017fca51741cc7c5a70f51213ba2943605fd7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-25 (Sat, 25 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  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.


  Commit: 3f7734b576a3c8907a148c052abf00c83c1fbf1b
      https://github.com/fluid-project/videoPlayer/commit/3f7734b576a3c8907a148c052abf00c83c1fbf1b
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M html/videoPlayer_template.html
  R images/captions-black.png
  R images/captions-white.png
  R images/captions-yellow.png
  A images/captions.png
  A images/captions_hover.png
  A images/captions_on.png
  R images/close-black.png
  R images/fullscreen-black.png
  R images/fullscreen-on-black.png
  R images/fullscreen-on-white.png
  R images/fullscreen-on-yellow.png
  R images/fullscreen-white.png
  R images/fullscreen-yellow.png
  A images/fullscreen.png
  A images/fullscreen_hover.png
  R images/pause-black.png
  R images/pause-white.png
  R images/pause-yellow.png
  A images/pause.png
  A images/pause_hover.png
  R images/play-black.png
  R images/play-white.png
  R images/play-yellow.png
  A images/play.png
  A images/play_hover.png
  A images/smallscreen.png
  A images/smallscreen_hover.png
  A images/transcript.png
  A images/transcript_hover.png
  A images/transcript_on.png
  A images/transcriptclose.png
  A images/transcriptclose_hover.png
  R images/transcripts-black.png
  R images/transcripts-white.png
  R images/transcripts-yellow.png
  A images/uio.png
  A images/uio_hover.png
  A images/videodescription.png
  A images/videodescription_hover.png
  A images/videodescription_on.png
  R images/volume-black.png
  R images/volume-muted-black.png
  R images/volume-muted-white.png
  R images/volume-muted-yellow.png
  R images/volume-white.png
  R images/volume-yellow.png
  A images/volume.png
  A images/volume_off.png
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4619


  Commit: ff9fa29bf9a1dc8b9bd316a73a4beb92ec99e7e3
      https://github.com/fluid-project/videoPlayer/commit/ff9fa29bf9a1dc8b9bd316a73a4beb92ec99e7e3
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4619: Better placement of the captions when the controllers hide and show.


  Commit: a21d84221c730ffdc46708560a4a08217fd3e95e
      https://github.com/fluid-project/videoPlayer/commit/a21d84221c730ffdc46708560a4a08217fd3e95e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Make transcript elements clickable.


  Commit: b188bdbb5cc849afad0d6af393c655b32c56d21e
      https://github.com/fluid-project/videoPlayer/commit/b188bdbb5cc849afad0d6af393c655b32c56d21e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    A demos/videos/Mammals/Mammals.fr.json
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  A demos/videos/PolarMammals/PolarMammals.fr.json

  Log Message:
  -----------
  FLUID-4616: French translations corrected by Charly Molter.


  Commit: 56e1c2a243b2a9a86927fe475179c6b6f9522c9d
      https://github.com/fluid-project/videoPlayer/commit/56e1c2a243b2a9a86927fe475179c6b6f9522c9d
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: Rough workaround for line spacing unresponsiveness.


  Commit: a9f71e9ebd5881964d4454dec2cb306bb07f3fc6
      https://github.com/fluid-project/videoPlayer/commit/a9f71e9ebd5881964d4454dec2cb306bb07f3fc6
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4616


  Commit: e4a48a54e84ecb80b9fa232dc945be2a9cdfcc52
      https://github.com/fluid-project/videoPlayer/commit/e4a48a54e84ecb80b9fa232dc945be2a9cdfcc52
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M demos/videos/Mammals/Mammals.fr.vtt
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.vtt
  M demos/videos/PolarMammals/PolarMammals.fr.vtt

  Log Message:
  -----------
  FLUID-4616: French translations corrected by Charly Molter. Alex - regenerated vtt files.


  Commit: 9e4f79b6464de2db5d1a3004a8109da178bfa141
      https://github.com/fluid-project/videoPlayer/commit/9e4f79b6464de2db5d1a3004a8109da178bfa141
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M demos/Mammals.html
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  R images/captions-black.png
  R images/captions-white.png
  R images/captions-yellow.png
  A images/captions.png
  A images/captions_hover.png
  A images/captions_on.png
  R images/close-black.png
  R images/fullscreen-black.png
  R images/fullscreen-on-black.png
  R images/fullscreen-on-white.png
  R images/fullscreen-on-yellow.png
  R images/fullscreen-white.png
  R images/fullscreen-yellow.png
  A images/fullscreen.png
  A images/fullscreen_hover.png
  R images/pause-black.png
  R images/pause-white.png
  R images/pause-yellow.png
  A images/pause.png
  A images/pause_hover.png
  R images/play-black.png
  R images/play-white.png
  R images/play-yellow.png
  A images/play.png
  A images/play_hover.png
  A images/smallscreen.png
  A images/smallscreen_hover.png
  A images/transcript.png
  A images/transcript_hover.png
  A images/transcript_on.png
  A images/transcriptclose.png
  A images/transcriptclose_hover.png
  R images/transcripts-black.png
  R images/transcripts-white.png
  R images/transcripts-yellow.png
  A images/uio.png
  A images/uio_hover.png
  A images/videodescription.png
  A images/videodescription_hover.png
  A images/videodescription_on.png
  R images/volume-black.png
  R images/volume-muted-black.png
  R images/volume-muted-white.png
  R images/volume-muted-yellow.png
  R images/volume-white.png
  R images/volume-yellow.png
  A images/volume.png
  A images/volume_off.png
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  Merge branch 'm-FLUID-4619' into FLUID-4619

Conflicts:
	js/VideoPlayer.js

Where m-FLUID-4619 is a FLUID-4619 branch in michelled repo


  Commit: a4b75775fe062c98a23094928b10e74aab52ed51
      https://github.com/fluid-project/videoPlayer/commit/a4b75775fe062c98a23094928b10e74aab52ed51
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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/


  Commit: 71aa5d7523de965e1d558db9b0110a04eb2986f8
      https://github.com/fluid-project/videoPlayer/commit/71aa5d7523de965e1d558db9b0110a04eb2986f8
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4619


  Commit: eb9d966e2da048f26a779e7d4c3e79324a6357e7
      https://github.com/fluid-project/videoPlayer/commit/eb9d966e2da048f26a779e7d4c3e79324a6357e7
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: d14c3c496bf4833285c181bd0bb2db6d1808e2c9
      https://github.com/fluid-project/videoPlayer/commit/d14c3c496bf4833285c181bd0bb2db6d1808e2c9
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4619: Removed fl-videoPlayer-captionArea-up


  Commit: 72115b2340c28feac4a8fbf7ddf8f12dad56cd13
      https://github.com/fluid-project/videoPlayer/commit/72115b2340c28feac4a8fbf7ddf8f12dad56cd13
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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


  Commit: 7988c42085103a04e7aaf4ebc433fe144f40006d
      https://github.com/fluid-project/videoPlayer/commit/7988c42085103a04e7aaf4ebc433fe144f40006d
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4616


  Commit: 928b1887a8ad7378a4e27285900c3fef6523a23d
      https://github.com/fluid-project/videoPlayer/commit/928b1887a8ad7378a4e27285900c3fef6523a23d
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  A demos/videos/Mammals/Mammals.fr.json
  M demos/videos/Mammals/Mammals.fr.vtt
  A demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.vtt
  A demos/videos/PolarMammals/PolarMammals.fr.json
  M demos/videos/PolarMammals/PolarMammals.fr.vtt
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js
  M lib/captionator/js/captionator.js

  Log Message:
  -----------
  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


  Commit: 5637816a28d0c5db89f9719c72a0e18a5da6a662
      https://github.com/fluid-project/videoPlayer/commit/5637816a28d0c5db89f9719c72a0e18a5da6a662
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    R demos/videos/Mammals/Mammals.fr.json
  M demos/videos/Mammals/Mammals.transcripts.fr.json
  R demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.transcripts.fr.json
  R demos/videos/PolarMammals/PolarMammals.fr.json
  M demos/videos/PolarMammals/PolarMammals.transcripts.fr.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Converted the caption json files to transcript json files.


  Commit: 1f2e15237357588b8af14b5cb169ff5bd7fce8fa
      https://github.com/fluid-project/videoPlayer/commit/1f2e15237357588b8af14b5cb169ff5bd7fce8fa
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4570: An attempt to make a full screen video using webkit.


  Commit: 6d0fbb34a3e7fdb3fb992c117774ae70efd911a1
      https://github.com/fluid-project/videoPlayer/commit/6d0fbb34a3e7fdb3fb992c117774ae70efd911a1
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/videos/Mammals/Mammals.fr.vtt
  M demos/videos/Mammals/Mammals.transcripts.fr.json
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.vtt
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.transcripts.fr.json
  M demos/videos/PolarMammals/PolarMammals.fr.vtt
  M demos/videos/PolarMammals/PolarMammals.transcripts.fr.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4570


  Commit: e72d0b7a99d0d3903480db043861897f2d6ed4eb
      https://github.com/fluid-project/videoPlayer/commit/e72d0b7a99d0d3903480db043861897f2d6ed4eb
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Fixed the issue that closing the transcript leaves a grey background behind.


  Commit: 7aaeb0ed11b5050a4a63cd430931e14c9b4e2aa0
      https://github.com/fluid-project/videoPlayer/commit/7aaeb0ed11b5050a4a63cd430931e14c9b4e2aa0
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4570: Fixed maximize button in Chrome, Firefox and Safari. Commented on the code which must be moved away from the fullscreen function.


  Commit: 9073207955b2ceb50f4ec63a20d43043d416c1ae
      https://github.com/fluid-project/videoPlayer/commit/9073207955b2ceb50f4ec63a20d43043d416c1ae
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    R demos/videos/Mammals/Mammals.fr.json
  M demos/videos/Mammals/Mammals.transcripts.fr.json
  R demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.fr.json
  M demos/videos/PolarMammalAdaptations/PolarMammalAdaptations.transcripts.fr.json
  R demos/videos/PolarMammals/PolarMammals.fr.json
  M demos/videos/PolarMammals/PolarMammals.transcripts.fr.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.en.json
  R demos/videos/ReorganizeFuture/ReorganizeFuture.fr.json
  M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  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.


  Commit: 877d03d1403116b1e4579864bb300540499204fe
      https://github.com/fluid-project/videoPlayer/commit/877d03d1403116b1e4579864bb300540499204fe
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M lib/infusion/components/tableOfContents/css/TableOfContents.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullUIOptions.css
  M lib/infusion/components/uiOptions/css/UIOptions.css
  M lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  M lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-media.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png
  M lib/infusion/framework/fss/css/fss-base-context.css
  M lib/infusion/framework/fss/css/fss-base-global.css
  M lib/infusion/framework/fss/css/fss-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  M lib/infusion/framework/fss/css/fss-reset-context.css
  M lib/infusion/framework/fss/css/fss-reset-global.css
  M lib/infusion/framework/fss/css/fss-reset.css
  M lib/infusion/framework/fss/css/fss-text.css
  M lib/infusion/framework/fss/css/fss-theme-bw.css
  M lib/infusion/framework/fss/css/fss-theme-by.css
  M lib/infusion/framework/fss/css/fss-theme-coal.css
  M lib/infusion/framework/fss/css/fss-theme-debug.css
  M lib/infusion/framework/fss/css/fss-theme-hc.css
  M lib/infusion/framework/fss/css/fss-theme-hci.css
  M lib/infusion/framework/fss/css/fss-theme-mist.css
  M lib/infusion/framework/fss/css/fss-theme-rust.css
  M lib/infusion/framework/fss/css/fss-theme-slate.css
  M lib/infusion/framework/fss/css/fss-theme-wb.css
  M lib/infusion/framework/fss/css/fss-theme-yb.css
  M lib/infusion/framework/fss/css/fss-transitions.css
  M lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  M lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css

  Log Message:
  -----------
  FLUID-4607: Upgrading Infusion to the version that has the media panel.


  Commit: 13ffb6bfb2e33abb899f18824840d1d805df1cda
      https://github.com/fluid-project/videoPlayer/commit/13ffb6bfb2e33abb899f18824840d1d805df1cda
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M lib/infusion/components/tableOfContents/css/TableOfContents.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullUIOptions.css
  M lib/infusion/components/uiOptions/css/UIOptions.css
  M lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  M lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-media.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png
  M lib/infusion/framework/fss/css/fss-base-context.css
  M lib/infusion/framework/fss/css/fss-base-global.css
  M lib/infusion/framework/fss/css/fss-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  M lib/infusion/framework/fss/css/fss-reset-context.css
  M lib/infusion/framework/fss/css/fss-reset-global.css
  M lib/infusion/framework/fss/css/fss-reset.css
  M lib/infusion/framework/fss/css/fss-text.css
  M lib/infusion/framework/fss/css/fss-theme-bw.css
  M lib/infusion/framework/fss/css/fss-theme-by.css
  M lib/infusion/framework/fss/css/fss-theme-coal.css
  M lib/infusion/framework/fss/css/fss-theme-debug.css
  M lib/infusion/framework/fss/css/fss-theme-hc.css
  M lib/infusion/framework/fss/css/fss-theme-hci.css
  M lib/infusion/framework/fss/css/fss-theme-mist.css
  M lib/infusion/framework/fss/css/fss-theme-rust.css
  M lib/infusion/framework/fss/css/fss-theme-slate.css
  M lib/infusion/framework/fss/css/fss-theme-wb.css
  M lib/infusion/framework/fss/css/fss-theme-yb.css
  M lib/infusion/framework/fss/css/fss-transitions.css
  M lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  M lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css

  Log Message:
  -----------
  Merge branch 'FLUID-4607' into demo

* FLUID-4607:
  FLUID-4607: Upgrading Infusion to the version that has the media panel.


  Commit: be6b204a2e4f37199fae7df1ddf1297abbb8eb9a
      https://github.com/fluid-project/videoPlayer/commit/be6b204a2e4f37199fae7df1ddf1297abbb8eb9a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Fixed the interval event queuing-up issue when the scrubber bar is slid back and forth quickly.


  Commit: fd58fab171a8c06b25a75b079f4d1bdd23c38614
      https://github.com/fluid-project/videoPlayer/commit/fd58fab171a8c06b25a75b079f4d1bdd23c38614
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M lib/infusion/components/tableOfContents/css/TableOfContents.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullUIOptions.css
  M lib/infusion/components/uiOptions/css/UIOptions.css
  M lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  M lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-media.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png
  M lib/infusion/framework/fss/css/fss-base-context.css
  M lib/infusion/framework/fss/css/fss-base-global.css
  M lib/infusion/framework/fss/css/fss-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  M lib/infusion/framework/fss/css/fss-reset-context.css
  M lib/infusion/framework/fss/css/fss-reset-global.css
  M lib/infusion/framework/fss/css/fss-reset.css
  M lib/infusion/framework/fss/css/fss-text.css
  M lib/infusion/framework/fss/css/fss-theme-bw.css
  M lib/infusion/framework/fss/css/fss-theme-by.css
  M lib/infusion/framework/fss/css/fss-theme-coal.css
  M lib/infusion/framework/fss/css/fss-theme-debug.css
  M lib/infusion/framework/fss/css/fss-theme-hc.css
  M lib/infusion/framework/fss/css/fss-theme-hci.css
  M lib/infusion/framework/fss/css/fss-theme-mist.css
  M lib/infusion/framework/fss/css/fss-theme-rust.css
  M lib/infusion/framework/fss/css/fss-theme-slate.css
  M lib/infusion/framework/fss/css/fss-theme-wb.css
  M lib/infusion/framework/fss/css/fss-theme-yb.css
  M lib/infusion/framework/fss/css/fss-transitions.css
  M lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  M lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4610


  Commit: 0779689907e1c613607a567d4aa175058f984ddb
      https://github.com/fluid-project/videoPlayer/commit/0779689907e1c613607a567d4aa175058f984ddb
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html

  Log Message:
  -----------
  FLUID-4607: Changing the fat panel frame html to link in MyInfusion instead of the individual javascript files.


  Commit: c40a4a5375a4ca6f0a1aed5b5a67436b6ce10a65
      https://github.com/fluid-project/videoPlayer/commit/c40a4a5375a4ca6f0a1aed5b5a67436b6ce10a65
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html

  Log Message:
  -----------
  Merge branch 'FLUID-4607' into demo


  Commit: ed3dd7a85e0d01e7a92391b6d9ba05754b98da93
      https://github.com/fluid-project/videoPlayer/commit/ed3dd7a85e0d01e7a92391b6d9ba05754b98da93
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4610


  Commit: b0aff7d66527d90e98b94293d7e91b061e22f677
      https://github.com/fluid-project/videoPlayer/commit/b0aff7d66527d90e98b94293d7e91b061e22f677
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js
  M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M lib/infusion/components/tableOfContents/css/TableOfContents.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullUIOptions.css
  M lib/infusion/components/uiOptions/css/UIOptions.css
  M lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  M lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-media.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png
  M lib/infusion/framework/fss/css/fss-base-context.css
  M lib/infusion/framework/fss/css/fss-base-global.css
  M lib/infusion/framework/fss/css/fss-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  M lib/infusion/framework/fss/css/fss-reset-context.css
  M lib/infusion/framework/fss/css/fss-reset-global.css
  M lib/infusion/framework/fss/css/fss-reset.css
  M lib/infusion/framework/fss/css/fss-text.css
  M lib/infusion/framework/fss/css/fss-theme-bw.css
  M lib/infusion/framework/fss/css/fss-theme-by.css
  M lib/infusion/framework/fss/css/fss-theme-coal.css
  M lib/infusion/framework/fss/css/fss-theme-debug.css
  M lib/infusion/framework/fss/css/fss-theme-hc.css
  M lib/infusion/framework/fss/css/fss-theme-hci.css
  M lib/infusion/framework/fss/css/fss-theme-mist.css
  M lib/infusion/framework/fss/css/fss-theme-rust.css
  M lib/infusion/framework/fss/css/fss-theme-slate.css
  M lib/infusion/framework/fss/css/fss-theme-wb.css
  M lib/infusion/framework/fss/css/fss-theme-yb.css
  M lib/infusion/framework/fss/css/fss-transitions.css
  M lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  M lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4570

Conflicts:
	js/VideoPlayer.js


  Commit: 52db579167fbd773580a625a7ed2500fed9f906f
      https://github.com/fluid-project/videoPlayer/commit/52db579167fbd773580a625a7ed2500fed9f906f
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/VideoPlayer.html
  A js/MenuButton.js
  A js/ToggleButton.js
  M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html

  Log Message:
  -----------
  FLUD-4621: Splits toggle button, language menu, and language button into two separate files.


  Commit: 85bb8e7ad7826a5a82c2f653e704f44cfc7742ce
      https://github.com/fluid-project/videoPlayer/commit/85bb8e7ad7826a5a82c2f653e704f44cfc7742ce
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/README.txt
  A lib/infusion/components/uiOptions/css/UIOptions-media.css

  Log Message:
  -----------
  FLUID-4607: Adding in the media panel CSS file.


  Commit: 8ad4b41c646adde7cc88b5bb4a7ca01cca89ecc8
      https://github.com/fluid-project/videoPlayer/commit/8ad4b41c646adde7cc88b5bb4a7ca01cca89ecc8
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/README.txt
  A lib/infusion/components/uiOptions/css/UIOptions-media.css

  Log Message:
  -----------
  Merge branch 'FLUID-4607' into demo

* FLUID-4607:
  FLUID-4607: Adding in the media panel CSS file.


  Commit: ac362bde42b1ebf43c4cd65fb0ef84789a62e5d7
      https://github.com/fluid-project/videoPlayer/commit/ac362bde42b1ebf43c4cd65fb0ef84789a62e5d7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M lib/infusion/README.txt
  A lib/infusion/components/uiOptions/css/UIOptions-media.css

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4610


  Commit: f46853fac40d1e535080aa23db62c64816e2ae9d
      https://github.com/fluid-project/videoPlayer/commit/f46853fac40d1e535080aa23db62c64816e2ae9d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: e0f7538eadf9aae8e9326b446e39b95f228e19d6
      https://github.com/fluid-project/videoPlayer/commit/e0f7538eadf9aae8e9326b446e39b95f228e19d6
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer_controllers.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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


  Commit: 4e7f609cc69257f5ffb352730a1d12e5e3892ab5
      https://github.com/fluid-project/videoPlayer/commit/4e7f609cc69257f5ffb352730a1d12e5e3892ab5
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610: Fixed the typo of "langaugeDropdown".


  Commit: b3b2bc99722b28bf94d49ca27e1a37750c63a058
      https://github.com/fluid-project/videoPlayer/commit/b3b2bc99722b28bf94d49ca27e1a37750c63a058
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/Mammals.html

  Log Message:
  -----------
  FLUID-4621: Added toggle button and language menu files to the Mammals demo.


  Commit: 35b9996f3577f999e2bd119acc84a96ea682170f
      https://github.com/fluid-project/videoPlayer/commit/35b9996f3577f999e2bd119acc84a96ea682170f
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/VideoPlayer.html
  A js/MenuButton.js
  A js/ToggleButton.js
  M js/VideoPlayer_controllers.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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.


  Commit: eeefd191ffdc74d1497662576ee87ffb5649b2b1
      https://github.com/fluid-project/videoPlayer/commit/eeefd191ffdc74d1497662576ee87ffb5649b2b1
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4570: Removing transcript height configuration from the fullscreen function.


  Commit: 141712a1c1f233afbd09eaca31808152de5e317d
      https://github.com/fluid-project/videoPlayer/commit/141712a1c1f233afbd09eaca31808152de5e317d
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/VideoPlayer.html
  A js/MenuButton.js
  A js/ToggleButton.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js
  M lib/infusion/README.txt
  A lib/infusion/components/uiOptions/css/UIOptions-media.css
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4570

Conflicts:
	js/VideoPlayer.js


  Commit: e0e0d456560ee1210a095822db94a576b089a566
      https://github.com/fluid-project/videoPlayer/commit/e0e0d456560ee1210a095822db94a576b089a566
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/VideoPlayer.html
  A js/MenuButton.js
  A js/ToggleButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_transcript.js
  M lib/infusion/MyInfusion.js
  M lib/infusion/README.txt
  M lib/infusion/components/tableOfContents/css/TableOfContents.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptions.css
  M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
  M lib/infusion/components/uiOptions/css/FullNoPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullPreviewUIOptions.css
  M lib/infusion/components/uiOptions/css/FullUIOptions.css
  A lib/infusion/components/uiOptions/css/UIOptions-media.css
  M lib/infusion/components/uiOptions/css/UIOptions.css
  M lib/infusion/components/uiOptions/css/fss/fss-text-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-bw-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-by-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-coal-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-mist-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-rust-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-slate-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-wb-uio.css
  M lib/infusion/components/uiOptions/css/fss/fss-theme-yb-uio.css
  M lib/infusion/components/uiOptions/html/FatPanelUIOptions.html
  M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-layout.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-links.html
  A lib/infusion/components/uiOptions/html/UIOptionsTemplate-media.html
  M lib/infusion/components/uiOptions/html/UIOptionsTemplate-text.html
  A lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
  A lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
  A lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
  A lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png
  M lib/infusion/framework/fss/css/fss-base-context.css
  M lib/infusion/framework/fss/css/fss-base-global.css
  M lib/infusion/framework/fss/css/fss-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-layout.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-android.css
  M lib/infusion/framework/fss/css/fss-mobile-theme-iphone.css
  M lib/infusion/framework/fss/css/fss-reset-context.css
  M lib/infusion/framework/fss/css/fss-reset-global.css
  M lib/infusion/framework/fss/css/fss-reset.css
  M lib/infusion/framework/fss/css/fss-text.css
  M lib/infusion/framework/fss/css/fss-theme-bw.css
  M lib/infusion/framework/fss/css/fss-theme-by.css
  M lib/infusion/framework/fss/css/fss-theme-coal.css
  M lib/infusion/framework/fss/css/fss-theme-debug.css
  M lib/infusion/framework/fss/css/fss-theme-hc.css
  M lib/infusion/framework/fss/css/fss-theme-hci.css
  M lib/infusion/framework/fss/css/fss-theme-mist.css
  M lib/infusion/framework/fss/css/fss-theme-rust.css
  M lib/infusion/framework/fss/css/fss-theme-slate.css
  M lib/infusion/framework/fss/css/fss-theme-wb.css
  M lib/infusion/framework/fss/css/fss-theme-yb.css
  M lib/infusion/framework/fss/css/fss-transitions.css
  M lib/infusion/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-bw/bw.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-by/by.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-coal/coal.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hc/hc.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-hci/hci.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-mist/mist.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-slate/slate.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-wb/wb.css
  M lib/infusion/lib/jquery/ui/css/fl-theme-yb/yb.css
  M lib/infusion/lib/jquery/ui/css/jquery.ui.theme.css
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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.


  Commit: e2d5126ad3876e00f80122f259b9ea67cda68bc0
      https://github.com/fluid-project/videoPlayer/commit/e2d5126ad3876e00f80122f259b9ea67cda68bc0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/Mammals.js
  M js/VideoPlayer.js
  M js/VideoPlayer_transcript.js
  A js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  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.


  Commit: 5e8007da58ffb9323fd7df13cbfeb87b4b553111
      https://github.com/fluid-project/videoPlayer/commit/5e8007da58ffb9323fd7df13cbfeb87b4b553111
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  Merge remote-tracking branch 'alexn/FLUID-4570' into demo

* alexn/FLUID-4570:
  FLUID-4570: Removing transcript height configuration from the fullscreen function.


  Commit: 1b50d57bbe9bc23aee1d5b2b9fe031f5eb94c950
      https://github.com/fluid-project/videoPlayer/commit/1b50d57bbe9bc23aee1d5b2b9fe031f5eb94c950
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M demos/Mammals.js
  M demos/VideoPlayer.html
  M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4622: Disabling captions and transcripts by default.


  Commit: 3cf9300dc11d6a1e494965c4eb3b9704e2cda570
      https://github.com/fluid-project/videoPlayer/commit/3cf9300dc11d6a1e494965c4eb3b9704e2cda570
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.js
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/MenuButton.js

  Log Message:
  -----------
  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


  Commit: f4a0ade832e9e8cfb560bf82637941257377816c
      https://github.com/fluid-project/videoPlayer/commit/f4a0ade832e9e8cfb560bf82637941257377816c
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M demos/Mammals.js
  M demos/VideoPlayer.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4622: Disabling captions by setting them to false in the videoPlayer.js and removing from the videoPlayer schemes in HTML


  Commit: d60955802432af8690147f7677c40cac110e99a3
      https://github.com/fluid-project/videoPlayer/commit/d60955802432af8690147f7677c40cac110e99a3
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/demo' into FLUID-4596

* michelled/demo:
  FLUID-4570: Removing transcript height configuration from the fullscreen function.


  Commit: 913d98bf778509ef6b513751ce2e6353c725646e
      https://github.com/fluid-project/videoPlayer/commit/913d98bf778509ef6b513751ce2e6353c725646e
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4570: Fixing the regression by introducing an invoker and attaching listeners to the new function since fullscreen is not an option anymore


  Commit: 761e49bbeb79b916c9519555368ba3dbf4bfd437
      https://github.com/fluid-project/videoPlayer/commit/761e49bbeb79b916c9519555368ba3dbf4bfd437
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: fixes language menu styles in Firefox 10, related to percentage-based widths


  Commit: 209cd5ef8c9a2f034001ef62bb9a4c68bd6df0c7
      https://github.com/fluid-project/videoPlayer/commit/209cd5ef8c9a2f034001ef62bb9a4c68bd6df0c7
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  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


  Commit: 621590778defde7b92d073d2070ef0379a749f74
      https://github.com/fluid-project/videoPlayer/commit/621590778defde7b92d073d2070ef0379a749f74
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4619: Moving captions a bit higher on top of the time div.


  Commit: 90f040fb5d2b4d2613f0f0b306bc94febe148fae
      https://github.com/fluid-project/videoPlayer/commit/90f040fb5d2b4d2613f0f0b306bc94febe148fae
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  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.


  Commit: 185977e09b3296eb7e4c84521ac898cd5f45e9f1
      https://github.com/fluid-project/videoPlayer/commit/185977e09b3296eb7e4c84521ac898cd5f45e9f1
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4622


  Commit: 97f7543503268cb36b2a1707615a0afcc1ecdb58
      https://github.com/fluid-project/videoPlayer/commit/97f7543503268cb36b2a1707615a0afcc1ecdb58
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4622: Making html5Captionator tests up to date since videoPlayer turns off captions and transcripts by default now.


  Commit: 5e396607998f341430f73f40fbd54d1b4cda79d7
      https://github.com/fluid-project/videoPlayer/commit/5e396607998f341430f73f40fbd54d1b4cda79d7
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M demos/Mammals.js
  M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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.


  Commit: 59e13e01f9bb878440c7e258a1fc8eb9ced68c2a
      https://github.com/fluid-project/videoPlayer/commit/59e13e01f9bb878440c7e258a1fc8eb9ced68c2a
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4619: Fixing the height of the transcript area.


  Commit: 4d5f97c0c21c4166dfce558e672e060497dd7a88
      https://github.com/fluid-project/videoPlayer/commit/4d5f97c0c21c4166dfce558e672e060497dd7a88
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4619: Styling height of the transcript content so that it looks better on the Mammals demo page


  Commit: 1e6b59744131a80d972dcccef15adf6b0fc95b15
      https://github.com/fluid-project/videoPlayer/commit/1e6b59744131a80d972dcccef15adf6b0fc95b15
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: 25215ef361ad25284db033c6d6ea348579ebe070
      https://github.com/fluid-project/videoPlayer/commit/25215ef361ad25284db033c6d6ea348579ebe070
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M demos/Mammals.js
  M demos/VideoPlayer.html
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4619


  Commit: e99ad133aa1dd567df15256ccf981a1b5d0d01ec
      https://github.com/fluid-project/videoPlayer/commit/e99ad133aa1dd567df15256ccf981a1b5d0d01ec
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.js
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/MenuButton.js

  Log Message:
  -----------
  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.


  Commit: 58556bfafc744da7a5615908d15f2acb45270282
      https://github.com/fluid-project/videoPlayer/commit/58556bfafc744da7a5615908d15f2acb45270282
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A images/black/black_pause.png
  A images/black/black_play_hover.png
  A images/black/captions.png
  A images/black/captions_hover.png
  A images/black/captions_on.png
  A images/black/fullscreen.png
  A images/black/fullscreen_hover.png
  A images/black/pause_hover.png
  A images/black/play.png
  A images/black/smallscreen.png
  A images/black/smallscreen_hover.png
  A images/black/transcript.png
  A images/black/transcript_hover.png
  A images/black/transcript_on.png
  A images/black/transcriptclose.png
  A images/black/uio.png
  A images/black/uio_hover.png
  A images/black/videodescription.png
  A images/black/videodescription_hover.png
  A images/black/videodescription_on.png
  A images/black/volume.png
  A images/black/volume_off.png
  R images/captions.png
  R images/captions_hover.png
  R images/captions_on.png
  A images/default/captions.png
  A images/default/captions_hover.png
  A images/default/captions_on.png
  A images/default/fullscreen.png
  A images/default/fullscreen_hover.png
  A images/default/pause.png
  A images/default/pause_hover.png
  A images/default/play.png
  A images/default/play_hover.png
  A images/default/smallscreen.png
  A images/default/smallscreen_hover.png
  A images/default/transcript.png
  A images/default/transcript_hover.png
  A images/default/transcript_on.png
  A images/default/transcriptclose.png
  A images/default/transcriptclose_hover.png
  A images/default/uio.png
  A images/default/uio_hover.png
  A images/default/videodescription.png
  A images/default/videodescription_hover.png
  A images/default/videodescription_on.png
  A images/default/volume.png
  A images/default/volume_off.png
  R images/fullscreen.png
  R images/fullscreen_hover.png
  R images/pause.png
  R images/pause_hover.png
  R images/play.png
  R images/play_hover.png
  R images/smallscreen.png
  R images/smallscreen_hover.png
  R images/transcript.png
  R images/transcript_hover.png
  R images/transcript_on.png
  R images/transcriptclose.png
  R images/transcriptclose_hover.png
  R images/uio.png
  R images/uio_hover.png
  R images/videodescription.png
  R images/videodescription_hover.png
  R images/videodescription_on.png
  R images/volume.png
  R images/volume_off.png
  A images/white/captions.png
  A images/white/captions_hover.png
  A images/white/captions_on.png
  A images/white/fullscreen.png
  A images/white/fullscreen_hover.png
  A images/white/pause.png
  A images/white/pause_hover.png
  A images/white/play.png
  A images/white/play_hover.png
  A images/white/smallscreen.png
  A images/white/smallscreen_hover.png
  A images/white/transcript.png
  A images/white/transcript_hover.png
  A images/white/transcript_on.png
  A images/white/transcriptclose.png
  A images/white/uio.png
  A images/white/uio_hover.png
  A images/white/videodescription.png
  A images/white/videodescription_hover.png
  A images/white/videodescription_on.png
  A images/white/volume.png
  A images/white/volume_off.png
  A images/yellow/captions.png
  A images/yellow/captions_hover.png
  A images/yellow/captions_on.png
  A images/yellow/fullscreen.png
  A images/yellow/fullscreen_hover.png
  A images/yellow/pause.png
  A images/yellow/pause_hover.png
  A images/yellow/play.png
  A images/yellow/play_hover.png
  A images/yellow/smallscreen.png
  A images/yellow/smallscreen_hover.png
  A images/yellow/transcript.png
  A images/yellow/transcript_hover.png
  A images/yellow/transcript_on.png
  A images/yellow/transcriptclose.png
  A images/yellow/uio.png
  A images/yellow/uio_hover.png
  A images/yellow/videodescription.png
  A images/yellow/videodescription_hover.png
  A images/yellow/videodescription_on.png
  A images/yellow/volume.png
  A images/yellow/volume_off.png

  Log Message:
  -----------
  FLUID-4596: high contrast button styles for the video player


  Commit: d54629c88f06ff39c4db8ebad39baa5b5f0a4a6a
      https://github.com/fluid-project/videoPlayer/commit/d54629c88f06ff39c4db8ebad39baa5b5f0a4a6a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/MenuButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_uiOptions.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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


  Commit: 3f6f424395561a13dcec6eb0aac57052a8cdca34
      https://github.com/fluid-project/videoPlayer/commit/3f6f424395561a13dcec6eb0aac57052a8cdca34
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4608-merge: Removing the cause for console error messages which are generated when tests are executed.


  Commit: cbdda2742a52216bed99999a0f54dd6bf5450029
      https://github.com/fluid-project/videoPlayer/commit/cbdda2742a52216bed99999a0f54dd6bf5450029
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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.


  Commit: e2c527e2bfaa68e0486db8edca759c82cd9d8420
      https://github.com/fluid-project/videoPlayer/commit/e2c527e2bfaa68e0486db8edca759c82cd9d8420
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: d8b00d2221ec2be3960831ba84c5cd25f00e88d7
      https://github.com/fluid-project/videoPlayer/commit/d8b00d2221ec2be3960831ba84c5cd25f00e88d7
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  R images/black/black_pause.png
  R images/black/black_play_hover.png
  A images/black/pause.png
  A images/black/play_hover.png

  Log Message:
  -----------
  FLUID-4596: Renaming a couple of the icons to match the convention.


  Commit: eaa9dbd37f6026ce14c79ed77063eb254ffe6e91
      https://github.com/fluid-project/videoPlayer/commit/eaa9dbd37f6026ce14c79ed77063eb254ffe6e91
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A images/black/captions.png
  A images/black/captions_hover.png
  A images/black/captions_on.png
  A images/black/fullscreen.png
  A images/black/fullscreen_hover.png
  A images/black/pause.png
  A images/black/pause_hover.png
  A images/black/play.png
  A images/black/play_hover.png
  A images/black/smallscreen.png
  A images/black/smallscreen_hover.png
  A images/black/transcript.png
  A images/black/transcript_hover.png
  A images/black/transcript_on.png
  A images/black/transcriptclose.png
  A images/black/uio.png
  A images/black/uio_hover.png
  A images/black/videodescription.png
  A images/black/videodescription_hover.png
  A images/black/videodescription_on.png
  A images/black/volume.png
  A images/black/volume_off.png
  R images/captions.png
  R images/captions_hover.png
  R images/captions_on.png
  A images/default/captions.png
  A images/default/captions_hover.png
  A images/default/captions_on.png
  A images/default/fullscreen.png
  A images/default/fullscreen_hover.png
  A images/default/pause.png
  A images/default/pause_hover.png
  A images/default/play.png
  A images/default/play_hover.png
  A images/default/smallscreen.png
  A images/default/smallscreen_hover.png
  A images/default/transcript.png
  A images/default/transcript_hover.png
  A images/default/transcript_on.png
  A images/default/transcriptclose.png
  A images/default/transcriptclose_hover.png
  A images/default/uio.png
  A images/default/uio_hover.png
  A images/default/videodescription.png
  A images/default/videodescription_hover.png
  A images/default/videodescription_on.png
  A images/default/volume.png
  A images/default/volume_off.png
  R images/fullscreen.png
  R images/fullscreen_hover.png
  R images/pause.png
  R images/pause_hover.png
  R images/play.png
  R images/play_hover.png
  R images/smallscreen.png
  R images/smallscreen_hover.png
  R images/transcript.png
  R images/transcript_hover.png
  R images/transcript_on.png
  R images/transcriptclose.png
  R images/transcriptclose_hover.png
  R images/uio.png
  R images/uio_hover.png
  R images/videodescription.png
  R images/videodescription_hover.png
  R images/videodescription_on.png
  R images/volume.png
  R images/volume_off.png
  A images/white/captions.png
  A images/white/captions_hover.png
  A images/white/captions_on.png
  A images/white/fullscreen.png
  A images/white/fullscreen_hover.png
  A images/white/pause.png
  A images/white/pause_hover.png
  A images/white/play.png
  A images/white/play_hover.png
  A images/white/smallscreen.png
  A images/white/smallscreen_hover.png
  A images/white/transcript.png
  A images/white/transcript_hover.png
  A images/white/transcript_on.png
  A images/white/transcriptclose.png
  A images/white/uio.png
  A images/white/uio_hover.png
  A images/white/videodescription.png
  A images/white/videodescription_hover.png
  A images/white/videodescription_on.png
  A images/white/volume.png
  A images/white/volume_off.png
  A images/yellow/captions.png
  A images/yellow/captions_hover.png
  A images/yellow/captions_on.png
  A images/yellow/fullscreen.png
  A images/yellow/fullscreen_hover.png
  A images/yellow/pause.png
  A images/yellow/pause_hover.png
  A images/yellow/play.png
  A images/yellow/play_hover.png
  A images/yellow/smallscreen.png
  A images/yellow/smallscreen_hover.png
  A images/yellow/transcript.png
  A images/yellow/transcript_hover.png
  A images/yellow/transcript_on.png
  A images/yellow/transcriptclose.png
  A images/yellow/uio.png
  A images/yellow/uio_hover.png
  A images/yellow/videodescription.png
  A images/yellow/videodescription_hover.png
  A images/yellow/videodescription_on.png
  A images/yellow/volume.png
  A images/yellow/volume_off.png

  Log Message:
  -----------
  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


  Commit: 63f36bc0e6ea97f8fe7cd6da93d1083e73b5baec
      https://github.com/fluid-project/videoPlayer/commit/63f36bc0e6ea97f8fe7cd6da93d1083e73b5baec
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  Merge remote-tracking branch 'alexn/FLUID-4619' into FLUID-4596


  Commit: da2e1ee0caadd0a0187b256e5f1e25a767f0b1b2
      https://github.com/fluid-project/videoPlayer/commit/da2e1ee0caadd0a0187b256e5f1e25a767f0b1b2
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html
  M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4596: Modifying the toggle button to have an inital state. Added styles to show the pressed state for the captions and transcript buttons.


  Commit: d7f30769213f4a45ef828dca7d73499f265db58b
      https://github.com/fluid-project/videoPlayer/commit/d7f30769213f4a45ef828dca7d73499f265db58b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  A images/black/captions.png
  A images/black/captions_hover.png
  A images/black/captions_on.png
  A images/black/fullscreen.png
  A images/black/fullscreen_hover.png
  A images/black/pause.png
  A images/black/pause_hover.png
  A images/black/play.png
  A images/black/play_hover.png
  A images/black/smallscreen.png
  A images/black/smallscreen_hover.png
  A images/black/transcript.png
  A images/black/transcript_hover.png
  A images/black/transcript_on.png
  A images/black/transcriptclose.png
  A images/black/uio.png
  A images/black/uio_hover.png
  A images/black/videodescription.png
  A images/black/videodescription_hover.png
  A images/black/videodescription_on.png
  A images/black/volume.png
  A images/black/volume_off.png
  R images/captions.png
  R images/captions_hover.png
  R images/captions_on.png
  A images/default/captions.png
  A images/default/captions_hover.png
  A images/default/captions_on.png
  A images/default/fullscreen.png
  A images/default/fullscreen_hover.png
  A images/default/pause.png
  A images/default/pause_hover.png
  A images/default/play.png
  A images/default/play_hover.png
  A images/default/smallscreen.png
  A images/default/smallscreen_hover.png
  A images/default/transcript.png
  A images/default/transcript_hover.png
  A images/default/transcript_on.png
  A images/default/transcriptclose.png
  A images/default/transcriptclose_hover.png
  A images/default/uio.png
  A images/default/uio_hover.png
  A images/default/videodescription.png
  A images/default/videodescription_hover.png
  A images/default/videodescription_on.png
  A images/default/volume.png
  A images/default/volume_off.png
  R images/fullscreen.png
  R images/fullscreen_hover.png
  R images/pause.png
  R images/pause_hover.png
  R images/play.png
  R images/play_hover.png
  R images/smallscreen.png
  R images/smallscreen_hover.png
  R images/transcript.png
  R images/transcript_hover.png
  R images/transcript_on.png
  R images/transcriptclose.png
  R images/transcriptclose_hover.png
  R images/uio.png
  R images/uio_hover.png
  R images/videodescription.png
  R images/videodescription_hover.png
  R images/videodescription_on.png
  R images/volume.png
  R images/volume_off.png
  A images/white/captions.png
  A images/white/captions_hover.png
  A images/white/captions_on.png
  A images/white/fullscreen.png
  A images/white/fullscreen_hover.png
  A images/white/pause.png
  A images/white/pause_hover.png
  A images/white/play.png
  A images/white/play_hover.png
  A images/white/smallscreen.png
  A images/white/smallscreen_hover.png
  A images/white/transcript.png
  A images/white/transcript_hover.png
  A images/white/transcript_on.png
  A images/white/transcriptclose.png
  A images/white/uio.png
  A images/white/uio_hover.png
  A images/white/videodescription.png
  A images/white/videodescription_hover.png
  A images/white/videodescription_on.png
  A images/white/volume.png
  A images/white/volume_off.png
  A images/yellow/captions.png
  A images/yellow/captions_hover.png
  A images/yellow/captions_on.png
  A images/yellow/fullscreen.png
  A images/yellow/fullscreen_hover.png
  A images/yellow/pause.png
  A images/yellow/pause_hover.png
  A images/yellow/play.png
  A images/yellow/play_hover.png
  A images/yellow/smallscreen.png
  A images/yellow/smallscreen_hover.png
  A images/yellow/transcript.png
  A images/yellow/transcript_hover.png
  A images/yellow/transcript_on.png
  A images/yellow/transcriptclose.png
  A images/yellow/uio.png
  A images/yellow/uio_hover.png
  A images/yellow/videodescription.png
  A images/yellow/videodescription_hover.png
  A images/yellow/videodescription_on.png
  A images/yellow/volume.png
  A images/yellow/volume_off.png
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/demo' into demo


  Commit: e8cab58875e36238124133f4cf8be276a22cfe12
      https://github.com/fluid-project/videoPlayer/commit/e8cab58875e36238124133f4cf8be276a22cfe12
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.js
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  A images/black/captions.png
  A images/black/captions_hover.png
  A images/black/captions_on.png
  A images/black/fullscreen.png
  A images/black/fullscreen_hover.png
  A images/black/pause.png
  A images/black/pause_hover.png
  A images/black/play.png
  A images/black/play_hover.png
  A images/black/smallscreen.png
  A images/black/smallscreen_hover.png
  A images/black/transcript.png
  A images/black/transcript_hover.png
  A images/black/transcript_on.png
  A images/black/transcriptclose.png
  A images/black/uio.png
  A images/black/uio_hover.png
  A images/black/videodescription.png
  A images/black/videodescription_hover.png
  A images/black/videodescription_on.png
  A images/black/volume.png
  A images/black/volume_off.png
  R images/captions.png
  R images/captions_hover.png
  R images/captions_on.png
  A images/default/captions.png
  A images/default/captions_hover.png
  A images/default/captions_on.png
  A images/default/fullscreen.png
  A images/default/fullscreen_hover.png
  A images/default/pause.png
  A images/default/pause_hover.png
  A images/default/play.png
  A images/default/play_hover.png
  A images/default/smallscreen.png
  A images/default/smallscreen_hover.png
  A images/default/transcript.png
  A images/default/transcript_hover.png
  A images/default/transcript_on.png
  A images/default/transcriptclose.png
  A images/default/transcriptclose_hover.png
  A images/default/uio.png
  A images/default/uio_hover.png
  A images/default/videodescription.png
  A images/default/videodescription_hover.png
  A images/default/videodescription_on.png
  A images/default/volume.png
  A images/default/volume_off.png
  R images/fullscreen.png
  R images/fullscreen_hover.png
  R images/pause.png
  R images/pause_hover.png
  R images/play.png
  R images/play_hover.png
  R images/smallscreen.png
  R images/smallscreen_hover.png
  R images/transcript.png
  R images/transcript_hover.png
  R images/transcript_on.png
  R images/transcriptclose.png
  R images/transcriptclose_hover.png
  R images/uio.png
  R images/uio_hover.png
  R images/videodescription.png
  R images/videodescription_hover.png
  R images/videodescription_on.png
  R images/volume.png
  R images/volume_off.png
  A images/white/captions.png
  A images/white/captions_hover.png
  A images/white/captions_on.png
  A images/white/fullscreen.png
  A images/white/fullscreen_hover.png
  A images/white/pause.png
  A images/white/pause_hover.png
  A images/white/play.png
  A images/white/play_hover.png
  A images/white/smallscreen.png
  A images/white/smallscreen_hover.png
  A images/white/transcript.png
  A images/white/transcript_hover.png
  A images/white/transcript_on.png
  A images/white/transcriptclose.png
  A images/white/uio.png
  A images/white/uio_hover.png
  A images/white/videodescription.png
  A images/white/videodescription_hover.png
  A images/white/videodescription_on.png
  A images/white/volume.png
  A images/white/volume_off.png
  A images/yellow/captions.png
  A images/yellow/captions_hover.png
  A images/yellow/captions_on.png
  A images/yellow/fullscreen.png
  A images/yellow/fullscreen_hover.png
  A images/yellow/pause.png
  A images/yellow/pause_hover.png
  A images/yellow/play.png
  A images/yellow/play_hover.png
  A images/yellow/smallscreen.png
  A images/yellow/smallscreen_hover.png
  A images/yellow/transcript.png
  A images/yellow/transcript_hover.png
  A images/yellow/transcript_on.png
  A images/yellow/transcriptclose.png
  A images/yellow/uio.png
  A images/yellow/uio_hover.png
  A images/yellow/videodescription.png
  A images/yellow/videodescription_hover.png
  A images/yellow/videodescription_on.png
  A images/yellow/volume.png
  A images/yellow/volume_off.png
  M js/MenuButton.js
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/html/VideoPlayerIntervalEventsConductor-test.html
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4619


  Commit: a89fdab4af12d0e5d7151f1abe96a50437f4dbaf
      https://github.com/fluid-project/videoPlayer/commit/a89fdab4af12d0e5d7151f1abe96a50437f4dbaf
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M demos/VideoPlayer.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4596: Improving the styling of the scrubber handles in the high contrast themes.


  Commit: 1d8ba3ef62a3fda09fcedc808015bd1c41e006e6
      https://github.com/fluid-project/videoPlayer/commit/1d8ba3ef62a3fda09fcedc808015bd1c41e006e6
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  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!


  Commit: bf84a826863b5e76309fcd032eb81cb2a293b3b4
      https://github.com/fluid-project/videoPlayer/commit/bf84a826863b5e76309fcd032eb81cb2a293b3b4
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: Improving the styling of the scrubber in the high contrast themes.


  Commit: a00d8b4ce961a4ae1e6cfe6a7a2c273dfaba044d
      https://github.com/fluid-project/videoPlayer/commit/a00d8b4ce961a4ae1e6cfe6a7a2c273dfaba044d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: 98e0e2c823203671680bd61ff0d7e89afaee7b96
      https://github.com/fluid-project/videoPlayer/commit/98e0e2c823203671680bd61ff0d7e89afaee7b96
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4596


  Commit: e5b903433b8229d01379ec24171464c00f34d0c6
      https://github.com/fluid-project/videoPlayer/commit/e5b903433b8229d01379ec24171464c00f34d0c6
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/demo' into demo


  Commit: 49841c6869b5495c16ab639e924567e0db589878
      https://github.com/fluid-project/videoPlayer/commit/49841c6869b5495c16ab639e924567e0db589878
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: Adding a comment to the stylesheet.


  Commit: b38e1606e77de8ed312a1ac3f91531a09869aac6
      https://github.com/fluid-project/videoPlayer/commit/b38e1606e77de8ed312a1ac3f91531a09869aac6
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M demos/VideoPlayer.html
  M html/videoPlayer_template.html
  M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  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.


  Commit: 81ecb079016cc45e8c4e9016797965bfd8c58d0d
      https://github.com/fluid-project/videoPlayer/commit/81ecb079016cc45e8c4e9016797965bfd8c58d0d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/MenuButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  FLUID-4587: Mostly working version of media options integration, together 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"


  Commit: 6bf2a3e2632d36aaf76a2a85593b32db05615644
      https://github.com/fluid-project/videoPlayer/commit/6bf2a3e2632d36aaf76a2a85593b32db05615644
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4619: Properly named the video player main container.


  Commit: f90960e4acd046e5d8784903df8431e647330a24
      https://github.com/fluid-project/videoPlayer/commit/f90960e4acd046e5d8784903df8431e647330a24
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M demos/Mammals.js
  M js/MenuButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  A js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  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.


  Commit: bea7a7920ff73354bf7ffa6a2bc43f7c8919bb6a
      https://github.com/fluid-project/videoPlayer/commit/bea7a7920ff73354bf7ffa6a2bc43f7c8919bb6a
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4627: Applying styling improvements on the transcript area.


  Commit: af8ab111ab28522f71eae8d0b41a3c41820b2748
      https://github.com/fluid-project/videoPlayer/commit/af8ab111ab28522f71eae8d0b41a3c41820b2748
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M demos/Mammals.js
  M js/MenuButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  A js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4627


  Commit: f459f60d2ebeb70cbb1ef124bafb68a7af844a2d
      https://github.com/fluid-project/videoPlayer/commit/f459f60d2ebeb70cbb1ef124bafb68a7af844a2d
  Author: Alexey Novak <anovak at ocadu.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4627: Refactoring CSS in order to remove some of the !important statements as well as remove redundancy.


  Commit: 772eb372b29b6f26cc91c4d5c2688c05e8f0accb
      https://github.com/fluid-project/videoPlayer/commit/772eb372b29b6f26cc91c4d5c2688c05e8f0accb
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  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.


  Commit: 918442472211a26d9a662fd761d80ec2788ccc8b
      https://github.com/fluid-project/videoPlayer/commit/918442472211a26d9a662fd761d80ec2788ccc8b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4627: Make the mammal demo video larger as well as some code clean-up.


  Commit: d886fd0eea8481f0437d2231d6eee3fa60ee28b9
      https://github.com/fluid-project/videoPlayer/commit/d886fd0eea8481f0437d2231d6eee3fa60ee28b9
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.html
  M demos/Mammals.js
  M js/MenuButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  A js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  Merge branch 'demo' into FLUID-4610


  Commit: 7e9a3063422cc562fbd050fa190703bdbd3dfb17
      https://github.com/fluid-project/videoPlayer/commit/7e9a3063422cc562fbd050fa190703bdbd3dfb17
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4627: Removed resizeHandler() which is no longer in use.


  Commit: 04c6defc58eb8bf245d2a1c774e3803908fdf4ca
      https://github.com/fluid-project/videoPlayer/commit/04c6defc58eb8bf245d2a1c774e3803908fdf4ca
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js

  Log Message:
  -----------
  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.


  Commit: 66729a8394a81c56f0cdae5d41178219aecbd83b
      https://github.com/fluid-project/videoPlayer/commit/66729a8394a81c56f0cdae5d41178219aecbd83b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M js/MenuButton.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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


  Commit: 7d613a0559072cb6dfd15ed0a84fe61e2ed8dc5c
      https://github.com/fluid-project/videoPlayer/commit/7d613a0559072cb6dfd15ed0a84fe61e2ed8dc5c
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M js/MenuButton.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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


  Commit: aed83165888e20ff2e9495de7e3b0dda1445a32d
      https://github.com/fluid-project/videoPlayer/commit/aed83165888e20ff2e9495de7e3b0dda1445a32d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer_uiOptions.js

  Log Message:
  -----------
  FLUID-4582: Added media panel integration into VideoPlayer demo page


  Commit: 79f87d30b6899541e257551ba88388a6e5183a46
      https://github.com/fluid-project/videoPlayer/commit/79f87d30b6899541e257551ba88388a6e5183a46
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M demos/VideoPlayer.html
  M js/VideoPlayer_uiOptions.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/demo-integration-sketch' into demo

* amb26/demo-integration-sketch:
  FLUID-4582: Added media panel integration into VideoPlayer demo page


  Commit: 3194540243fe83f609781394c7d7445427b51aae
      https://github.com/fluid-project/videoPlayer/commit/3194540243fe83f609781394c7d7445427b51aae
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M demos/Mammals.js

  Log Message:
  -----------
  FLUID-4622: Reverting effect of bad merge which regressed track names from "French" back to "French Transcripts"


  Commit: 996b31fd3cb2fac4129e888ca0e0e7435b24cd00
      https://github.com/fluid-project/videoPlayer/commit/996b31fd3cb2fac4129e888ca0e0e7435b24cd00
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M demos/Mammals.js

  Log Message:
  -----------
  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"


  Commit: 78e30f7feab635ab2f87efcecd3cf0dd1040590e
      https://github.com/fluid-project/videoPlayer/commit/78e30f7feab635ab2f87efcecd3cf0dd1040590e
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  FLUID-4610 - Adding 1ms to start time to avoid rounding error removes "can't click on next transcript" bug


  Commit: db05e6d2d0bfbf69dbf90787e06f2c4a19fcb03d
      https://github.com/fluid-project/videoPlayer/commit/db05e6d2d0bfbf69dbf90787e06f2c4a19fcb03d
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M js/VideoPlayer_transcript.js

  Log Message:
  -----------
  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


  Commit: cc955fe12a02f641a3165967257cb21159498ef4
      https://github.com/fluid-project/videoPlayer/commit/cc955fe12a02f641a3165967257cb21159498ef4
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M demos/Mammals.html
  M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_framework.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_uiOptions.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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".


  Commit: 89b80208e04e4e5d5c64213b746f3802271890ef
      https://github.com/fluid-project/videoPlayer/commit/89b80208e04e4e5d5c64213b746f3802271890ef
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M demos/VideoPlayer.html

  Log Message:
  -----------
  FLUID-4582: Adding the new video player framework file to the simple video player demo.


  Commit: 05deea203b5279762e92f6a86e3313ed03a1830a
      https://github.com/fluid-project/videoPlayer/commit/05deea203b5279762e92f6a86e3313ed03a1830a
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/VideoPlayer.html
  M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_framework.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_uiOptions.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  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".


  Commit: 58f71c9ce432839fb9eb227996a7a1f704b4b5f4
      https://github.com/fluid-project/videoPlayer/commit/58f71c9ce432839fb9eb227996a7a1f704b4b5f4
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4596: Fixing the colours for the volume slider and the font size on the scrubber handle.


  Commit: 9b8ed91d72f556c1a7f79c0776a4e0b42dabcf9e
      https://github.com/fluid-project/videoPlayer/commit/9b8ed91d72f556c1a7f79c0776a4e0b42dabcf9e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_intervalEventsConductor.js
  M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4632: Add/pass/listen to buffered info. The reflection on the scrubber bar is followed.


  Commit: 1719c82e9a26fbe268377398a8028f09bd3cb37d
      https://github.com/fluid-project/videoPlayer/commit/1719c82e9a26fbe268377398a8028f09bd3cb37d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M demos/Mammals.html
  M demos/VideoPlayer.html
  M js/MenuButton.js
  M js/ToggleButton.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  A js/VideoPlayer_framework.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_uiOptions.js
  M tests/html/VideoPlayer-test.html
  M tests/html/VideoPlayerControls-test.html
  M tests/html/VideoPlayerHTML5Captionator-test.html
  M tests/js/VideoPlayerControlsTests.js
  M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into demo


  Commit: 7f78138f8df6d68d69426db62ecb3d11854a7eeb
      https://github.com/fluid-project/videoPlayer/commit/7f78138f8df6d68d69426db62ecb3d11854a7eeb
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  FLUID-4632: Removed debug code.


  Commit: 62b63aa00ef647c4faaf6f6e32448b77be84b118
      https://github.com/fluid-project/videoPlayer/commit/62b63aa00ef647c4faaf6f6e32448b77be84b118
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  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.


  Commit: 7273b55f0ba22c5bafb6a0b1d8fa2539890a5972
      https://github.com/fluid-project/videoPlayer/commit/7273b55f0ba22c5bafb6a0b1d8fa2539890a5972
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/demo' into FLUID-4632


  Commit: a36ef9463e8b98805f5cfd9dc882aec34a907f19
      https://github.com/fluid-project/videoPlayer/commit/a36ef9463e8b98805f5cfd9dc882aec34a907f19
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M js/VideoPlayer_framework.js
  M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4582: Incomplete work on mute button


  Commit: b453c420afd5a6720bc2fedf5aef54eb2227034b
      https://github.com/fluid-project/videoPlayer/commit/b453c420afd5a6720bc2fedf5aef54eb2227034b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_intervalEventsConductor.js

  Log Message:
  -----------
  FLUID-4632: Implemented the buffered progress bar by using fluid.progress component as well as some styling fixes.


  Commit: c6368639696269f0bf2872a4f465f1b0e478a950
      https://github.com/fluid-project/videoPlayer/commit/c6368639696269f0bf2872a4f465f1b0e478a950
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M js/VideoPlayer_framework.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  FLUID-4635: Commenting out console.log statements which prevent the video player from working in IE when the dev tools are off.


  Commit: ccb0c8609e6020bd55b1556006fe8c795d6733e6
      https://github.com/fluid-project/videoPlayer/commit/ccb0c8609e6020bd55b1556006fe8c795d6733e6
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M js/VideoPlayer_framework.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  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.


  Commit: 4ff1d84ddf71e0bd0219a55aa4b04ce0cabb0c68
      https://github.com/fluid-project/videoPlayer/commit/4ff1d84ddf71e0bd0219a55aa4b04ce0cabb0c68
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M js/VideoPlayer_framework.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  Merge branch 'demo' of https://github.com/michelled/videoPlayer into FLUID-4632


  Commit: 96315d090b7c53d8538502db6abb00a6b3c3b2f8
      https://github.com/fluid-project/videoPlayer/commit/96315d090b7c53d8538502db6abb00a6b3c3b2f8
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js

  Log Message:
  -----------
  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.


  Commit: 9f9b90abed0c441b64094a49bd7a2a05e1926b38
      https://github.com/fluid-project/videoPlayer/commit/9f9b90abed0c441b64094a49bd7a2a05e1926b38
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_transcript.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4632: Added unit tests as well as code clean-up.


  Commit: 520b0824cc7948cb33f3fe8129984c595bd4dd8e
      https://github.com/fluid-project/videoPlayer/commit/520b0824cc7948cb33f3fe8129984c595bd4dd8e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_intervalEventsConductor.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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.


  Commit: 68600e384ba7c682c2b5551aa4771dc203ff8217
      https://github.com/fluid-project/videoPlayer/commit/68600e384ba7c682c2b5551aa4771dc203ff8217
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M html/videoPlayer_template.html
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_framework.js
  M js/VideoPlayer_html5Captionator.js
  M js/VideoPlayer_intervalEventsConductor.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M lib/infusion/MyInfusion.js
  M tests/html/VideoPlayerControls-test.html
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/demo' into demo


  Commit: dad9da7f0b54d4868676349c84d19bec2fe7f983
      https://github.com/fluid-project/videoPlayer/commit/dad9da7f0b54d4868676349c84d19bec2fe7f983
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_media.js
  M lib/infusion/MyInfusion.js

  Log Message:
  -----------
  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.


  Commit: 5053d98c3957e8520d17a146bafc550f09d8b79a
      https://github.com/fluid-project/videoPlayer/commit/5053d98c3957e8520d17a146bafc550f09d8b79a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_framework.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M js/VideoPlayer_uiOptions.js

  Log Message:
  -----------
  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.


  Commit: d9cca479997bfd7b70592a48ee7100109aecd462
      https://github.com/fluid-project/videoPlayer/commit/d9cca479997bfd7b70592a48ee7100109aecd462
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4607: Fixed up controls test case for rename of volume controls out of condemned "controllers" package


  Commit: cbb5fee4fa48dcd5773544204edc9713abab04e8
      https://github.com/fluid-project/videoPlayer/commit/cbb5fee4fa48dcd5773544204edc9713abab04e8
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/Mammals.js
  M js/VideoPlayer.js
  M js/VideoPlayer_controllers.js
  M js/VideoPlayer_framework.js
  M js/VideoPlayer_media.js
  M js/VideoPlayer_transcript.js
  M js/VideoPlayer_uiOptions.js
  M lib/infusion/MyInfusion.js
  M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  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


Compare: https://github.com/fluid-project/videoPlayer/compare/74ac7e2^...cbb5fee


More information about the Commits mailing list