[Commits] [fluid-project/infusion] f08e8f: Merge branch 'FLUID-4132'

noreply at github.com noreply at github.com
Fri Jun 3 21:54:01 UTC 2011


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

Commit: f08e8f32cc9c613eb7b7baa918d01856d3448b0e
    https://github.com/fluid-project/infusion/commit/f08e8f32cc9c613eb7b7baa918d01856d3448b0e
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js

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

* FLUID-4132:
  FLUID-4132: Removed deprecated FCKEditor from the code base and fixed jslint errors.


Commit: 2b03f560d083537fed5e2db253889cd295e03e65
    https://github.com/fluid-project/infusion/commit/2b03f560d083537fed5e2db253889cd295e03e65
Author: Cindy Li <cli at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M ReleaseNotes.txt
  M src/webapp/components/reorderer/js/ImageReorderer.js
  M src/webapp/components/reorderer/js/Reorderer.js
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/demos/fss/clearfix/js/clearfix.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidDebugging.js
  M src/webapp/framework/core/js/FluidView.js
  M src/webapp/framework/fss/css/fss-layout.css
  M src/webapp/integration-demos/uportal/js/portal.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/reorderer/js/Scheduler.js
  M src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
  M src/webapp/tests/framework-tests/core/html/FluidJS-test.html
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

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


Commit: 6c1103d3f7f116b03d718d26ec6d9bf9bc352641
    https://github.com/fluid-project/infusion/commit/6c1103d3f7f116b03d718d26ec6d9bf9bc352641
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  A src/webapp/components/uiOptions/js/FullPreviewUIOptions.js

Log Message:
-----------
FLUID-4228: Created js file for Full with Preview version of UIO and added to demo


Commit: 2ec662da3e70d3535311d823cf311ff574e4b44c
    https://github.com/fluid-project/infusion/commit/2ec662da3e70d3535311d823cf311ff574e4b44c
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html

Log Message:
-----------
FLUID-4228: De-tabbed, linted js file


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

Changed paths:
  M src/webapp/components/reorderer/js/ImageReorderer.js
  M src/webapp/components/reorderer/js/Reorderer.js
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidDebugging.js
  M src/webapp/framework/core/js/FluidView.js
  M src/webapp/integration-demos/uportal/js/portal.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/reorderer/js/Scheduler.js
  M src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
  M src/webapp/tests/framework-tests/core/html/FluidJS-test.html
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

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


Commit: 902914295ef886457a1f6fcb8f588c4bbfe57bfd
    https://github.com/fluid-project/infusion/commit/902914295ef886457a1f6fcb8f588c4bbfe57bfd
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M src/webapp/components/reorderer/js/ImageReorderer.js
  M src/webapp/components/reorderer/js/Reorderer.js
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidDebugging.js
  M src/webapp/framework/core/js/FluidView.js
  M src/webapp/integration-demos/uportal/js/portal.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/reorderer/js/Scheduler.js
  M src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
  M src/webapp/tests/framework-tests/core/html/FluidJS-test.html
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

Log Message:
-----------
Merge remote branch 'michelle/FLUID-4267' into FLUID-4267


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

Changed paths:
  M src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  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/integration-demos/uportal/html/portal.html
  M src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  A src/webapp/tests/component-tests/uiOptions/html/Store-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

Log Message:
-----------
FLUID-4265: Split the store tests out from UIEnhancer. Added Store.js to the demos and tests.
 Moved the demands block for settingsStore into UIEnhancer.


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

Changed paths:
  M src/webapp/components/reorderer/js/ImageReorderer.js
  M src/webapp/components/reorderer/js/Reorderer.js
  M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  A src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FatPanelUIOptions/js/uiOptions.js
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidDebugging.js
  M src/webapp/framework/core/js/FluidView.js
  M src/webapp/integration-demos/uportal/js/portal.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/reorderer/js/Scheduler.js
  M src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
  M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
  M src/webapp/tests/framework-tests/core/html/FluidJS-test.html
  M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

Log Message:
-----------
Merge branch 'FLUID-4267' into FLUID-4265


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

Changed paths:
  A src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  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/integration-demos/uportal/html/portal.html
  M src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  A src/webapp/tests/component-tests/uiOptions/html/Store-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

Log Message:
-----------
Merge branch 'FLUID-4265' into FLUID-4267

* FLUID-4265:
  FLUID-4265: Split the store tests out from UIEnhancer. Added Store.js to the demos and tests.  Moved the demands block for settingsStore into UIEnhancer.
  FLUID-4265: Pulling the storage strategy for settings out of UIEnhancer. Moving defaultSiteSettings into uiOptions.store.


Commit: e07151a7ab56b064b6ff9f43435a386e55c77a8a
    https://github.com/fluid-project/infusion/commit/e07151a7ab56b064b6ff9f43435a386e55c77a8a
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  A src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/UIOptions.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/js/uiOptions.js

Log Message:
-----------
FLUID-4229: Added full no preview component and added to demo


Commit: 8e79107ba27f85a3268039812259313b9896a43f
    https://github.com/fluid-project/infusion/commit/8e79107ba27f85a3268039812259313b9896a43f
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  A src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/UIOptions.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/js/uiOptions.js

