[Commits] [fluid-project/videoPlayer] 21c512: FLUID-4607: Fix for issue where zero video players...

GitHub noreply at github.com
Wed Apr 11 21:16:34 UTC 2012


  Branch: refs/heads/demo
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 21c5121c04196b9818d2cbafc656b8434cbda70d
      https://github.com/fluid-project/videoPlayer/commit/21c5121c04196b9818d2cbafc656b8434cbda70d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M demos/Mammals.js
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_uiOptions.js

  Log Message:
  -----------
  FLUID-4607: Fix for issue where zero video players were created on the original page, and the first was not created until after UIOptions has fully initialised


  Commit: 48145675e519ad3af409ef0dba5404ebbe8d4a1f
      https://github.com/fluid-project/videoPlayer/commit/48145675e519ad3af409ef0dba5404ebbe8d4a1f
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M demos/VideoPlayer.html
    M js/VideoPlayer_transcript.js
    R lib/captionator/js/captionator-min.js
    M lib/captionator/js/captionator.js

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


  Commit: f429a1b2d517117af1b5df81fa0233be36675cb3
      https://github.com/fluid-project/videoPlayer/commit/f429a1b2d517117af1b5df81fa0233be36675cb3
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M demos/Mammals.html

  Log Message:
  -----------
  FLUID-4607: Swapped order of CSS includes to prevent issues with jQuery UI "lightness" style


  Commit: 36c8ab1e8b0fde5581141456a94705975b8db5f1
      https://github.com/fluid-project/videoPlayer/commit/36c8ab1e8b0fde5581141456a94705975b8db5f1
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    A css/UIOptions-media.css
    M demos/Mammals.html
    M demos/Mammals.js
    A html/UIOptionsTemplate-media.html
    A images/black/uio_icon_audioandvideo_black_18x18.png
    A images/black/uio_icon_volumeOff_black_12x21.png
    A images/black/uio_icon_volumeOn_black_23x21.png
    A images/white/uio_icon_audioandvideo_white_18x18.png
    A images/white/uio_icon_volumeOff_white_12x21.png
    A images/white/uio_icon_volumeOn_white_23x21.png
    A images/yellow/uio_icon_audioandvideo_yellow_18x18.png
    A images/yellow/uio_icon_volumeOff_yellow_12x21.png
    A images/yellow/uio_icon_volumeOn_yellow_23x21.png
    M js/VideoPlayer.js
    M js/VideoPlayer_framework.js
    M js/VideoPlayer_uiOptions.js
    M lib/infusion/MyInfusion.js
    M lib/infusion/README.txt
    M lib/infusion/components/uiOptions/css/FatPanelUIOptionsFrame.css
    R lib/infusion/components/uiOptions/css/UIOptions-media.css
    M lib/infusion/components/uiOptions/css/UIOptions.css
    M lib/infusion/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R lib/infusion/components/uiOptions/images/bw/uio_icon_audioandvideo_black_18x18.png
    R lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOff_black_12x21.png
    R lib/infusion/components/uiOptions/images/bw/uio_icon_volumeOn_black_23x21.png
    R lib/infusion/components/uiOptions/images/wb/uio_icon_audioandvideo_white_18x18.png
    R lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOff_white_12x21.png
    R lib/infusion/components/uiOptions/images/wb/uio_icon_volumeOn_white_23x21.png
    R lib/infusion/components/uiOptions/images/yb/uio_icon_audioandvideo_yellow_18x18.png
    R lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOff_yellow_12x21.png
    R lib/infusion/components/uiOptions/images/yb/uio_icon_volumeOn_yellow_23x21.png

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

* amb26/demo-integration-sketch:
  FLUID-4607: Swapped order of CSS includes to prevent issues with jQuery UI "lightness" style
  FLUID-4607: Fix for issue where zero video players were created on the original page, and the first was not created until after UIOptions has fully initialised
  FLUID-4607: Small tweaks to demonstrate that video players can be created arbitrarily late during the page cycle and still be wired up to UIOptions correctly. This is a demonstration fix which delays the 3rd videoPlayer on the page by 5 seconds - this should be reverted once OER demo is stable and we have automated test cases.
  Updated to latest infusion branch build after review fixes
  FLUID-4607: Finished migrating out the last few media-specific icons and CSS from the core framework
  FLUID-4607, FLUID-4531: Successfully deforked framework version of UIOptions and all media panel materials moved back out into videoPlayer project.


  Commit: 1e8d05c92d8f0c6e59b5a50f8c94c3fcd5795008
      https://github.com/fluid-project/videoPlayer/commit/1e8d05c92d8f0c6e59b5a50f8c94c3fcd5795008
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M demos/Mammals.js

  Log Message:
  -----------
  FLUID-4607: Commenting out the timeouts so video players in the demo get created immediately.


Compare: https://github.com/fluid-project/videoPlayer/compare/0d585c5...1e8d05c


More information about the Commits mailing list