[Commits] [fluid-project/videoPlayer] 435f5f: FLUID-4775: The first cut of making use of media e...

Wed Oct 24 13:52:37 EDT 2012

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 435f5fb5518d1761139ec26a66d3c0fa4670b0c1
      https://github.com/fluid-project/videoPlayer/commit/435f5fb5518d1761139ec26a66d3c0fa4670b0c1
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M demos/VideoPlayer.html
    R js/HTML5-backcompat.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_intervalEventsConductor.js
    M js/VideoPlayer_media.js
    A lib/html5shiv/js/html5shiv.js
    A lib/mediaelement/README.md
    A lib/mediaelement/build/background.png
    A lib/mediaelement/build/bigplay.png
    A lib/mediaelement/build/controls-ted.png
    A lib/mediaelement/build/controls-wmp-bg.png
    A lib/mediaelement/build/controls-wmp.png
    A lib/mediaelement/build/controls.png
    A lib/mediaelement/build/flashmediaelement.swf
    A lib/mediaelement/build/jquery.js
    A lib/mediaelement/build/loading.gif
    A lib/mediaelement/build/mediaelement-and-player.js
    A lib/mediaelement/build/mediaelement-and-player.min.js
    A lib/mediaelement/build/mediaelement.js
    A lib/mediaelement/build/mediaelement.min.js
    A lib/mediaelement/build/mediaelementplayer.css
    A lib/mediaelement/build/mediaelementplayer.js
    A lib/mediaelement/build/mediaelementplayer.min.css
    A lib/mediaelement/build/mediaelementplayer.min.js
    A lib/mediaelement/build/mejs-skins.css
    A lib/mediaelement/build/silverlightmediaelement.xap
    A lib/mediaelement/demo/index.html
    A lib/mediaelement/demo/mediaelement-stream.html
    A lib/mediaelement/demo/mediaelement.html
    A lib/mediaelement/demo/mediaelementplayer-audio.html
    A lib/mediaelement/demo/mediaelementplayer-events.html
    A lib/mediaelement/demo/mediaelementplayer-frameaccurate.html
    A lib/mediaelement/demo/mediaelementplayer-responsive.html
    A lib/mediaelement/demo/mediaelementplayer-skins.html
    A lib/mediaelement/demo/mediaelementplayer-sourcechooser.html
    A lib/mediaelement/demo/mediaelementplayer-src.html
    A lib/mediaelement/demo/mediaelementplayer-track.html
    A lib/mediaelement/demo/mediaelementplayer-youtube.html
    A lib/mediaelement/demo/mediaelementplayer.html
    A lib/mediaelement/media/AirReview-Landmarks-02-ChasingCorporate.mp3
    A lib/mediaelement/media/echo-hereweare.jpg
    A lib/mediaelement/media/echo-hereweare.mp4
    A lib/mediaelement/media/echo-hereweare.ogv
    A lib/mediaelement/media/echo-hereweare.webm
    A lib/mediaelement/media/mediaelement.srt
    A lib/mediaelement/src/Builder.py
    A lib/mediaelement/src/compiler.jar
    A lib/mediaelement/src/css/background.png
    A lib/mediaelement/src/css/bigplay.png
    A lib/mediaelement/src/css/controls-ted.png
    A lib/mediaelement/src/css/controls-wmp-bg.png
    A lib/mediaelement/src/css/controls-wmp.png
    A lib/mediaelement/src/css/controls.png
    A lib/mediaelement/src/css/loading.gif
    A lib/mediaelement/src/css/mediaelementplayer.css
    A lib/mediaelement/src/css/mejs-skins.css
    A lib/mediaelement/src/flash/FlashMediaElement.as
    A lib/mediaelement/src/flash/FlashMediaElement.fla
    A lib/mediaelement/src/flash/HtmlMediaEvent.as
    A lib/mediaelement/src/flash/htmlelements/AudioElement.as
    A lib/mediaelement/src/flash/htmlelements/IMediaElement.as
    A lib/mediaelement/src/flash/htmlelements/VideoElement.as
    A lib/mediaelement/src/flash/htmlelements/YouTubeElement.as
    A lib/mediaelement/src/js/jeesh-extras.js
    A lib/mediaelement/src/js/jeesh.js
    A lib/mediaelement/src/js/me-featuredetection.js
    A lib/mediaelement/src/js/me-header.js
    A lib/mediaelement/src/js/me-mediaelements.js
    A lib/mediaelement/src/js/me-namespace.js
    A lib/mediaelement/src/js/me-plugindetector.js
    A lib/mediaelement/src/js/me-shim.js
    A lib/mediaelement/src/js/me-utility.js
    A lib/mediaelement/src/js/mep-feature-backlight.js
    A lib/mediaelement/src/js/mep-feature-contextmenu.js
    A lib/mediaelement/src/js/mep-feature-endedhtml.js
    A lib/mediaelement/src/js/mep-feature-fullscreen.js
    A lib/mediaelement/src/js/mep-feature-googleanalytics.js
    A lib/mediaelement/src/js/mep-feature-loop.js
    A lib/mediaelement/src/js/mep-feature-playlist.js
    A lib/mediaelement/src/js/mep-feature-playpause.js
    A lib/mediaelement/src/js/mep-feature-progress.js
    A lib/mediaelement/src/js/mep-feature-sourcechooser.js
    A lib/mediaelement/src/js/mep-feature-speed.js
    A lib/mediaelement/src/js/mep-feature-stop.js
    A lib/mediaelement/src/js/mep-feature-time.js
    A lib/mediaelement/src/js/mep-feature-tracks.js
    A lib/mediaelement/src/js/mep-feature-visualcontrols.js
    A lib/mediaelement/src/js/mep-feature-volume.js
    A lib/mediaelement/src/js/mep-header.js
    A lib/mediaelement/src/js/mep-library.js
    A lib/mediaelement/src/js/mep-player.js
    A lib/mediaelement/src/silverlight/App.xaml
    A lib/mediaelement/src/silverlight/App.xaml.cs
    A lib/mediaelement/src/silverlight/MainPage.xaml
    A lib/mediaelement/src/silverlight/MainPage.xaml.cs
    A lib/mediaelement/src/silverlight/Properties/AppManifest.xml
    A lib/mediaelement/src/silverlight/Properties/AssemblyInfo.cs
    A lib/mediaelement/src/silverlight/SilverlightMediaElement.csproj
    A lib/mediaelement/src/silverlight/SilverlightMediaElement.csproj.user
    A lib/mediaelement/src/silverlight/SilverlightMediaElement.sln
    A lib/mediaelement/src/yuicompressor-2.4.2.jar

  Log Message:
  -----------
  FLUID-4775: The first cut of making use of media element library to support IE8 without breaking the video player on html5 browsers. Also replaced HTML5-backcompat.js with html5shiv.

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

  Changed paths:
    M js/VideoPlayer.js
    M js/VideoPlayer_transcript.js
    M lib/infusion/MyInfusion.js
    M lib/infusion/README.txt
    A tests/html/VideoPlayer-IntegrationTest.html
    A tests/js/VideoPlayerIntegrationTests.js

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

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

  Changed paths:
    M demos/Mammals.html
    M demos/VideoPlayer.html
    M js/VideoPlayer.js
    M js/VideoPlayer_media.js
    M tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/js/IntervalEventsConductor-IntegrationTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4775: Fixed mammals demo and most unit tests. One unit test for controls still fails. More commits are followed.

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

  Changed paths:
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_media.js
    M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4775: Fixed the unit tests for controllers as well as the code clean-up.

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

  Changed paths:
    M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4775: clean up media component.

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

  Changed paths:
    M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4775: replace the "durationchange" event that is not implemented by media element with "loadeddata" event.

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

  Changed paths:
    M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4775: "loadedmetadata" event is a better place to retrieve the initial total/current/start times since it's when all the meta data is ready.

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

  Changed paths:
    M demos/Mammals.html
    M demos/VideoPlayer.html
    M js/VideoPlayer.js
    R lib/mediaelement/README.md
    R lib/mediaelement/build/background.png
    R lib/mediaelement/build/bigplay.png
    R lib/mediaelement/build/controls-ted.png
    R lib/mediaelement/build/controls-wmp-bg.png
    R lib/mediaelement/build/controls-wmp.png
    R lib/mediaelement/build/controls.png
    R lib/mediaelement/build/flashmediaelement.swf
    R lib/mediaelement/build/jquery.js
    R lib/mediaelement/build/loading.gif
    R lib/mediaelement/build/mediaelement-and-player.js
    R lib/mediaelement/build/mediaelement-and-player.min.js
    R lib/mediaelement/build/mediaelement.js
    R lib/mediaelement/build/mediaelement.min.js
    R lib/mediaelement/build/mediaelementplayer.css
    R lib/mediaelement/build/mediaelementplayer.js
    R lib/mediaelement/build/mediaelementplayer.min.css
    R lib/mediaelement/build/mediaelementplayer.min.js
    R lib/mediaelement/build/mejs-skins.css
    R lib/mediaelement/build/silverlightmediaelement.xap
    R lib/mediaelement/demo/index.html
    R lib/mediaelement/demo/mediaelement-stream.html
    R lib/mediaelement/demo/mediaelement.html
    R lib/mediaelement/demo/mediaelementplayer-audio.html
    R lib/mediaelement/demo/mediaelementplayer-events.html
    R lib/mediaelement/demo/mediaelementplayer-frameaccurate.html
    R lib/mediaelement/demo/mediaelementplayer-responsive.html
    R lib/mediaelement/demo/mediaelementplayer-skins.html
    R lib/mediaelement/demo/mediaelementplayer-sourcechooser.html
    R lib/mediaelement/demo/mediaelementplayer-src.html
    R lib/mediaelement/demo/mediaelementplayer-track.html
    R lib/mediaelement/demo/mediaelementplayer-youtube.html
    R lib/mediaelement/demo/mediaelementplayer.html
    R lib/mediaelement/media/AirReview-Landmarks-02-ChasingCorporate.mp3
    R lib/mediaelement/media/echo-hereweare.jpg
    R lib/mediaelement/media/echo-hereweare.mp4
    R lib/mediaelement/media/echo-hereweare.ogv
    R lib/mediaelement/media/echo-hereweare.webm
    R lib/mediaelement/media/mediaelement.srt
    R lib/mediaelement/src/Builder.py
    R lib/mediaelement/src/compiler.jar
    R lib/mediaelement/src/css/background.png
    R lib/mediaelement/src/css/bigplay.png
    R lib/mediaelement/src/css/controls-ted.png
    R lib/mediaelement/src/css/controls-wmp-bg.png
    R lib/mediaelement/src/css/controls-wmp.png
    R lib/mediaelement/src/css/controls.png
    R lib/mediaelement/src/css/loading.gif
    R lib/mediaelement/src/css/mediaelementplayer.css
    R lib/mediaelement/src/css/mejs-skins.css
    R lib/mediaelement/src/flash/FlashMediaElement.as
    R lib/mediaelement/src/flash/FlashMediaElement.fla
    R lib/mediaelement/src/flash/HtmlMediaEvent.as
    R lib/mediaelement/src/flash/htmlelements/AudioElement.as
    R lib/mediaelement/src/flash/htmlelements/IMediaElement.as
    R lib/mediaelement/src/flash/htmlelements/VideoElement.as
    R lib/mediaelement/src/flash/htmlelements/YouTubeElement.as
    R lib/mediaelement/src/js/jeesh-extras.js
    R lib/mediaelement/src/js/jeesh.js
    R lib/mediaelement/src/js/me-featuredetection.js
    R lib/mediaelement/src/js/me-header.js
    R lib/mediaelement/src/js/me-mediaelements.js
    R lib/mediaelement/src/js/me-namespace.js
    R lib/mediaelement/src/js/me-plugindetector.js
    R lib/mediaelement/src/js/me-shim.js
    R lib/mediaelement/src/js/me-utility.js
    R lib/mediaelement/src/js/mep-feature-backlight.js
    R lib/mediaelement/src/js/mep-feature-contextmenu.js
    R lib/mediaelement/src/js/mep-feature-endedhtml.js
    R lib/mediaelement/src/js/mep-feature-fullscreen.js
    R lib/mediaelement/src/js/mep-feature-googleanalytics.js
    R lib/mediaelement/src/js/mep-feature-loop.js
    R lib/mediaelement/src/js/mep-feature-playlist.js
    R lib/mediaelement/src/js/mep-feature-playpause.js
    R lib/mediaelement/src/js/mep-feature-progress.js
    R lib/mediaelement/src/js/mep-feature-sourcechooser.js
    R lib/mediaelement/src/js/mep-feature-speed.js
    R lib/mediaelement/src/js/mep-feature-stop.js
    R lib/mediaelement/src/js/mep-feature-time.js
    R lib/mediaelement/src/js/mep-feature-tracks.js
    R lib/mediaelement/src/js/mep-feature-visualcontrols.js
    R lib/mediaelement/src/js/mep-feature-volume.js
    R lib/mediaelement/src/js/mep-header.js
    R lib/mediaelement/src/js/mep-library.js
    R lib/mediaelement/src/js/mep-player.js
    R lib/mediaelement/src/silverlight/App.xaml
    R lib/mediaelement/src/silverlight/App.xaml.cs
    R lib/mediaelement/src/silverlight/MainPage.xaml
    R lib/mediaelement/src/silverlight/MainPage.xaml.cs
    R lib/mediaelement/src/silverlight/Properties/AppManifest.xml
    R lib/mediaelement/src/silverlight/Properties/AssemblyInfo.cs
    R lib/mediaelement/src/silverlight/SilverlightMediaElement.csproj
    R lib/mediaelement/src/silverlight/SilverlightMediaElement.csproj.user
    R lib/mediaelement/src/silverlight/SilverlightMediaElement.sln
    R lib/mediaelement/src/yuicompressor-2.4.2.jar
    M tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html

  Log Message:
  -----------
  FLUID-4775: removed the un-necessary files from media element library.

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

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

  Log Message:
  -----------
  FLUID-4775: Fixed the play button and some stylings in IE8.

  Commit: 3acc88395435c18d0745bc9615e39c4c2f187d72
      https://github.com/fluid-project/videoPlayer/commit/3acc88395435c18d0745bc9615e39c4c2f187d72
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    M js/VideoPlayer.js
    M js/VideoPlayer_intervalEventsConductor.js
    M js/VideoPlayer_media.js
    R tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    R tests/js/IntervalEventsConductor-IntegrationTests.js

  Log Message:
  -----------
  FLUID-4775: Removed html5MediaTime since with media element library in IE8, the attach of video event listeners must occur in the success callback of the object creation. html5MediaTime was attaching listener for "timeupdate" event outside of this scope, as a result, the listener is never triggered in IE8.

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

  Changed paths:
    M css/ltie9.css
    M js/MenuButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_media.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4755: Fixed various IE8 issues: click on video container to start/pause video, scrubber bar click to advance/rewind video, mute and volume adjusting, js error thrown by transcript or caption button click, unit tests.

  Commit: 5ab4bb692ede9be0f139a4a2727772a94ea1c634
      https://github.com/fluid-project/videoPlayer/commit/5ab4bb692ede9be0f139a4a2727772a94ea1c634
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M tests/js/VideoPlayerIntegrationTests.js

  Log Message:
  -----------
  FLUID-4775: Fixed the integration test.

  Commit: 0ed9a5424d38c79b5e7dc1580bfa864ca10064e7
      https://github.com/fluid-project/videoPlayer/commit/0ed9a5424d38c79b5e7dc1580bfa864ca10064e7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M css/VideoPlayer.css
    M html/videoPlayer_template.html
    M js/MenuButton.js
    M js/ToggleButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_framework.js
    A tests/html/VideoFramework-test.html
    M tests/js/ToggleButtonTests.js
    A tests/js/VideoFrameworkTests.js
    M tests/js/VideoPlayerControlsTests.js

  Log Message:
  -----------
  FLUID-4775: Merge branch 'demo' into FLUID-4775 and fix conflicts.