Log Message:
-----------
Merge branch 'FLUID-4229' into FLUID-4267


Commit: feb4adc90a7c6b0deb75d3914bf98ae92adcd0e5
    https://github.com/fluid-project/infusion/commit/feb4adc90a7c6b0deb75d3914bf98ae92adcd0e5
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/500x327_mint_truffle.jpg
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/border_1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/expand_collapse.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/h1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/main_bg.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/mintleaf.png

Log Message:
-----------
FLUID-4229: Removed preview image dir from demo


Commit: 7dd4c67d15ed02cc791d89f347d1a5e7bed92903
    https://github.com/fluid-project/infusion/commit/7dd4c67d15ed02cc791d89f347d1a5e7bed92903
Author: heidi valles <hvalles at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/500x327_mint_truffle.jpg
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/border_1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/expand_collapse.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/h1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/main_bg.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/mintleaf.png

Log Message:
-----------
Merge branch 'FLUID-4229' into FLUID-4267


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

Changed paths:
  M src/webapp/components/uiOptions/js/UIEnhancer.js

Log Message:
-----------
FLUID-4262: Reviving the uiEnhancer.updateModel


Commit: 8352c31360b4a0e33a8c8afda72bf75d0c242b99
    https://github.com/fluid-project/infusion/commit/8352c31360b4a0e33a8c8afda72bf75d0c242b99
Author: Cindy Li <cli at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M build-scripts/build.properties
  M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  M src/webapp/components/uiOptions/html/FatPanelUIOptions.html
  A src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  A src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FatPanelUIOptions/js/uiOptions.js
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/UIOptions.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/500x327_mint_truffle.jpg
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/border_1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/expand_collapse.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/h1.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/main_bg.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/images/mintleaf.png
  R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/js/uiOptions.js
  M src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.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/plugins/ariaTabs/jQueryAriaTabsPluginDependencies.json
  A src/webapp/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js
  M src/webapp/lib/jquery/ui/jQueryUIWidgetsDependencies.json
  R src/webapp/lib/jquery/ui/js/ui.ariaTabs.js
  M src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  A src/webapp/tests/component-tests/uiOptions/html/Store-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
  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

Log Message:
-----------
Merge remote branch 'michelle/FLUID-4267' into FLUID-4277


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

Changed paths:
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/integration-demos/uportal/js/portal.js

Log Message:
-----------
FLUID-4262: Fixing the integration demo to work with the new settings.


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

Changed paths:
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/integration-demos/uportal/js/portal.js

Log Message:
-----------
Merge branch 'FLUID-4262' into FLUID-4267

* FLUID-4262:
  FLUID-4262: Fixing the integration demo to work with the new settings.
  FLUID-4262: Reviving the uiEnhancer.updateModel


Commit: 0855ca220b372f1d54ad7157b71e09d4ae577041
    https://github.com/fluid-project/infusion/commit/0855ca220b372f1d54ad7157b71e09d4ae577041
Author: Cindy Li <cli at ocad.ca>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/integration-demos/uportal/js/portal.js

Log Message:
-----------
Merge remote branch 'michelle/FLUID-4267' into FLUID-4277


Commit: 1c25cfac4a50e63bb3e39445cdc1971a9ee507bb
    https://github.com/fluid-project/infusion/commit/1c25cfac4a50e63bb3e39445cdc1971a9ee507bb
