[Commits] [fluid-project/infusion] 33aa2a: FLUID-4686: initial changes to uiOptions store wit...

GitHub noreply at github.com
Wed Jun 12 10:42:18 EDT 2013 

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 33aa2a833e4ac8fc9872dc2bc740cc7551d88035
      https://github.com/fluid-project/infusion/commit/33aa2a833e4ac8fc9872dc2bc740cc7551d88035
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M 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/tests/component-tests/uiOptions/js/StoreTests.js

  Log Message:
  -----------
  FLUID-4686: initial changes to uiOptions store with tests passing. Some uioptions tests still fail.


  Commit: 40a8add3010e9e0d38e933c6a4b62bb0d171f2df
      https://github.com/fluid-project/infusion/commit/40a8add3010e9e0d38e933c6a4b62bb0d171f2df
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M src/webapp/components/progress/js/Progress.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/tooltip/js/Tooltip.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/FileQueueView.js
    M src/webapp/components/uploader/js/Flash9UploaderSupport.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/HTML5UploaderSupport.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/tests/component-tests/progress/html/Progress-test.html
    M src/webapp/tests/component-tests/progress/js/ProgressTests.js
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/webapp/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/webapp/tests/component-tests/tooltip/js/TooltipTests.js
    M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTestUtilities.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit-browser.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js

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


  Commit: 0195925d1f9b6d6623290d05ae477171df821a5a
      https://github.com/fluid-project/infusion/commit/0195925d1f9b6d6623290d05ae477171df821a5a
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js

  Log Message:
  -----------
  FLUID-4686: passing panel tests.


  Commit: f8df5ac59d98f00e081c5ed2dc996af3d4cab7bd
      https://github.com/fluid-project/infusion/commit/f8df5ac59d98f00e081c5ed2dc996af3d4cab7bd
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.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/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4686: Working enactor tests. Soon to be working ui enhancer.


  Commit: 137e2886255370176555cea546be7fb65b46ca8d
      https://github.com/fluid-project/infusion/commit/137e2886255370176555cea546be7fb65b46ca8d
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4686: working uioptions tests.


  Commit: fb6fdba52d2d5d0324820bd527fb5cec19f03f1d
      https://github.com/fluid-project/infusion/commit/fb6fdba52d2d5d0324820bd527fb5cec19f03f1d
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js

  Log Message:
  -----------
  FLUID-4686: working page enhancer tests.


  Commit: 42b2f0b5b1b85e01ea6bd1f5964f57cb132a831f
      https://github.com/fluid-project/infusion/commit/42b2f0b5b1b85e01ea6bd1f5964f57cb132a831f
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M 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/framework/core/js/DataBinding.js
    M src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4686: All tests are now passing.


  Commit: af6d5c2ae318f5e91b8872f5ceb1ef4cca54e41b
      https://github.com/fluid-project/infusion/commit/af6d5c2ae318f5e91b8872f5ceb1ef4cca54e41b
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    A fonts/OpenSans-LICENSE.txt b/src/webapp/lib/fonts/OpenSans-LICENSE.txt
    R fonts/OpenSans-LICENSE.txt b/src/webapp/lib/fonts/OpenSans-LICENSE.txt
    A fonts/OpenSans-Light.ttf b/src/webapp/lib/fonts/OpenSans-Light.ttf
    R fonts/OpenSans-Light.ttf b/src/webapp/lib/fonts/OpenSans-Light.ttf
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    R src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/by/uio_icon_button.png
    A src/webapp/components/uiOptions/images/by/uio_icon_button.png
    A src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    A src/webapp/components/uiOptions/images/by/uio_icon_list.png
    R src/webapp/components/uiOptions/images/by/uio_icon_list.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    A src/webapp/components/uiOptions/images/default/uio_icon_button.png
    R src/webapp/components/uiOptions/images/default/uio_icon_button.png
    A src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    A src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/default/uio_icon_list.png
    A src/webapp/components/uiOptions/images/default/uio_icon_list.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    A src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    M src/webapp/demos/progress/html/progress.html
    A src/webapp/lib/fonts/OpenSans-Regular.ttf
    A src/webapp/lib/fonts/OpenSans-Semibold.ttf
    A uio_icon_button.png b/src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    R uio_icon_button.png b/src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    R uio_icon_button.png b/src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    A uio_icon_button.png b/src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    A uio_icon_contrast.png b/src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    R uio_icon_contrast.png b/src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    A uio_icon_contrast.png b/src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    R uio_icon_contrast.png b/src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    A uio_icon_indicator.png b/src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    R uio_icon_indicator.png b/src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    A uio_icon_indicator.png b/src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    R uio_icon_indicator.png b/src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    R uio_icon_list.png b/src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    A uio_icon_list.png b/src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    A uio_icon_list.png b/src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    R uio_icon_list.png b/src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    R uio_icon_textSize.png b/src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    A uio_icon_textSize.png b/src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    A uio_icon_textSize.png b/src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    R uio_icon_textSize.png b/src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    A uio_icon_textStyle.png b/src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    R uio_icon_textStyle.png b/src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    R uio_icon_textStyle.png b/src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
    A uio_icon_textStyle.png b/src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png

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


  Commit: 3a75774fdb39291bed2972915742513ca50c54da
      https://github.com/fluid-project/infusion/commit/3a75774fdb39291bed2972915742513ca50c54da
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4686: fixed uiOptions full no preview manual test.


  Commit: 10377a4b4f0a02bd85827dbf6113d9b8e239dc33
      https://github.com/fluid-project/infusion/commit/10377a4b4f0a02bd85827dbf6113d9b8e239dc33
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html

  Log Message:
  -----------
  FLUID-4686: fixed manual with preview test. TODO: need to fix the full/no preview uioptions to not update dynamically.


  Commit: 987aa239dbe86e8518bece39d098150379c96c8b
      https://github.com/fluid-project/infusion/commit/987aa239dbe86e8518bece39d098150379c96c8b
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js

  Log Message:
  -----------
  FLUID-4686: passing tests and fixed preview/fullpage manual tests.


  Commit: cb5ce005203ced2d0a89e524695eb15f5c09d45c
      https://github.com/fluid-project/infusion/commit/cb5ce005203ced2d0a89e524695eb15f5c09d45c
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

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

  Log Message:
  -----------
  FLUID-4686: Cleaned up models for setting panels.


  Commit: 5ad89cb673796a15e603cdc0849bbb47541fe19c
      https://github.com/fluid-project/infusion/commit/5ad89cb673796a15e603cdc0849bbb47541fe19c
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

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

  Log Message:
  -----------
  FLUID-4686: fixed uiOptionsDemo.js


  Commit: 93e720d84e7bf269b3fbf5b660a3b73fd49dbf9a
      https://github.com/fluid-project/infusion/commit/93e720d84e7bf269b3fbf5b660a3b73fd49dbf9a
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html

  Log Message:
  -----------
  FLUID-4686: Fixed integration demos.


  Commit: e610bb813e7c308fc2f3ce5fb0a25a25282d1c59
      https://github.com/fluid-project/infusion/commit/e610bb813e7c308fc2f3ce5fb0a25a25282d1c59
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4686: addressed @amb26 comment regarding default model filtering.


  Commit: 7afc11dd1221880ea750538e1cf3d3ac254ce3f8
      https://github.com/fluid-project/infusion/commit/7afc11dd1221880ea750538e1cf3d3ac254ce3f8
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.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/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4686: Default model is now an empty grade.


  Commit: cad3b56e20d05cda167881b026e2bf258f0d565b
      https://github.com/fluid-project/infusion/commit/cad3b56e20d05cda167881b026e2bf258f0d565b
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    A src/webapp/components/uiOptions/js/i18n.js
    M src/webapp/components/undo/js/Undo.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
    M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/webapp/tests/component-tests/uiOptions/all-tests.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    A src/webapp/tests/component-tests/uiOptions/html/I18n-test.html
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/I18nTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/manual-tests/html/dropdown.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

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

