[Commits] [fluid-project/videoPlayer] 6c1746: Merge branch 'master' into FLUID-4559

GitHub noreply at github.com
Fri Feb 10 08:06:26 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 6c1746fa7de433db4e218f448d60bc24abc0d72a
      https://github.com/fluid-project/videoPlayer/commit/6c1746fa7de433db4e218f448d60bc24abc0d72a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2012-02-07 (Tue, 07 Feb 2012)

  Changed paths:
    M css/VideoPlayer.css
  M demos/VideoPlayer.html
  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-4559


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

  Changed paths:
    M css/VideoPlayer.css
  M demos/ReorganizeFuture.fr.json
  M demos/VideoPlayer.html
  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-4559


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

  Changed paths:
    M js/VideoPlayer_captionLoader.js

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


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

  Changed paths:
    M js/VideoPlayer_captionLoader.js
  M js/VideoPlayer_intervalEventsConductor.js
  M tests/js/VideoPlayerCaptionLoaderTests.js
  M tests/js/VideoPlayerIntervalEventsConductorTests.js

  Log Message:
  -----------
  FLUID-4559: Improved convertToMilli() in captionLoader & findCurrentInterval() in intervalEventsConductor.


  Commit: d4cc8caa2de4e18add0ccbf6d03fe367479cf2c2
      https://github.com/fluid-project/videoPlayer/commit/d4cc8caa2de4e18add0ccbf6d03fe367479cf2c2
  Author: Antranig Basman <antranig.basman at colorado.edu>
  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_captionLoader.js
  M js/VideoPlayer_captionner.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 'FLUID-4559'

* FLUID-4559:
  FLUID-4559: Improved convertToMilli() in captionLoader & findCurrentInterval() in intervalEventsConductor.
  FLUID-4559: Defined the caption loader millisecond conversion function as a invoker.
  :FLUID-4559: More modifications according to the code review comments.
  FLUID-4559: Modified according to the code review comments.
  FLUID-4559: Added VideoPlayer.js that was missed from the last commit.
  FLUID-4559: Segregated timer functionality from the intervalEventsConductor as well as adding in more unit and integration tests.
  FLUID-4559: Half-completed modified timeUpdateAdapter component according to Colin and Antranig's review.
  FLUID-4559: Completed unit tests.
  FLUID-4559: Implemented intervalChange event
  FLUID-4559: Moved timeUpdateAdapter component out of media component to the top level so it is more exposed and more operatable by other sources.
  FLUID-4559: Implemented onMediaTimeChange event that's re-wired from video timeupdate event and used for time progress update.


Compare: https://github.com/fluid-project/videoPlayer/compare/4d51d5e...d4cc8ca


More information about the Commits mailing list