Conflicts:
	js/MenuButton.js
	js/VideoPlayer.js

  Commit: e94ab88598b49efb88c3b2d9933b060d00ddb716
      https://github.com/fluid-project/videoPlayer/commit/e94ab88598b49efb88c3b2d9933b060d00ddb716
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    A lib/mediaelement/js/flashmediaelement.swf
    A lib/mediaelement/js/mediaelement.js
    A lib/mediaelement/js/mediaelement.min.js

  Log Message:
  -----------
  FLUID-4775: Added the media element library.

  Commit: 9520aee110e0a55b9d2c9e241eebd1db2d12bd20
      https://github.com/fluid-project/videoPlayer/commit/9520aee110e0a55b9d2c9e241eebd1db2d12bd20
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M css/VideoPlayer.css
    M demos/Mammals.css
    M demos/VideoPlayer.html
    M demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
    M demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
    M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.en.json
    M demos/videos/ReorganizeFuture/ReorganizeFuture.transcripts.fr.json
    M html/videoPlayer_template.html
    M js/MenuButton.js
    M js/ToggleButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_html5Captionator.js
    M js/VideoPlayer_transcript.js
    M lib/captionator/README.txt
    M lib/captionator/js/captionator.js
    M lib/infusion/README.txt
    A tests/all-tests.html
    M tests/html/MenuButton-test.html
    M tests/html/TestCaption.en.json
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/TestTranscripts.en.json
    M tests/html/TestTranscripts.fr.json
    M tests/html/ToggleButton-test.html
    M tests/html/VideoFramework-test.html
    M tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    A tests/html/VideoPlayerAria-Test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    A tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    M tests/html/VideoPlayerIntervalEventsConductor-test.html
    M tests/html/VideoPlayerTranscript-test.html
    M tests/js/MenuButtonTests.js
    M tests/js/TestUtils.js
    M tests/js/ToggleButtonTests.js
    M tests/js/VideoFrameworkTests.js
    A tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerIntervalEventsConductorTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js
    M tests/lib/jqUnit/js/jqUnit.js
    M tests/lib/qunit/VERSION
    A tests/lib/qunit/addons/composite/README.md
    A tests/lib/qunit/addons/composite/index.html
    A tests/lib/qunit/addons/composite/qunit-composite.css
    A tests/lib/qunit/addons/composite/qunit-composite.js
    M tests/lib/qunit/css/qunit.css
    M tests/lib/qunit/js/qunit.js

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

