[Commits] [fluid-project/infusion] 8cbc43: FLUID-4353: Resolved conflict from merging in proj...

noreply at github.com noreply at github.com
Fri Aug 5 20:01:54 UTC 2011


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

  Commit: 8cbc4376a21e1ff73c14bc29aebfb5cedd9ce027
      https://github.com/fluid-project/infusion/commit/8cbc4376a21e1ff73c14bc29aebfb5cedd9ce027
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

  Changed paths:
    M build-scripts/build-README.txt
  A src/webapp/components/uiOptions/html/FullNoPreviewUIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js

  Log Message:
  -----------
  FLUID-4353: Resolved conflict from merging in project repo master.


  Commit: b3d5c570daf1172d65e159f00e5bc7990e14ddd9
      https://github.com/fluid-project/infusion/commit/b3d5c570daf1172d65e159f00e5bc7990e14ddd9
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

  Changed paths:
    M src/webapp/components/uiOptions/html/FullNoPreviewUIOptions-test.html
  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
  A src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame-test.html
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-4353: Properly merge the user's options and component defaults options with the combination of options munging. Added more unit and integration tests for options munging.


  Commit: de87e4608fcff9a03c568816976ce4234b03db0a
      https://github.com/fluid-project/infusion/commit/de87e4608fcff9a03c568816976ce4234b03db0a
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 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
  A src/webapp/components/uiOptions/js/URLUtilities.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/html/URLUtilities-test.html
  A src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.js

  Log Message:
  -----------
  Merge remote branch 'antranig/FLUID-4353' into FLUID-4353


  Commit: 42edb4c40cdf02f0172f6962e2d304a5f03f441c
      https://github.com/fluid-project/infusion/commit/42edb4c40cdf02f0172f6962e2d304a5f03f441c
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

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

  Log Message:
  -----------
  FLUID-4353: Merged in Antranig's url rewiring on fat panel new option "relativePrefix"


  Commit: 3766dc8bdde7cbc5ff27779f4d779d540b10b1c9
      https://github.com/fluid-project/infusion/commit/3766dc8bdde7cbc5ff27779f4d779d540b10b1c9
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

  Changed paths:
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  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
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html

  Log Message:
  -----------
  FLUID-4353: Code change on fat panel, demos and tests to collaborate with Antranig's prefix url rewiring.


  Commit: 15251dc5392a128837909f0f50694b7dd3b45396
      https://github.com/fluid-project/infusion/commit/15251dc5392a128837909f0f50694b7dd3b45396
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

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

  Log Message:
  -----------
  FLUID-4353: Sorted the config by the length of the destionations to resolve the potential conflict resulted from the supply of both option and its child option. A couple of code clean-up as well.


  Commit: 9d4fd5b6ae578484525248b4c2af6673b73528b5
      https://github.com/fluid-project/infusion/commit/9d4fd5b6ae578484525248b4c2af6673b73528b5
  Author: Cindy Li <cli at ocad.ca>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

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

  Log Message:
  -----------
  FLUID-4353: Accommodated the deep access over the fat panel bridge onto the other world.


  Commit: d06946a552c869ef6078d7c28af4fbc0c734871e
      https://github.com/fluid-project/infusion/commit/d06946a552c869ef6078d7c28af4fbc0c734871e
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2011-08-05 (Fri, 05 Aug 2011)

  Changed paths:
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
  A src/webapp/components/uiOptions/html/FullNoPreviewUIOptions-test.html
  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/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  A src/webapp/components/uiOptions/js/URLUtilities.js
  M src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js
  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/integration-demos/uportal/js/portal.js
  M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame-test.html
  A src/webapp/tests/component-tests/uiOptions/html/URLUtilities-test.html
  M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
  A src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
  M src/webapp/tests/manual-tests/html/SomeKindOfNews.html
  M src/webapp/tests/manual-tests/js/someKindOfNews.js

  Log Message:
  -----------
  FLUID-4353: Resolved merge conflict in test file

Merge branch 'cindyli/FLUID-4353'

* cindyli/FLUID-4353:
  FLUID-4353: Accommodated the deep access over the fat panel bridge onto the other world.
  FLUID-4353: Sorted the config by the length of the destionations to resolve the potential conflict resulted from the supply of both option and its child option. A couple of code clean-up as well.
  FLUID-4353: Code change on fat panel, demos and tests to collaborate with Antranig's prefix url rewiring.
  FLUID-4353: Merged in Antranig's url rewiring on fat panel new option "relativePrefix"
  FLUID-4353: Properly merge the user's options and component defaults options with the combination of options munging. Added more unit and integration tests for options munging.
  FLUID-4353: Resolved conflict from merging in project repo master.
  FLUID-4353: Working version of relative prefix computation - however, this is not yet wired up to go over the "bridge" since this branch has non-standard mapping code in bridge.finalInit - needs to be merged up with improved version of branch from cindyli
  FLUID-4353: Partial solution to iframe relative URL issue involving the assumption that iframe markup and component templates are in the same directory.
  FLUID-4353: Simplified the fat panel prefix path.
  FLUID-4353: Fixed the issue that the settings on fat panel ui options are not properly initialized with the defaultSiteSettings. The cause is the settingStore chile component defined on fluid.uiOptions, which should only play a placeholder role rather than creating a new settingStore when it is not supplied from the caller js.
  FLUID-4353: Removed demands blocks in the js files for 3 ui options view by making use of options munging. Moved the configuration (min/max) of the text slider into textControls component. Shortened some of components' names. In the middle of implementing defaultSiteSetting configuration as a top level option, which has applied successfully onto full with and w/o preview, but not fat panel.
  FLUID-4353: Implemented options munging into fat panel.
  FLUID-4353: Completed mapOptions and integrated options munging into fat panel. The next issue to look at is how to configure templateLoader in fat panel as it is a part of a separate component FatPanelOtherWorldLoader which was instantiated by a direct call to invokeGlobalFunction() and the templateLoader is not kept afterwards.
  FLUID-4353: Implemented fluid.uiOptions.inline and handled the transformation of uiOptionsLoader.container. None of the ui options demos work at this stage due to the half-done implementation of uiOptionsTransform.
  FLUID-4353: Properly namespaced UIO components.
  FLUID-4353: A commit of a half-working refactored ui options and ui enhancer to improve the sub-components' configurability. More work still needs for fat panel.

Conflicts:
	src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js


Compare: https://github.com/fluid-project/infusion/compare/fdddc40...d06946a


More information about the Commits mailing list