[Commits] [fluid-project/infusion] e1ac85: FLUID-5010: Replaced more manual options mapping c...

GitHub noreply at github.com
Thu Jun 27 15:57:53 EDT 2013 

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: e1ac859f940078a0ea182bd1da1a32320a21f9b1
      https://github.com/fluid-project/infusion/commit/e1ac859f940078a0ea182bd1da1a32320a21f9b1
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5010: Replaced more manual options mapping code with IoCSS. Ran into an issue with passing options assigned in preInit or finalInit and created FLUID-5025 for that. Hopefully after it's addressed, the remaining two other manual mappings can be replaced.


  Commit: cd6086dd204bf1a59b5da5e407c9bee97b6c098c
      https://github.com/fluid-project/infusion/commit/cd6086dd204bf1a59b5da5e407c9bee97b6c098c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
    M src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5010: Fixed the broken UIO full page demos and created a test case to demonstrate the cause of not being able to replace the manual mapping code in FullPreviewUIOptions.js with IoCSS.


  Commit: b7e7da4f7948526878d17f6c4e16dd7906dabd33
      https://github.com/fluid-project/infusion/commit/b7e7da4f7948526878d17f6c4e16dd7906dabd33
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

  Log Message:
  -----------
  FLUID-5010: An experiment to re-write uiOptions mapping with IoCSS. It currently breaks the UIO demos.


  Commit: e2a9b5074ddf0d514c42122f13348b31cb9687fa
      https://github.com/fluid-project/infusion/commit/e2a9b5074ddf0d514c42122f13348b31cb9687fa
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

  Log Message:
  -----------
  FLUID-5010: Implemented an additive grade for loader to accommodate the customized loader annotations and options.


  Commit: 5833f77b4ca30f4b65cdcc3d79b8c3800bbb9c6a
      https://github.com/fluid-project/infusion/commit/5833f77b4ca30f4b65cdcc3d79b8c3800bbb9c6a
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-01 (Sat, 01 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/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/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
    A src/webapp/tests/component-tests/uiOptions/js/I18nTests.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/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-5010

Conflicts:
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: d68fd08a2c4dd8f5a4f6f0a3306f776b8d6eda31
      https://github.com/fluid-project/infusion/commit/d68fd08a2c4dd8f5a4f6f0a3306f776b8d6eda31
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5010: Discovered and created test cases for a couple of framework issues at defining an additive grade for loader component.


  Commit: d850647f7086f71c728e002018c6bd46bdab4380
      https://github.com/fluid-project/infusion/commit/d850647f7086f71c728e002018c6bd46bdab4380
  Author: Cindy Qi Li <cli at ocad.ca>
  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-5010


  Commit: 124cff3435f00a87ce272006a0c202afd0721a69
      https://github.com/fluid-project/infusion/commit/124cff3435f00a87ce272006a0c202afd0721a69
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/uiOptionsDependencies.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-5010


  Commit: b9c339e57cb323cedc028a6c0e6900f400615f43
      https://github.com/fluid-project/infusion/commit/b9c339e57cb323cedc028a6c0e6900f400615f43
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    A src/webapp/lib/fonts/fontsDependencies.json

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


  Commit: b87911d4a388ee1245bc14759f17b39c1fd13234
      https://github.com/fluid-project/infusion/commit/b87911d4a388ee1245bc14759f17b39c1fd13234
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  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/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5010: Replaced more manual options mapping in UIOptions.js and FullPreviewUIO.js with IoCSS and created a jira and test cases to demonstrate a framework issue that the IoCSS source fetched from the static environment is not resolved and passed down correctly.


  Commit: 7930506013a216d40c168e87fda6772214d66761
      https://github.com/fluid-project/infusion/commit/7930506013a216d40c168e87fda6772214d66761
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'antranig/FLUID-5030' into FLUID-5010

Conflicts:
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: 674b93911779da040be38568a191f4832050a54f
      https://github.com/fluid-project/infusion/commit/674b93911779da040be38568a191f4832050a54f
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-5010: Experiment with the pull request for FLUID-5032 that deals with the forward reference in grade hierarchy.


  Commit: 4461294185f203e9433da7a6400fb2ec80208c42
      https://github.com/fluid-project/infusion/commit/4461294185f203e9433da7a6400fb2ec80208c42
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'antranig/FLUID-5036' into FLUID-5010


  Commit: 5db490d5d6722bbee60c33a929407983f93a5eb4
      https://github.com/fluid-project/infusion/commit/5db490d5d6722bbee60c33a929407983f93a5eb4
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.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-5010: Worked with the pull request for FLUID-5036 to factor the last manual mapping for enhancer options with IoCSS. The only remaining issue is the createOnEvent of uiOptions defined in the additive grade "customizedLoader" is not taking effect.


  Commit: e61cd2f33aeb7132afe29591162efcd9a9bc0457
      https://github.com/fluid-project/infusion/commit/e61cd2f33aeb7132afe29591162efcd9a9bc0457
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    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/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/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/css/uiOptions.css
    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 branch 'master' into FLUID-5010

Conflicts:
	src/webapp/components/uiOptions/js/FatPanelUIOptions.js
	src/webapp/components/uiOptions/js/UIOptions.js
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: 1c4f8796eaa5f4b434b8e72a9904dc0e78a9d030
      https://github.com/fluid-project/infusion/commit/1c4f8796eaa5f4b434b8e72a9904dc0e78a9d030
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

  Log Message:
  -----------
  FLUID-5010: Fixed the grade hierarchy issue with fatPanelLoader and generic loader for all UIO instances.


  Commit: bdac8976f52e3fcc9bba0cbc6ea4496b73fafab7
      https://github.com/fluid-project/infusion/commit/bdac8976f52e3fcc9bba0cbc6ea4496b73fafab7
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/css/FullUIOptions.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    R src/webapp/components/uiOptions/images/bw/uio_icon_cancel_hc_13x13.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_save_hc_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_cancel_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_save_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_cancel_default_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_save_default_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_cancel_hci_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_save_hci_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_cancel_yellowBlack_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_save_yellowBlack_13x13.png
    M src/webapp/components/uiOptions/js/UIOptions.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

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


  Commit: dfb793a9fd425563c1f3bd575337a0f48f446506
      https://github.com/fluid-project/infusion/commit/dfb793a9fd425563c1f3bd575337a0f48f446506
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-20 (Thu, 20 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/html/SomeKindOfNews.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-5010: Renamed "initialModel" to "rootModel" as well as fixing a couple of minor issues with manual tests.


  Commit: 93ed96176ddd9a43522bf8db2c2d372d8ba7f5bd
      https://github.com/fluid-project/infusion/commit/93ed96176ddd9a43522bf8db2c2d372d8ba7f5bd
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

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

Conflicts:
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js


  Commit: f6804ea6d7f63337b2ce21b365f11b11eea4d192
      https://github.com/fluid-project/infusion/commit/f6804ea6d7f63337b2ce21b365f11b11eea4d192
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

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

  Log Message:
  -----------
  FLUID-5010: Fixed a bug in the fat panel that causes the failure at preference reset.


  Commit: e189d891b4dcbb7fd5c2b877115942abc5bf4020
      https://github.com/fluid-project/infusion/commit/e189d891b4dcbb7fd5c2b877115942abc5bf4020
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M src/webapp/components/uiOptions/js/UIOptions.js
    R src/webapp/integration-demos/uportal/css/portal.css
    R src/webapp/integration-demos/uportal/html/portal.html
    R src/webapp/integration-demos/uportal/images/application.png
    R src/webapp/integration-demos/uportal/images/application_add.png
    R src/webapp/integration-demos/uportal/images/application_edit.png
    R src/webapp/integration-demos/uportal/images/color_swatch.png
    R src/webapp/integration-demos/uportal/images/cross.png
    R src/webapp/integration-demos/uportal/images/headerbar.png
    R src/webapp/integration-demos/uportal/images/help.png
    R src/webapp/integration-demos/uportal/images/house.png
    R src/webapp/integration-demos/uportal/images/layout_content.png
    R src/webapp/integration-demos/uportal/images/locked.png
    R src/webapp/integration-demos/uportal/images/map.png
    R src/webapp/integration-demos/uportal/images/page_column_back.png
    R src/webapp/integration-demos/uportal/images/portal_logo.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_bottomright.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topleft.png
    R src/webapp/integration-demos/uportal/images/portlet_corner_topright.png
    R src/webapp/integration-demos/uportal/images/tab1.jpg
    R src/webapp/integration-demos/uportal/images/tab_add.png
    R src/webapp/integration-demos/uportal/images/top_light_fade.png
    R src/webapp/integration-demos/uportal/images/user.png
    R src/webapp/integration-demos/uportal/images/weather.png
    R src/webapp/integration-demos/uportal/images/zoom.png
    R src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/tests/component-tests/reorderer/html/NestedReorderer-test.html
    A src/webapp/tests/component-tests/reorderer/js/NestedReorderTests.js

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

Conflicts:
	src/webapp/components/uiOptions/js/UIOptions.js


  Commit: 46a0b542dc278ef8b3f03883f5f3deccb4b884ee
      https://github.com/fluid-project/infusion/commit/46a0b542dc278ef8b3f03883f5f3deccb4b884ee
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

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

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


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

  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/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:
  -----------
  Merge remote-tracking branch 'cindyli/FLUID-5010'

* cindyli/FLUID-5010:
  FLUID-5010: Fixed a bug in the fat panel that causes the failure at preference reset.
  FLUID-5010: Renamed "initialModel" to "rootModel" as well as fixing a couple of minor issues with manual tests.
  FLUID-5010: Fixed the grade hierarchy issue with fatPanelLoader and generic loader for all UIO instances.
  FLUID-5010: Worked with the pull request for FLUID-5036 to factor the last manual mapping for enhancer options with IoCSS. The only remaining issue is the createOnEvent of uiOptions defined in the additive grade "customizedLoader" is not taking effect.
  FLUID-5010: Experiment with the pull request for FLUID-5032 that deals with the forward reference in grade hierarchy.
  FLUID-5010: Replaced more manual options mapping in UIOptions.js and FullPreviewUIO.js with IoCSS and created a jira and test cases to demonstrate a framework issue that the IoCSS source fetched from the static environment is not resolved and passed down correctly.
  FLUID-5010: Discovered and created test cases for a couple of framework issues at defining an additive grade for loader component.
  FLUID-5010: Implemented an additive grade for loader to accommodate the customized loader annotations and options.
  FLUID-5010: An experiment to re-write uiOptions mapping with IoCSS. It currently breaks the UIO demos.
  FLUID-5010: Fixed the broken UIO full page demos and created a test case to demonstrate the cause of not being able to replace the manual mapping code in FullPreviewUIOptions.js with IoCSS.
  FLUID-5010: Replaced more manual options mapping code with IoCSS. Ran into an issue with passing options assigned in preInit or finalInit and created FLUID-5025 for that. Hopefully after it's addressed, the remaining two other manual mappings can be replaced.


Compare: https://github.com/fluid-project/infusion/compare/3273c52e9473...4c11857c2018

More information about the Commits mailing list