[Commits] [fluid-project/videoPlayer] b1315a: FLUID-4701: Minor code tidy up.

GitHub noreply at github.com
Tue Dec 11 10:54:33 EST 2012


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: b1315afacae9194db6074a5151b6f2cd2ebe1a35
      https://github.com/fluid-project/videoPlayer/commit/b1315afacae9194db6074a5151b6f2cd2ebe1a35
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

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

  Log Message:
  -----------
  FLUID-4701: Minor code tidy up.


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

  Changed paths:
    M js/VideoPlayer.js

  Log Message:
  -----------
  FLUID-4701: Adding the callback parameter that was accidentally removed back to the Amara url.


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

  Changed paths:
    M demos/videos/ReorganizeFuture/ReorganizeFuture.en.vtt
    M js/VideoPlayer_html5Captionator.js
    M lib/captionator/js/captionator.js
    M tests/html/TestCaptions.en.vtt
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4795: Upgrade captionator to version that is more in line with spec, update VideoPlayer to new API.


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

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  Merge remote-tracking branch 'michelled/FLUID-4701' into FLUID-4795

Conflicts:
	js/VideoPlayer_html5Captionator.js


  Commit: 7b658e17d893d510ea5ce31d39f51939be101d10
      https://github.com/fluid-project/videoPlayer/commit/7b658e17d893d510ea5ce31d39f51939be101d10
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-10-10 (Wed, 10 Oct 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_html5Captionator.js
    M js/VideoPlayer_transcript.js
    A tests/html/VideoPlayerAria-Test.html
    M tests/js/MenuButtonTests.js
    M tests/js/ToggleButtonTests.js
    A tests/js/VideoPlayerAriaTests.js
    M tests/js/VideoPlayerControlsTests.js
    M tests/js/VideoPlayerIntegrationTests.js
    M tests/js/VideoPlayerTranscriptTests.js

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

Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_html5Captionator.js


  Commit: 99b56a561d6f13f5b96937cb2a44acaa69d502df
      https://github.com/fluid-project/videoPlayer/commit/99b56a561d6f13f5b96937cb2a44acaa69d502df
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

  Changed paths:
    M css/VideoPlayer.css
    A css/ltie9.css
    M demos/Mammals.html
    M demos/Mammals.js
    M demos/VideoPlayer.html
    M js/MenuButton.js
    M js/ToggleButton.js
    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
    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
    A tests/all-tests.html
    M tests/html/MenuButton-test.html
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/ToggleButton-test.html
    M tests/html/VideoFramework-test.html
    R tests/html/VideoPlayer-IntegrationTest.html
    M tests/html/VideoPlayer-test.html
    R tests/html/VideoPlayerAria-Test.html
    A tests/html/VideoPlayerAria-test.html
    M tests/html/VideoPlayerControls-test.html
    M tests/html/VideoPlayerHTML5Captionator-test.html
    A tests/html/VideoPlayerIntegration-test.html
    R tests/html/VideoPlayerIntervalEventsConductor-integrationTest.html
    M tests/html/VideoPlayerIntervalEventsConductor-test.html
    A tests/html/VideoPlayerIntervalEventsConductorIntegration-test.html
    M tests/html/VideoPlayerTranscript-test.html
    A 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
    A tests/js/VideoPlayerTranscriptIntegrationTests.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 'master' into FLUID-4795

Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js


  Commit: 81e6d1dc6f9c8197e2611cf96ab7cb65260e7403
      https://github.com/fluid-project/videoPlayer/commit/81e6d1dc6f9c8197e2611cf96ab7cb65260e7403
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

  Changed paths:
    M demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
    M lib/captionator/README.txt
    M lib/captionator/js/captionator.js

  Log Message:
  -----------
  FLUID-4795: Upgrade Captionator, to make captions work in Safari.


  Commit: 963a6b4f550baa462315b173ae6c6e827b965ada
      https://github.com/fluid-project/videoPlayer/commit/963a6b4f550baa462315b173ae6c6e827b965ada
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4795: Bring captionator tests up to latest changes


  Commit: 70f655a5a0a42fa5ccaa676b88669fbcaf77ea57
      https://github.com/fluid-project/videoPlayer/commit/70f655a5a0a42fa5ccaa676b88669fbcaf77ea57
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M js/MenuButton.js
    M js/VideoPlayer.js
    M js/VideoPlayer_transcript.js
    M tests/js/TestUtils.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptIntegrationTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into FLUID-4795


  Commit: 7f302f8cb392b17bb924622a8595b6832adafe05
      https://github.com/fluid-project/videoPlayer/commit/7f302f8cb392b17bb924622a8595b6832adafe05
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-11-12 (Mon, 12 Nov 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4795: Removing wayward 'console.log'


  Commit: 9a6862e5a0970d102d850e597694c6217fceb14c
      https://github.com/fluid-project/videoPlayer/commit/9a6862e5a0970d102d850e597694c6217fceb14c
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-12-04 (Tue, 04 Dec 2012)

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

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


  Commit: 958080406ce506e2aa4fa9bc2544772ad8e98fec
      https://github.com/fluid-project/videoPlayer/commit/958080406ce506e2aa4fa9bc2544772ad8e98fec
  Author: Anastasia Cheetham <ac at anastasiacheetham.ca>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4795: Modify captionator tests so most don't run in browsers with native track support


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

  Changed paths:
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4795: Refactor captionator tests


  Commit: 33c54acffefb66766f9ab20459a9a311ee21273e
      https://github.com/fluid-project/videoPlayer/commit/33c54acffefb66766f9ab20459a9a311ee21273e
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M demos/videos/ReorganizeFuture/ReorganizeFuture.fr.vtt
    M js/VideoPlayer_html5Captionator.js
    M lib/captionator/README.txt
    M lib/captionator/js/captionator.js
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'anastasia/FLUID-4795'

* anastasia/FLUID-4795:
  FLUID-4795: Refactor captionator tests
  FLUID-4795: Modify captionator tests so most don't run in browsers with native track support
  FLUID-4795: Removing wayward 'console.log'
  FLUID-4795: Bring captionator tests up to latest changes
  FLUID-4795: Upgrade Captionator, to make captions work in Safari.
  FLUID-4795: Upgrade captionator to version that is more in line with spec, update VideoPlayer to new API.
  FLUID-4701: Adding the callback parameter that was accidentally removed back to the Amara url.
  FLUID-4701: Minor code tidy up.


Compare: https://github.com/fluid-project/videoPlayer/compare/45395721579b...33c54acffefb


More information about the Commits mailing list