[Commits] [fluid-project/videoPlayer] 8779c4: FLUID-4701: Swapping in an unchanged version of Ca...

Wed Oct 10 16:20:24 EDT 2012

  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 8779c48faef4378e5e1df177f13e310d57df362e
      https://github.com/fluid-project/videoPlayer/commit/8779c48faef4378e5e1df177f13e310d57df362e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

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

  Log Message:
  -----------
  FLUID-4701: Swapping in an unchanged version of Captionator and adding a style to position the cues correctly.

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

  Changed paths:
    M css/VideoPlayer.css
    M html/videoPlayer_template.html
    M js/VideoPlayer.js
    M tests/js/VideoPlayerControlsTests.js

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

  Commit: bc36fe928468953836fb199153fd8e731072ba76
      https://github.com/fluid-project/videoPlayer/commit/bc36fe928468953836fb199153fd8e731072ba76
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M css/VideoPlayer.css
    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_transcript.js
    A tests/html/VideoFramework-test.html
    M tests/js/ToggleButtonTests.js
    A tests/js/VideoFrameworkTests.js

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

  Commit: 4c197495cffe89e0c945529ea685ecdfe2aec898
      https://github.com/fluid-project/videoPlayer/commit/4c197495cffe89e0c945529ea685ecdfe2aec898
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4701: Adding overrides for caption colours in high contrast themes.

  Commit: 8749cd0414846371045cf6fa1241ba2a64f21770
      https://github.com/fluid-project/videoPlayer/commit/8749cd0414846371045cf6fa1241ba2a64f21770
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

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

  Log Message:
  -----------
  FLUID-4701: Sketch of amara json to vtt support.

  Commit: 187e2bc960312233569a76e95ac8b3313d6d6fe7
      https://github.com/fluid-project/videoPlayer/commit/187e2bc960312233569a76e95ac8b3313d6d6fe7
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4701: Clarifying some comments. Fixing the data url being added to the track element with amara sourced captions - not sure if the format is corrrect yet.

  Commit: 7630cecbc18bd23b61047d71584bffc9de30bf23
      https://github.com/fluid-project/videoPlayer/commit/7630cecbc18bd23b61047d71584bffc9de30bf23
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4701: Encoding the data url.

  Commit: d34653369993e0ebe644b39504f59c5804bcf2e5
      https://github.com/fluid-project/videoPlayer/commit/d34653369993e0ebe644b39504f59c5804bcf2e5
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

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

  Log Message:
  -----------
  FLUID-4701: Updating Captionator to a fork that implements partial data url support.

  Commit: 4619daf4ee8ba85debeaa645f912ee9df3a19ff2
      https://github.com/fluid-project/videoPlayer/commit/4619daf4ee8ba85debeaa645f912ee9df3a19ff2
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-09-28 (Fri, 28 Sep 2012)

  Changed paths:
    M demos/VideoPlayer.html
    M js/VideoPlayer.js
    M js/VideoPlayer_html5Captionator.js
    M js/VideoPlayer_transcript.js
    M tests/html/VideoPlayerTranscript-test.html
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js

  Log Message:
  -----------
  FLUID-4701: Made the transcript feature work with the refactored Amara JSON support.

  Commit: 2d3ad8d957e3509bf6369cb7364ae4cd7acc4e61
      https://github.com/fluid-project/videoPlayer/commit/2d3ad8d957e3509bf6369cb7364ae4cd7acc4e61
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M demos/Mammals.css
    M js/VideoPlayer.js
    M js/VideoPlayer_html5Captionator.js
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/js/VideoPlayerHTML5CaptionatorTests.js

  Log Message:
  -----------
  FLUID-4701: Fixed default styling in the Mammals demo. Fixed a cross browser issue when finding track elements in the DOM. Linting.

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

  Changed paths:
    M css/VideoPlayer.css

  Log Message:
  -----------
  FLUID-4701: Overriding Captionator styling so that it will respond to UIO settings for font size and line spacing.

  Commit: 8c8ad2711da98967f59c0aea40a81247d55c4283
      https://github.com/fluid-project/videoPlayer/commit/8c8ad2711da98967f59c0aea40a81247d55c4283
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M demos/Mammals.css

  Log Message:
  -----------
  FLUID-4701: Tweaking default line height in the Mammals demo.

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

  Changed paths:
    M css/VideoPlayer.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/VideoPlayer.js
    M js/VideoPlayer_controllers.js
    M lib/infusion/README.txt
    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/js/VideoPlayerControlsTests.js

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

Conflicts:
	tests/html/TestCaptions.en.vtt
	tests/html/TestCaptions.fr.vtt

  Commit: 684bb8bffc5a35ee449f0fd2e4839f8b84a7c33e
      https://github.com/fluid-project/videoPlayer/commit/684bb8bffc5a35ee449f0fd2e4839f8b84a7c33e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-10-02 (Tue, 02 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: 463562563640c74d6d93d3b9620bb4043ec12cca
      https://github.com/fluid-project/videoPlayer/commit/463562563640c74d6d93d3b9620bb4043ec12cca
  Author: Michelle D'Souza <michelled33 at gmail.com>
  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-4701

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

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

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4701: Adding a lookup table for track creation functions based on type.

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

  Changed paths:
    M js/VideoPlayer_html5Captionator.js

  Log Message:
  -----------
  FLUID-4701: Changing to using 'invoke' instead of 'invokeGlobalFunction' so that it would be possible for an integrator to override the function signature.

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

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

  Log Message:
  -----------
  FLUID-4701: Code improvements based on review.

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

  Changed paths:
    M css/VideoPlayer.css
    M demos/Mammals.css
    M demos/VideoPlayer.html
    M js/VideoPlayer.js
    M js/VideoPlayer_html5Captionator.js
    M js/VideoPlayer_transcript.js
    M lib/captionator/README.txt
    M lib/captionator/js/captionator.js
    M tests/html/TestCaptions.en.vtt
    M tests/html/TestCaptions.fr.vtt
    M tests/html/VideoPlayerTranscript-test.html
    M tests/js/VideoPlayerHTML5CaptionatorTests.js
    M tests/js/VideoPlayerTests.js
    M tests/js/VideoPlayerTranscriptTests.js

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

* michelled/FLUID-4701:
  FLUID-4701: Code improvements based on review.
  FLUID-4701: Changing to using 'invoke' instead of 'invokeGlobalFunction' so that it would be possible for an integrator to override the function signature.
  FLUID-4701: Adding a lookup table for track creation functions based on type.
  FLUID-4701: Minor code tidy up.
  FLUID-4701: Tweaking default line height in the Mammals demo.
  FLUID-4701: Overriding Captionator styling so that it will respond to UIO settings for font size and line spacing.
  FLUID-4701: Fixed default styling in the Mammals demo. Fixed a cross browser issue when finding track elements in the DOM. Linting.
  FLUID-4701: Made the transcript feature work with the refactored Amara JSON support.
  FLUID-4701: Updating Captionator to a fork that implements partial data url support.
  FLUID-4701: Encoding the data url.
  FLUID-4701: Clarifying some comments. Fixing the data url being added to the track element with amara sourced captions - not sure if the format is corrrect yet.
  FLUID-4701: Sketch of amara json to vtt support.
  FLUID-4701: Adding overrides for caption colours in high contrast themes.
  FLUID-4701: Swapping in an unchanged version of Captionator and adding a style to position the cues correctly.

Compare: https://github.com/fluid-project/videoPlayer/compare/3d8969be9b18...e45c09c69a51