[Commits] [fluid-project/infusion] f84bb0: Merge branch 'master' into FLUID-4206

noreply at github.com noreply at github.com
Thu May 12 13:43:21 UTC 2011


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

Commit: f84bb0228638ba41208486fe7dc4464ba6330299
    https://github.com/fluid-project/infusion/commit/f84bb0228638ba41208486fe7dc4464ba6330299
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/html/UIOptions.html
  R src/webapp/components/uiOptions/images/500x327_mint_truffle.jpg
  R src/webapp/components/uiOptions/images/border_1.png
  R src/webapp/components/uiOptions/images/expand_collapse.png
  R src/webapp/components/uiOptions/images/h1.png
  R src/webapp/components/uiOptions/images/main_bg.png
  R src/webapp/components/uiOptions/images/mintleaf.png
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uploader/html/Uploader.html
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_75_ffffff_40x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_65_ffffff_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_dadada_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_222222_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_2e83ff_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_454545_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_888888_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  A src/webapp/standalone-demos/uiOptions/images/500x327_mint_truffle.jpg
  A src/webapp/standalone-demos/uiOptions/images/border_1.png
  A src/webapp/standalone-demos/uiOptions/images/expand_collapse.png
  A src/webapp/standalone-demos/uiOptions/images/h1.png
  A src/webapp/standalone-demos/uiOptions/images/main_bg.png
  A src/webapp/standalone-demos/uiOptions/images/mintleaf.png
  M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
  M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
  M src/webapp/tests/component-tests/uploader/html/FileQueueView-test.html
  M src/webapp/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
  M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
  M src/webapp/tests/component-tests/uploader/html/Uploader-test.html
  M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
  M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
  M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

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


Commit: 69cb52f2f8b5e515f5c106b432e812742b1aa400
    https://github.com/fluid-project/infusion/commit/69cb52f2f8b5e515f5c106b432e812742b1aa400
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css

Log Message:
-----------
FLUID-4206: Updated the demo theme.

Updated the jQuery UI theme used in the demos to jQuery UI 1.8.12. I didn't update the images since they were the same. This had been missed in the previous commmit to update the jQuery UI themes.


Commit: 321480c9e83b38e623fa211adcbfa919a5c89b6d
    https://github.com/fluid-project/infusion/commit/321480c9e83b38e623fa211adcbfa919a5c89b6d
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/demos/fss/linearize/html/linearize.html
  R src/webapp/demos/lib/jquery/ui/css/jquery.ui.core.css

Log Message:
-----------
FLUID-4206: Removed unneed jquery.ui.core.css file

The jquery.ui.core.css file was in the demos/lib directory. It is unneeded because the demo-theme handles the necessary styling. Rather than update it, I just removed it. I also fixed up the imports in the linearize.html file that had been calling it. And moved the import of the demo theme to the correct spot in the file.


Commit: 49affe7a50a45636c3bb116680bc240248a4af90
    https://github.com/fluid-project/infusion/commit/49affe7a50a45636c3bb116680bc240248a4af90
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/coal.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/hc.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/hci.css
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/mist.css
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/slate.css
  M src/webapp/lib/jquery/ui/css/jquery.ui.theme.css

Log Message:
-----------
FLUID-4206: Adjusted theme updates

The theme updates had been missing the jquery ui widget stylings. I've fixed this up for all of the themes. I also updated the jquery.ui.theme.css file, which had been missed


Commit: 3e7fb7e7a5186987ce37be80848246d1c2cee7aa
    https://github.com/fluid-project/infusion/commit/3e7fb7e7a5186987ce37be80848246d1c2cee7aa
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M ReleaseNotes.txt
  M src/webapp/demos/fss/linearize/html/linearize.html
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  R src/webapp/demos/lib/jquery/ui/css/jquery.ui.core.css
  M src/webapp/demos/lib/jquery/ui/js/jquery.ui.tabs.js
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/coal.css
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/hc.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-icons_000000_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hc/images/ui-icons_ffffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/hci.css
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_000000_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_fffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-hci/images/ui-icons_ffffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-mist/mist.css
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
  M src/webapp/lib/jquery/ui/css/fl-theme-slate/slate.css
  M src/webapp/lib/jquery/ui/css/jquery.ui.theme.css
  M src/webapp/lib/jquery/ui/js/jquery.ui.core.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.dialog.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.draggable.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.mouse.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.position.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.slider.js
  M src/webapp/lib/jquery/ui/js/jquery.ui.widget.js
  M src/webapp/lib/jquery/ui/js/ui-FLUID-readme.txt

Log Message:
-----------
Merge branch 'FLUID-4206'

* FLUID-4206:
  FLUID-4206: Adjusted theme updates
  FLUID-4206: Removed unneed jquery.ui.core.css file
  FLUID-4206: Updated the demo theme.
  FLUID-4206: Updated themes regarding jQuery UI 1.8.12.  These updates are generated from http://jqueryui.com/themeroller, including coal, hc, hci, mist, slate.
  FLUID-4206: Replaced tags in release notes and read me from 1.8.11 to 1.8.12.
  FLUID-4206: replaces 1.8.11 jQuery UI to 1.8.12.


Compare: https://github.com/fluid-project/infusion/compare/8af64d5...3e7fb7e



More information about the Commits mailing list