Conflicts:
	src/webapp/components/uiOptions/js/FatPanelUIOptions.js
	src/webapp/components/uiOptions/js/SettingsPanels.js
	src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js


  Commit: 4212e62196c95be7c2401477aa82d4473327ef64
      https://github.com/fluid-project/infusion/commit/4212e62196c95be7c2401477aa82d4473327ef64
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    A src/webapp/lib/jquery/ui/js/jquery.ui.touch-punch.js
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

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


  Commit: 49784ab9e6ed417166ac07ed6d461cc482a4c74b
      https://github.com/fluid-project/infusion/commit/49784ab9e6ed417166ac07ed6d461cc482a4c74b
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/css/ie8.css
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
    R src/webapp/components/uiOptions/images/by/uio_icon_button.png
    R src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_list.png
    R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
    R src/webapp/components/uiOptions/images/default/uio_icon_button.png
    R src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_list.png
    R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html
    A src/webapp/lib/fonts/fontsDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    R src/webapp/lib/jquery/ui/js/jquery.ui.touch-punch.js
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

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


  Commit: 46726d2bc5f32675a5369b925482830540def27d
      https://github.com/fluid-project/infusion/commit/46726d2bc5f32675a5369b925482830540def27d
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.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/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4686: renamed defaultActions->starterActions, defaultSettingsPanels->starterSettingsPanels, defaultModel.outOfTheBox->defaultModel.starter, defaultTemplateLoader->starterTemplateLoader


  Commit: 7a8827a0df4c983138bb5026727797450ec1590d
      https://github.com/fluid-project/infusion/commit/7a8827a0df4c983138bb5026727797450ec1590d
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.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/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-4686: renamed defaultModel into initialModel.


  Commit: 62537d4b7a9b2c24a163992d064fb1628cbe9634
      https://github.com/fluid-project/infusion/commit/62537d4b7a9b2c24a163992d064fb1628cbe9634
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

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

  Log Message:
  -----------
  FLUID-4686: fixed regression with the timing of the store set.


  Commit: 7e928f6e8984ed60974ce659f0e3e849c8bf7ed6
      https://github.com/fluid-project/infusion/commit/7e928f6e8984ed60974ce659f0e3e849c8bf7ed6
  Author: Yura Zenevich <yura.zenevich at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  FLUID-4686: fixed regression, store is updated on every modelChanged UIO event.


  Commit: ef823a4b799854aa84188579f4c7b2164a84b1b4
      https://github.com/fluid-project/infusion/commit/ef823a4b799854aa84188579f4c7b2164a84b1b4
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M 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/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    M src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/js/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M 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
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  Merge remote-tracking branch 'yzen/FLUID-4686'

