[Commits] [fluid-project/infusion] 77d0f9: FLUID-4277: Fixed the failed unit tests for UI Opt...

noreply at github.com noreply at github.com
Thu Jun 9 20:16:43 UTC 2011


Branch: refs/heads/master
Home:   https://github.com/fluid-project/infusion

Commit: 77d0f9632abced0b568a73e0ddfd276c08f5af99
    https://github.com/fluid-project/infusion/commit/77d0f9632abced0b568a73e0ddfd276c08f5af99
Author: Cindy Li <cli at ocad.ca>
Date:   2011-06-09 (Thu, 09 Jun 2011)

Changed paths:
  M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/demos/fss/themes/html/themes.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/framework/fss/css/fss-text.css
  A src/webapp/framework/fss/css/fss-theme-blackYellow.css
  A src/webapp/framework/fss/css/fss-theme-yellowBlack.css
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_bigA_yellow_20x20.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_cancel_yellow_13x13.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_layoutandnavigation_yellow_18x18.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_linesNarrow_yellow_16x12.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_linesWide_yellow_16x21.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_linksandbuttons_yellow_18x18.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_save_yellow_13x13.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_smallA_yellow_10x10.png
  A src/webapp/framework/fss/images/themes/yellowBlack/uio_icon_textanddisplay_yellow_18x18.png
  M src/webapp/integration-demos/sakai/html/UIOptionsPreview.html
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/blackYellow.css
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_0_aaaaaa_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_100_000000_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_454545_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_cd0a0a_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_ffff00_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_aaaaaa_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_ffff00_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_100_ffff00_40x100.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_000000_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_454545_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_888888_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_cd0a0a_256x240.png
  A src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/yellowBlack.css
  R src/webapp/standalone-demos/uiOptions/css/SomeKindOfNews.css
  R src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  R src/webapp/standalone-demos/uiOptions/images/bg-grad.png
  R src/webapp/standalone-demos/uiOptions/js/someKindOfNews.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  A src/webapp/tests/framework-tests/fss/html/8.fss.themes.html
  M src/webapp/tests/framework-tests/fss/js/toc.js
  M src/webapp/tests/manual-tests/ReadMe.txt
  A src/webapp/tests/manual-tests/css/SomeKindOfNews.css
  A src/webapp/tests/manual-tests/html/SomeKindOfNews.html
  A src/webapp/tests/manual-tests/images/bg-grad.png
  A src/webapp/tests/manual-tests/js/someKindOfNews.js

Log Message:
-----------
FLUID-4277: Fixed the failed unit tests for UI Options and UI Enhancer due to the merge-in of the project repo. Also changed a bunch of file permissions from 755 to 644.


Commit: a72d1807d656dce28edf3629b97f101f50ec52e3
    https://github.com/fluid-project/infusion/commit/a72d1807d656dce28edf3629b97f101f50ec52e3
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-06-09 (Thu, 09 Jun 2011)

Changed paths:
  M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/blackYellow.css
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-bg_flat_100_000000_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_454545_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-blackYellow/images/ui-icons_ffff00_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_0_ffff00_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-bg_flat_100_ffff00_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_000000_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_454545_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_888888_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-yellowBlack/yellowBlack.css
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

Log Message:
-----------
Merge remote-tracking branch 'cindy/FLUID-4277'

* cindy/FLUID-4277:
  FLUID-4277: removed the unnecessary call on primeCacheFromResources(fluid.uiOptions).
  FLUID-4277: Moved the template supply block out of the js scripts (FatPanelUIOptions.js etc) to avoid the customization assignments as these scripts are intended to be shared by the implementors. Also fixed the sakai integration demo for UI Options. The standalone UI Options demo has been fixed in Anastasia's pull request for FLUID-4218.


Compare: https://github.com/fluid-project/infusion/compare/177f004...a72d180



More information about the Commits mailing list