Author: Cindy Li <cli at ocad.ca>
Date:   2011-06-03 (Fri, 03 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/tests/component-tests/uiOptions/js/UIOptionsTests.js

Log Message:
-----------
FLUID-4277: Sloved the async template loading issue that causes the ui options tests fail on firefox.


Commit: aa5efc1e1a20aaa152f2e7e2d4edfbb35e08c5ea
    https://github.com/fluid-project/infusion/commit/aa5efc1e1a20aaa152f2e7e2d4edfbb35e08c5ea
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M build-scripts/build.properties
  A src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  A src/webapp/components/uiOptions/css/FullNoPreviewUIOptions.css
  A src/webapp/components/uiOptions/css/FullPreviewUIOptions.css
  A src/webapp/components/uiOptions/css/FullUIOptions.css
  R src/webapp/components/uiOptions/css/Slider.css
  M src/webapp/components/uiOptions/css/UIOptions.css
  A src/webapp/components/uiOptions/html/FatPanelUIOptions.html
  A src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
  A src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
  R src/webapp/components/uiOptions/html/UIOptions.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
  A src/webapp/components/uiOptions/images/select_arrow.png
  A src/webapp/components/uiOptions/images/uio_icon_bigA_20x20.png
  A src/webapp/components/uiOptions/images/uio_icon_cancel_13x13.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_inverted_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_linesNarrow_16x12.png
  A src/webapp/components/uiOptions/images/uio_icon_linesWide_16x21.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_inverted_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_reset_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_save_13x13.png
  A src/webapp/components/uiOptions/images/uio_icon_sliderhandle.png
  A src/webapp/components/uiOptions/images/uio_icon_smallA_10x10.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_inverted_16x16.png
  A src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  A src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/SlidingPanel.js
  A src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/demos/fss/clearfix/css/clearfix.css
  M src/webapp/demos/fss/clearfix/html/clearfix.html
  R src/webapp/demos/lib/jquery/jQuery-LICENSE.txt
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_75_ffffff_40x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_65_ffffff_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_dadada_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_222222_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_2e83ff_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_454545_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_888888_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_cd0a0a_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  R src/webapp/demos/lib/jquery/ui/js/jquery.ui.tabs.js
  A src/webapp/demos/uiOptions/FatPanelUIOptions/css/uiOptions.css
  A src/webapp/demos/uiOptions/FatPanelUIOptions/demo.html
  A src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptions.css
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptionsPreview.css
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/demo.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/css/UIOptionsPreview.css
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/css/uiOptions.css
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/demo.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/500x327_mint_truffle.jpg
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/border_1.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/expand_collapse.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/h1.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/main_bg.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/mintleaf.png
  R src/webapp/demos/uiOptions/css/uiOptions.css
  R src/webapp/demos/uiOptions/demo.html
  R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
  R src/webapp/demos/uiOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/framework/fss/css/fss-layout.css
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/integration-demos/uportal/js/portal.js
  A src/webapp/lib/jquery/plugins/ariaTabs/jQueryAriaTabsPluginDependencies.json
  A src/webapp/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js
  M src/webapp/lib/jquery/ui/jQueryUIWidgetsDependencies.json
  A src/webapp/lib/jquery/ui/js/jquery.ui.tabs.js
  A src/webapp/standalone-demos/uiOptions/css/SomeKindOfNews.css
  R src/webapp/standalone-demos/uiOptions/css/UIOptionsPreview.css
  A src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  R src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  R src/webapp/standalone-demos/uiOptions/html/UIOptionsPreview.html
  R src/webapp/standalone-demos/uiOptions/images/500x327_mint_truffle.jpg
  A src/webapp/standalone-demos/uiOptions/images/bg-grad.png
  R src/webapp/standalone-demos/uiOptions/images/border_1.png
  R src/webapp/standalone-demos/uiOptions/images/expand_collapse.png
  R src/webapp/standalone-demos/uiOptions/images/h1.png
  R src/webapp/standalone-demos/uiOptions/images/main_bg.png
  R src/webapp/standalone-demos/uiOptions/images/mintleaf.png
  A src/webapp/standalone-demos/uiOptions/js/someKindOfNews.js
  A src/webapp/tests/component-tests/uiOptions/html/SlidingPanel-test.html
  A src/webapp/tests/component-tests/uiOptions/html/Store-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/js/SlidingPanelTests.js
  A src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
  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

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

* FLUID-4267: (77 commits)
  FLUID-4277: Sloved the async template loading issue that causes the ui options tests fail on firefox.
  FLUID-4262: Fixing the integration demo to work with the new settings.
  FLUID-4262: Reviving the uiEnhancer.updateModel
  FLUID-4229: Removed preview image dir from demo
  FLUID-4229: Added full no preview component and added to demo
  FLUID-4265: Split the store tests out from UIEnhancer. Added Store.js to the demos and tests.  Moved the demands block for settingsStore into UIEnhancer.
  FLUID-4228: De-tabbed, linted js file
  FLUID-4228: Created js file for Full with Preview version of UIO and added to demo
  FLUID-4267: Refactored the textfieldSlider tests slightly.  More tests to be added in the FLUID-4208 branch.
  FLUID-4230: fixed path to ariaTabs in demo
  FLUID-4265: Pulling the storage strategy for settings out of UIEnhancer. Moving defaultSiteSettings into uiOptions.store.
  FLUID-4230: style clean up, removed fat demo js file (not used)
  FLUID-4267:  Move validateValue() tests out of UIOptions and into TextFieldSlider tests
  FLUID-4230: Fixed save button check
  FLUID-4230: Dependency updates
  FLUID-4230: Reverted UIO amalgateClasses work, moved tabs to be subcomponent of UIO instead of FPanel, moved ariaTabs and added dependency files
  FLUID-4267:  Make validateValue() function of the textSlider public and add unit tests for this function
  FLUID-4230: Added almalgateClass to fetchResources in UIOptions.js, so it waits for control templates to load as well. Add priorities to FatPanel sub components
  FLUID-4267: Added UIO component unit tests.  Much more to follow.
  FLUID-4216: Implemented a component to apply specific css styles to the options on the dropdown list of "text style" and "colour & contrast" that each option targets for; Fixed the UI Enhancer tests that are broken by the previous commit; Modified the UI Options tests to use text size multiplier; Changed a couple of file permissions from 755 to 644.
  ...


Commit: be3fb270470bae8fa8818dd93fa48983b4939423
    https://github.com/fluid-project/infusion/commit/be3fb270470bae8fa8818dd93fa48983b4939423
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-06-03 (Fri, 03 Jun 2011)

Changed paths:
  M src/webapp/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js

Log Message:
-----------
FLUID-4267: Fixing line endings for ARIA tabs


Compare: https://github.com/fluid-project/infusion/compare/ca843c2...be3fb27



More information about the Commits mailing list