* yzen/FLUID-4686:
  FLUID-4686: fixed regression, store is updated on every modelChanged UIO event.
  FLUID-4686: fixed regression with the timing of the store set.
  FLUID-4686: renamed defaultModel into initialModel.
  FLUID-4686: renamed defaultActions->starterActions, defaultSettingsPanels->starterSettingsPanels, defaultModel.outOfTheBox->defaultModel.starter, defaultTemplateLoader->starterTemplateLoader
  FLUID-4686: Default model is now an empty grade.
  FLUID-4686: addressed @amb26 comment regarding default model filtering.
  FLUID-4686: Fixed integration demos.
  FLUID-4686: fixed uiOptionsDemo.js
  FLUID-4686: Cleaned up models for setting panels.
  FLUID-4686: passing tests and fixed preview/fullpage manual tests.
  FLUID-4686: fixed manual with preview test. TODO: need to fix the full/no preview uioptions to not update dynamically.
  FLUID-4686: fixed uiOptions full no preview manual test.
  FLUID-4686: All tests are now passing.
  FLUID-4686: working page enhancer tests.
  FLUID-4686: working uioptions tests.
  FLUID-4686: Working enactor tests. Soon to be working ui enhancer.
  FLUID-4686: passing panel tests.
  FLUID-4686: initial changes to uiOptions store with tests passing. Some uioptions tests still fail.


Compare: https://github.com/fluid-project/infusion/compare/377269139b5e...ef823a4b7998

More information about the Commits mailing list