Conflicts:
	js/MenuButton.js
	js/VideoPlayer.js
	js/VideoPlayer_controllers.js
	tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
	tests/js/VideoPlayerTests.js
Resolved, but not working yet.

  Commit: db8048f453c17a9ef9532fa6b2598956a7c34db3
      https://github.com/fluid-project/videoPlayer/commit/db8048f453c17a9ef9532fa6b2598956a7c34db3
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    A js/HTML5-backcompat.js
    M js/VideoPlayer.js
    M js/VideoPlayer_intervalEventsConductor.js
    M tests/html/VideoPlayerAria-Test.html
    A tests/js/IntervalEventsConductor-IntegrationTests.js
    M tests/js/VideoPlayerTests.js

  Log Message:
  -----------
  FLUID-4775: Get tests mostly running after merge

  Commit: 6186edb3257ad611543dcda56de8c4374a5f042a
      https://github.com/fluid-project/videoPlayer/commit/6186edb3257ad611543dcda56de8c4374a5f042a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

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

  Log Message:
  -----------
  FLUID-4775: Get tests passing in FF again.

  Commit: 192a05ad54aa94cf4a510da06aca3fd1121410bb
      https://github.com/fluid-project/videoPlayer/commit/192a05ad54aa94cf4a510da06aca3fd1121410bb
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M js/MenuButton.js

  Log Message:
  -----------
  Fixing the menuButton code.

  Commit: 2f9f5c8c79f8b36c8bbdc5935a982afda779895a
      https://github.com/fluid-project/videoPlayer/commit/2f9f5c8c79f8b36c8bbdc5935a982afda779895a
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-16 (Tue, 16 Oct 2012)

  Changed paths:
    M js/VideoPlayer_media.js

  Log Message:
  -----------
  FLUID-4775: Add comment clarifying problem with scrub-bar in IE8

  Commit: 6a1a6327f5685cce89ebcbb8186e445b7c47177b
      https://github.com/fluid-project/videoPlayer/commit/6a1a6327f5685cce89ebcbb8186e445b7c47177b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M tests/all-tests.html
    R tests/html/VideoPlayer-IntegrationTest.html
    R tests/html/VideoPlayerAria-Test.html
    A tests/html/VideoPlayerAria-test.html
    A tests/html/VideoPlayerIntegration-test.html
    R tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    A tests/html/VideoPlayerIntervalEventsConductorIntegration-test.html

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

  Commit: 59c47081777f5a976dcdddbcdf0986a3ecb56a6e
      https://github.com/fluid-project/videoPlayer/commit/59c47081777f5a976dcdddbcdf0986a3ecb56a6e
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M js/MenuButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M js/VideoPlayer_media.js
    M tests/js/IntervalEventsConductor-IntegrationTests.js
    M tests/js/MenuButtonTests.js
    M tests/js/TestUtils.js
    M tests/js/ToggleButtonTests.js
    M tests/js/VideoFrameworkTests.js
    M tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerIntervalEventsConductorTests.js
    M tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  FLUID-4775: Final fixes to bring Cindy's 4665 branch up to current master

  Commit: dd1c5c7b707d43655a8b0d455d1aba26bc279b21
      https://github.com/fluid-project/videoPlayer/commit/dd1c5c7b707d43655a8b0d455d1aba26bc279b21
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M css/VideoPlayer.css
    M demos/Mammals.js
    M demos/VideoPlayer.html
    M js/ToggleButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_transcript.js
    M tests/all-tests.html
    M tests/html/VideoPlayerIntegration-test.html
    A tests/html/VideoPlayerTranscriptIntegration-test.html
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerTests.js
    A tests/js/VideoPlayerTranscriptIntegrationTests.js

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

Conflicts:
	js/VideoPlayer.js

  Commit: e64ff8242467dce21a9a612b5dba68f3e7e3015b
      https://github.com/fluid-project/videoPlayer/commit/e64ff8242467dce21a9a612b5dba68f3e7e3015b
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M js/MenuButton.js

  Log Message:
  -----------
  FLUID-4775: Reinstate deadMansBlur on menu.

  Commit: 3f735d07a33f13d18362a6c07223c2487e27595c
      https://github.com/fluid-project/videoPlayer/commit/3f735d07a33f13d18362a6c07223c2487e27595c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M css/ltie9.css

  Log Message:
  -----------
  FLUID-4775: Removing commented-out CSS (the styles were added to a new JIRA, FLUID-4817.

  Commit: ee2cd056c269dcb55bf8ed8b8e0d21dead431afd
      https://github.com/fluid-project/videoPlayer/commit/ee2cd056c269dcb55bf8ed8b8e0d21dead431afd
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M tests/html/VideoPlayerTranscriptIntegration-test.html

  Log Message:
  -----------
  FLUID-4775: Adding missing JS file to test.

  Commit: 3069c4f6bdafa410c8ae9ec6c5e7efa0a5cec793
      https://github.com/fluid-project/videoPlayer/commit/3069c4f6bdafa410c8ae9ec6c5e7efa0a5cec793
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M js/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M tests/js/IntervalEventsConductor-IntegrationTests.js

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

Conflicts:
	js/VideoPlayer_controllers.js

  Commit: 3b43848b5a7769038612ed4583888eea15a60689
      https://github.com/fluid-project/videoPlayer/commit/3b43848b5a7769038612ed4583888eea15a60689
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    A css/ltie9.css
    M demos/Mammals.html
    M demos/VideoPlayer.html
    M js/MenuButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_intervalEventsConductor.js
    M js/VideoPlayer_media.js
    A lib/html5shiv/js/html5shiv.js
    A lib/mediaelement/js/flashmediaelement.swf
    A lib/mediaelement/js/mediaelement.js
    A lib/mediaelement/js/mediaelement.min.js
    M tests/html/VideoPlayer-test.html
    M tests/html/VideoPlayerAria-test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    M tests/html/VideoPlayerIntegration-test.html
    M tests/html/VideoPlayerTranscriptIntegration-test.html
    M tests/js/IntervalEventsConductor-IntegrationTests.js
    M tests/js/MenuButtonTests.js
    M tests/js/TestUtils.js
    M tests/js/ToggleButtonTests.js
    M tests/js/VideoFrameworkTests.js
    M tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerIntervalEventsConductorTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'acheetham/FLUID-4775'

* acheetham/FLUID-4775:
  FLUID-4775: Adding missing JS file to test.
  FLUID-4775: Removing commented-out CSS (the styles were added to a new JIRA, FLUID-4817.
  FLUID-4775: Reinstate deadMansBlur on menu.
  FLUID-4775: Final fixes to bring Cindy's 4665 branch up to current master
  FLUID-4775: Add comment clarifying problem with scrub-bar in IE8
  Fixing the menuButton code.
  FLUID-4775: Get tests passing in FF again.
  FLUID-4775: Get tests mostly running after merge
  FLUID-4775: Added the media element library.
  FLUID-4775: Fixed the integration test.
  FLUID-4755: Fixed various IE8 issues: click on video container to start/pause video, scrubber bar click to advance/rewind video, mute and volume adjusting, js error thrown by transcript or caption button click, unit tests.
  FLUID-4775: Removed html5MediaTime since with media element library in IE8, the attach of video event listeners must occur in the success callback of the object creation. html5MediaTime was attaching listener for "timeupdate" event outside of this scope, as a result, the listener is never triggered in IE8.
  FLUID-4775: Fixed the play button and some stylings in IE8.
  FLUID-4775: removed the un-necessary files from media element library.
  FLUID-4775: "loadedmetadata" event is a better place to retrieve the initial total/current/start times since it's when all the meta data is ready.
  FLUID-4775: replace the "durationchange" event that is not implemented by media element with "loadeddata" event.
  FLUID-4775: clean up media component.
  FLUID-4775: Fixed the unit tests for controllers as well as the code clean-up.
  FLUID-4775: Fixed mammals demo and most unit tests. One unit test for controls still fails. More commits are followed.
  FLUID-4775: The first cut of making use of media element library to support IE8 without breaking the video player on html5 browsers. Also replaced HTML5-backcompat.js with html5shiv.

Compare: https://github.com/fluid-project/videoPlayer/compare/605628e59a86...3b43848b5a77