[Commits] [fluid-project/infusion] 78b654: FLUID-5131: renamed to fluid.uiOptions.panel

GitHub noreply at github.com
Fri Oct 25 15:42:12 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 78b654910737753fa571760849384ef4f5588c7c
      https://github.com/fluid-project/infusion/commit/78b654910737753fa571760849384ef4f5588c7c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/AuxBuilder.js
    M src/components/uiOptions/js/Panels.js
    M src/components/uiOptions/js/StarterGrades.js
    M src/components/uiOptions/js/StarterSchemas.js
    M src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    M src/tests/component-tests/uiOptions/js/BuilderTests.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js
    M src/tests/component-tests/uiOptions/js/UIOptionsTests.js

  Log Message:
  -----------
  FLUID-5131: renamed to fluid.uiOptions.panel

Renamed fluid.uiOptions.panels to fluid.uiOptions.panel.


  Commit: ef63b8e24a8ae7d843ede897d7261cad145c7c31
      https://github.com/fluid-project/infusion/commit/ef63b8e24a8ae7d843ede897d7261cad145c7c31
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: added pref map to panel base grade


  Commit: 3e9bd7cf838e6fd676768b6de1f440b8b0178ff5
      https://github.com/fluid-project/infusion/commit/3e9bd7cf838e6fd676768b6de1f440b8b0178ff5
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/html/Panels-test.html
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: Started combinedPanel

Started implementing combinedPanel. Currently it will merge the preferenceMaps from the subcomponents and surface a modified version as it's own preferenceMap.


  Commit: b514124e4642b7746ea977e553aef77cabd41473
      https://github.com/fluid-project/infusion/commit/b514124e4642b7746ea977e553aef77cabd41473
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Changed paths:
    M src/components/inlineEdit/js/InlineEdit.js
    M src/components/pager/js/Pager.js
    M src/components/reorderer/js/ModuleLayout.js
    M src/components/reorderer/js/Reorderer.js
    M src/components/uiOptions/js/Enactors.js
    M src/components/uploader/js/FileQueue.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/tests/component-tests/uploader/js/FileQueueTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    A src/tests/manual-tests/html/performance-test-2.html
    M src/tests/manual-tests/html/performance-test.html
    A src/tests/manual-tests/js/performance-test-2.js
    M src/tests/manual-tests/js/performance-test.js

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


  Commit: 9c74051398398b1c978d39a0e0cb712e68b52afa
      https://github.com/fluid-project/infusion/commit/9c74051398398b1c978d39a0e0cb712e68b52afa
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M src/tests/test-core/testTests/js/TestingTests.js
    M src/tests/test-core/utils/js/IoCTestUtils.js

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


  Commit: c6a440185c1f5be70a456ccd2b9f8f0a94a7271d
      https://github.com/fluid-project/infusion/commit/c6a440185c1f5be70a456ccd2b9f8f0a94a7271d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: setting subpanel options with grade

Setting the subPanel options with a subPanel grade that is distributed to them. (this is currently hardcoded, as distributeOptions do not currently support expanders). The refreshView method, afterRender events, model relay rules, and renderOnInit options are all set this way.


  Commit: eaafc28e96d6a8d2c556e25c4b91304f630df341
      https://github.com/fluid-project/infusion/commit/eaafc28e96d6a8d2c556e25c4b91304f630df341
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: dynamic grade for distributeOptions

Using a dynamic grade to add in the assembled distributeOptions rules.


  Commit: ab00499e0a3967ff9c9bb1b948e752d199e0b732
      https://github.com/fluid-project/infusion/commit/ab00499e0a3967ff9c9bb1b948e752d199e0b732
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/demos/uiOptions/schemaDemo/html/uiOptions.html
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: Templates are combined.

Templates are combined into a single resourceText.


  Commit: 07ac546e61e3b4a2908bb685a54a68810f0cac6d
      https://github.com/fluid-project/infusion/commit/07ac546e61e3b4a2908bb685a54a68810f0cac6d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: surface subpanel selectors

Pulling up the rendering selectors from the subpanels to the combinedPanel. This is needed for the single pass rendering in the combinedPanel.


  Commit: 4d442b372163367714bcb52f267b17ee45f6f359
      https://github.com/fluid-project/infusion/commit/4d442b372163367714bcb52f267b17ee45f6f359
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: corrected prototree in unit test.


  Commit: 6bd430e79550f440749647635b7717c061f96813
      https://github.com/fluid-project/infusion/commit/6bd430e79550f440749647635b7717c061f96813
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/html/Panels-test.html
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: rebase simple uiBound prototree

First pass at protoTree rebasing; which will be needed before merging the prototrees. Currently only does a simple transformation of a protoTree's component ID to match the selector used in the parent.


  Commit: a6d9cf48e1ed393df4781182cb4a8c462103e27b
      https://github.com/fluid-project/infusion/commit/a6d9cf48e1ed393df4781182cb4a8c462103e27b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: refactored to handle nested structures

Refactored the rebasing to handle nested structures. Still only capable of simple transformations of the componentID.


  Commit: b651910c166bcb560b896a6262db5c759afff38b
      https://github.com/fluid-project/infusion/commit/b651910c166bcb560b896a6262db5c759afff38b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/html/Panels-test.html
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: renamed combinedPanel > compositePanel


  Commit: 5d69600ddf64041340fd5496731f5bf4b420b520
      https://github.com/fluid-project/infusion/commit/5d69600ddf64041340fd5496731f5bf4b420b520
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: added support for combined trees

Added support for generating a combined renderer tree. This makes use of the produceTree function. Still need to test that the actual rendering works.


  Commit: 6cdbbddeac16013434a51c859c13b46b611829ce
      https://github.com/fluid-project/infusion/commit/6cdbbddeac16013434a51c859c13b46b611829ce
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: cleanup and new tests

Slight cleanup of the produceTree code. Uncommented out some tests and fixed the renderer config so that they would pass again. Also added tests for the actual rendering, they are currently failing.


  Commit: c28ac7ee6452efb4f689f0956a57ab89116e651c
      https://github.com/fluid-project/infusion/commit/c28ac7ee6452efb4f689f0956a57ab89116e651c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: subPanel's created after parent render

Changed the subPanels to be created after the parent has been rendered. They are also initially created before the first rendering to source the information needed for the produceTree function.


  Commit: 2143387b937acad0a1ba4a779ecbbe08eed6c088
      https://github.com/fluid-project/infusion/commit/2143387b937acad0a1ba4a779ecbbe08eed6c088
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/tests/component-tests/uiOptions/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: corrected an issue with the prefMap

Fixed the options forwarding path in the combined preferencesMap


  Commit: fd7d915d8107c472ec65cc6755d23ce8f0cf9b47
      https://github.com/fluid-project/infusion/commit/fd7d915d8107c472ec65cc6755d23ce8f0cf9b47
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

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

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


  Commit: 18a385272b830b80f6a590ad2570e9995e8ae51b
      https://github.com/fluid-project/infusion/commit/18a385272b830b80f6a590ad2570e9995e8ae51b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M src/components/uiOptions/js/Panels.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js

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


  Commit: 80b02cfcb5f4e6d7b2a3c171f46d18d0c534af56
      https://github.com/fluid-project/infusion/commit/80b02cfcb5f4e6d7b2a3c171f46d18d0c534af56
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M .gitignore
    M build-scripts/build.properties
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    A src/components/slidingPanel/js/SlidingPanel.js
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/js/TextfieldSlider.js
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    R src/components/uiOptions/css/FatPanelUIOptions.css
    R src/components/uiOptions/css/FatPanelUIOptionsFrame.css
    R src/components/uiOptions/css/FullNoPreviewUIOptions.css
    R src/components/uiOptions/css/FullPreviewUIOptions.css
    R src/components/uiOptions/css/FullUIOptions.css
    R src/components/uiOptions/css/UIOptions.css
    R src/components/uiOptions/css/ie8.css
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    R src/components/uiOptions/html/FatPanelUIOptions.html
    R src/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/components/uiOptions/html/FullNoPreviewUIOptions.html
    R src/components/uiOptions/html/FullPreviewUIOptions.html
    R src/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/components/uiOptions/html/UIOptionsTemplate-layout.html
    R src/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/components/uiOptions/html/UIOptionsTemplate-textFont.html
    R src/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/components/uiOptions/images/default/fatpanelbg.png
    R src/components/uiOptions/js/AuxBuilder.js
    R src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/Enactors.js
    R src/components/uiOptions/js/FatPanelUIOptions.js
    R src/components/uiOptions/js/FullNoPreviewUIOptions.js
    R src/components/uiOptions/js/FullPreviewUIOptions.js
    R src/components/uiOptions/js/ModelRelay.js
    R src/components/uiOptions/js/Panels.js
    R src/components/uiOptions/js/PrimaryBuilder.js
    R src/components/uiOptions/js/SlidingPanel.js
    R src/components/uiOptions/js/StarterGrades.js
    R src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/Store.js
    R src/components/uiOptions/js/TextfieldSlider.js
    R src/components/uiOptions/js/UIEnhancer.js
    R src/components/uiOptions/js/UIOptions.js
    R src/components/uiOptions/js/URLUtilities.js
    R src/components/uiOptions/messages/contrast.json
    R src/components/uiOptions/messages/lineSpace.json
    R src/components/uiOptions/messages/links.json
    R src/components/uiOptions/messages/tableOfContents.json
    R src/components/uiOptions/messages/textFont.json
    R src/components/uiOptions/messages/textSize.json
    R src/components/uiOptions/messages/uiOptions.json
    R src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    A src/demos/portal/images/prefsEditor.png
    R src/demos/portal/images/uiOptions.png
    M src/demos/portal/js/demoAssets.js
    A src/demos/prefsEditor/css/ie8.css
    A src/demos/prefsEditor/css/prefsEditor.css
    A src/demos/prefsEditor/demo.html
    A src/demos/prefsEditor/fonts/Lato-Black.ttf
    A src/demos/prefsEditor/fonts/Lato-Light.ttf
    A src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    A src/demos/prefsEditor/fonts/Lato-Regular.ttf
    A src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    A src/demos/prefsEditor/html/prefsEditor.html
    A src/demos/prefsEditor/images/arrow_left.png
    A src/demos/prefsEditor/images/arrow_right.png
    A src/demos/prefsEditor/images/background_texture.png
    A src/demos/prefsEditor/images/photo_apple.png
    A src/demos/prefsEditor/images/photo_orange.png
    A src/demos/prefsEditor/js/prefsEditorDemo.js
    R src/demos/uiOptions/fonts/Lato-Black.ttf
    R src/demos/uiOptions/fonts/Lato-Light.ttf
    R src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    R src/demos/uiOptions/fonts/Lato-Regular.ttf
    R src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    R src/demos/uiOptions/gradesDemo/css/uiOptions.css
    R src/demos/uiOptions/gradesDemo/demo.html
    R src/demos/uiOptions/gradesDemo/html/uiOptions.html
    R src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    R src/demos/uiOptions/images/arrow_left.png
    R src/demos/uiOptions/images/arrow_right.png
    R src/demos/uiOptions/images/background_texture.png
    R src/demos/uiOptions/images/photo_apple.png
    R src/demos/uiOptions/images/photo_orange.png
    R src/demos/uiOptions/schemaDemo/css/uiOptions.css
    R src/demos/uiOptions/schemaDemo/demo.html
    R src/demos/uiOptions/schemaDemo/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    A src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    A src/framework/preferences/css/FullPrefsEditor.css
    A src/framework/preferences/css/FullPreviewPrefsEditor.css
    A src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    A src/framework/preferences/css/ie8.css
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    A src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    A src/framework/preferences/html/FullPreviewPrefsEditor.html
    A src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    A src/framework/preferences/html/PrefsEditorTemplate-layout.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/framework/preferences/images/default/separatedpanelbg.png
    A src/framework/preferences/js/AuxBuilder.js
    A src/framework/preferences/js/Builder.js
    A src/framework/preferences/js/Enactors.js
    A src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    A src/framework/preferences/js/FullPreviewPrefsEditor.js
    A src/framework/preferences/js/ModelRelay.js
    A src/framework/preferences/js/Panels.js
    A src/framework/preferences/js/PrefsEditor.js
    A src/framework/preferences/js/PrimaryBuilder.js
    A src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    A src/framework/preferences/js/StarterGrades.js
    A src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/js/Store.js
    A src/framework/preferences/js/UIEnhancer.js
    A src/framework/preferences/js/URLUtilities.js
    A src/framework/preferences/messages/contrast.json
    A src/framework/preferences/messages/lineSpace.json
    A src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/prefsEditor.json
    A src/framework/preferences/messages/tableOfContents.json
    A src/framework/preferences/messages/textFont.json
    A src/framework/preferences/messages/textSize.json
    A src/framework/preferences/preferencesDependencies.json
    M src/tests/all-tests.html
    A src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    A src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    A src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    A src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/css/test-theme.css
    R src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    R src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    R src/tests/component-tests/uiOptions/html/Enactors-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/ModelRelay-test.html
    R src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/Panels-test.html
    R src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    R src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    R src/tests/component-tests/uiOptions/html/Store-test.html
    R src/tests/component-tests/uiOptions/html/TestPreviewTemplate.html
    R src/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/tests/component-tests/uiOptions/html/URLUtilities-test.html
    R src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    R src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    R src/tests/component-tests/uiOptions/js/EnactorsTests.js
    R src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    R src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    R src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    R src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    R src/tests/component-tests/uiOptions/js/StoreTests.js
    R src/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    A src/tests/framework-tests/preferences/all-tests.html
    A src/tests/framework-tests/preferences/css/test-theme.css
    A src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    A src/tests/framework-tests/preferences/html/Builder-test.html
    A src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    A src/tests/framework-tests/preferences/html/Enactors-test.html
    A src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/ModelRelay-test.html
    A src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    A src/tests/framework-tests/preferences/html/Panels-test.html
    A src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/tests/framework-tests/preferences/html/Store-test.html
    A src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    A src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    A src/tests/framework-tests/preferences/html/URLUtilities-test.html
    A src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    A src/tests/framework-tests/preferences/js/BuilderTests.js
    A src/tests/framework-tests/preferences/js/CSSGeneratorTests.js
    A src/tests/framework-tests/preferences/js/EnactorsTests.js
    A src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    A src/tests/framework-tests/preferences/js/ModelRelayTests.js
    A src/tests/framework-tests/preferences/js/PageEnhancerTests.js
    A src/tests/framework-tests/preferences/js/PanelsTests.js
    A src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js
    A src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/StoreTests.js
    A src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    A src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    M src/tests/manual-tests/html/SomeKindOfNews.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanel.js
    M src/tests/manual-tests/js/someKindOfNews.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js

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

Conflicts:
	src/components/uiOptions/js/StarterSchemas.js
	src/demos/prefsEditor/html/prefsEditor.html
	src/framework/preferences/js/AuxBuilder.js
	src/framework/preferences/js/Panels.js
	src/framework/preferences/js/StarterGrades.js
	src/tests/framework-tests/preferences/js/AuxBuilderTests.js
	src/tests/framework-tests/preferences/js/BuilderTests.js
	src/tests/framework-tests/preferences/js/PanelsTests.js
	src/tests/framework-tests/preferences/js/PrefsEditorTests.js


  Commit: e7fa361ee5a090fa30f94004a970fe61c4fb3cc9
      https://github.com/fluid-project/infusion/commit/e7fa361ee5a090fa30f94004a970fe61c4fb3cc9
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: fix up after merge

Restored some lost code after the merge, also renamed uiOptions to prefs in the new code.


  Commit: da06deeb5a52a7ab14c5df857837666f98614f2a
      https://github.com/fluid-project/infusion/commit/da06deeb5a52a7ab14c5df857837666f98614f2a
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: allow rendering in the composite panel

Providing a means for the composite panel to contribute its own rendering, and not just handling that of its subPanel's.


  Commit: f8630a2be75baf625b23af25663cc275088d54ee
      https://github.com/fluid-project/infusion/commit/f8630a2be75baf625b23af25663cc275088d54ee
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: refactored produce tree

Modified the composite panel to override the produceTree invoker instead of the function in the options. This allows an integrator to use the produceTree function in the options still, or a protoTree. The produceTree will need to be fully expanded though. Which is set in the defaults for the compositePanel. Also did some minor refactoring to simplify the expandProtoTree function.


  Commit: 8ae75e380060b31cd47c11053d88dbd79940fd4c
      https://github.com/fluid-project/infusion/commit/8ae75e380060b31cd47c11053d88dbd79940fd4c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: refactored to all expanded trees

Refactored to allow the subPanels to have provide their own fully expanded trees.


  Commit: 725b6750942a7317f0770e67f747ad5c71096a42
      https://github.com/fluid-project/infusion/commit/725b6750942a7317f0770e67f747ad5c71096a42
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: simplified tree rebasing

Removed the model transformations in favour of a more direct and simple approach using straight functions.


  Commit: f0db531e2d5eca1f73f1640276cdcfdfb583d157
      https://github.com/fluid-project/infusion/commit/f0db531e2d5eca1f73f1640276cdcfdfb583d157
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js

  Log Message:
  -----------
  FLUID-5131: moved string replacement to a function


  Commit: 38dbc3615b6b5f0c0685baa69d996e1cd5a8d48c
      https://github.com/fluid-project/infusion/commit/38dbc3615b6b5f0c0685baa69d996e1cd5a8d48c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    R src/demos/portal/images/prefsEditor.png
    A src/demos/portal/images/uiOptions.png
    R src/demos/prefsEditor/css/ie8.css
    R src/demos/prefsEditor/css/prefsEditor.css
    R src/demos/prefsEditor/demo.html
    R src/demos/prefsEditor/fonts/Lato-Black.ttf
    R src/demos/prefsEditor/fonts/Lato-Light.ttf
    R src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    R src/demos/prefsEditor/fonts/Lato-Regular.ttf
    R src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    R src/demos/prefsEditor/html/prefsEditor.html
    R src/demos/prefsEditor/images/arrow_left.png
    R src/demos/prefsEditor/images/arrow_right.png
    R src/demos/prefsEditor/images/background_texture.png
    R src/demos/prefsEditor/images/photo_apple.png
    R src/demos/prefsEditor/images/photo_orange.png
    R src/demos/prefsEditor/js/prefsEditorDemo.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    A src/demos/uiOptions/fonts/Lato-Black.ttf
    A src/demos/uiOptions/fonts/Lato-Light.ttf
    A src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    A src/demos/uiOptions/fonts/Lato-Regular.ttf
    A src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    A src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/images/arrow_left.png
    A src/demos/uiOptions/images/arrow_right.png
    A src/demos/uiOptions/images/background_texture.png
    A src/demos/uiOptions/images/photo_apple.png
    A src/demos/uiOptions/images/photo_orange.png
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js

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

Conflicts:
	src/framework/preferences/js/Panels.js
	src/framework/preferences/js/StarterGrades.js


  Commit: 886dfb0565e7ab53c62bee0fbc6ce519f7999812
      https://github.com/fluid-project/infusion/commit/886dfb0565e7ab53c62bee0fbc6ce519f7999812
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Updated the aux builder to parse the schema for composite panels. Need another unit test to make sure the parsing on the full schema still works fine.


  Commit: c604c4e943ecd9c4859ab35cd1448f2cfa26826e
      https://github.com/fluid-project/infusion/commit/c604c4e943ecd9c4859ab35cd1448f2cfa26826e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M build-scripts/build.properties
    A src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    R src/demos/portal/images/prefsEditor.png
    A src/demos/portal/images/uiOptions.png
    R src/demos/prefsEditor/css/ie8.css
    R src/demos/prefsEditor/css/prefsEditor.css
    R src/demos/prefsEditor/demo.html
    R src/demos/prefsEditor/fonts/Lato-Black.ttf
    R src/demos/prefsEditor/fonts/Lato-Light.ttf
    R src/demos/prefsEditor/fonts/Lato-LightItalic.ttf
    R src/demos/prefsEditor/fonts/Lato-Regular.ttf
    R src/demos/prefsEditor/fonts/LoveYaLikeASister.ttf
    R src/demos/prefsEditor/html/prefsEditor.html
    R src/demos/prefsEditor/images/arrow_left.png
    R src/demos/prefsEditor/images/arrow_right.png
    R src/demos/prefsEditor/images/background_texture.png
    R src/demos/prefsEditor/images/photo_apple.png
    R src/demos/prefsEditor/images/photo_orange.png
    R src/demos/prefsEditor/js/prefsEditorDemo.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    A src/demos/uiOptions/fonts/Lato-Black.ttf
    A src/demos/uiOptions/fonts/Lato-Light.ttf
    A src/demos/uiOptions/fonts/Lato-LightItalic.ttf
    A src/demos/uiOptions/fonts/Lato-Regular.ttf
    A src/demos/uiOptions/fonts/LoveYaLikeASister.ttf
    A src/demos/uiOptions/html/uiOptions.html
    A src/demos/uiOptions/images/arrow_left.png
    A src/demos/uiOptions/images/arrow_right.png
    A src/demos/uiOptions/images/background_texture.png
    A src/demos/uiOptions/images/photo_apple.png
    A src/demos/uiOptions/images/photo_orange.png
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorPreview.html
    M src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5131' into FLUID-5131

Conflicts:
	src/tests/framework-tests/preferences/js/AuxBuilderTests.js


  Commit: 82bb7168abc9d88f0c95f649ec66d0b6b74cdcb0
      https://github.com/fluid-project/infusion/commit/82bb7168abc9d88f0c95f649ec66d0b6b74cdcb0
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Added the test case to make sure the aux builder handles a full aux schema containing composite panels correctly.


  Commit: 131cb7e0c5773984eac9fe25dc6b6983657fa84f
      https://github.com/fluid-project/infusion/commit/131cb7e0c5773984eac9fe25dc6b6983657fa84f
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js

  Log Message:
  -----------
  FLUID-5170: Throws an error if the primary schema for a panel or a enactor that is included in the aux schema is not defined.


  Commit: ff755155399db55593f447a21eee57960f3ad93b
      https://github.com/fluid-project/infusion/commit/ff755155399db55593f447a21eee57960f3ad93b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Builder.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js

  Log Message:
  -----------
  FLUID-5181: The pref editor that's built from the aux schema supports top level options for template and message prefixes.


  Commit: 785fcc9c62849beac0f9f498f837b81b84c0de2c
      https://github.com/fluid-project/infusion/commit/785fcc9c62849beac0f9f498f837b81b84c0de2c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js

  Log Message:
  -----------
  FLUID-5182: Created onReady event for, 1) builder-constructed prefs editor; 2) full with/without preview components. Also distribute these options, store type and options, enhancer type and options, for builder-constructed prefs editor.


  Commit: 5417fc4cbf70c47777d46e4af33f23095ee0f5cd
      https://github.com/fluid-project/infusion/commit/5417fc4cbf70c47777d46e4af33f23095ee0f5cd
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5187: The aux builder adds container option to constructed enactors that are view or renderer components.


  Commit: 16065ae9abc37d2ae5bd2e5c13f46168dad2007c
      https://github.com/fluid-project/infusion/commit/16065ae9abc37d2ae5bd2e5c13f46168dad2007c
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: refactored composite panel

Removed preferenceMap merging, as this is needed by the auxBuilder. Fixed an issue where repeatingSelectors and valuebinding to paths were not handled.


  Commit: 5ef005eeb5b6025a2255780180adb666ebadd3ae
      https://github.com/fluid-project/infusion/commit/5ef005eeb5b6025a2255780180adb666ebadd3ae
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5131' into FLUID-5131


  Commit: ba6e477e86d1134dd78325a1323d82d488a0fbfc
      https://github.com/fluid-project/infusion/commit/ba6e477e86d1134dd78325a1323d82d488a0fbfc
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    A src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/prefsEditorTemplate-inputsLarger.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/messages/emphasizeLinks.json
    A src/framework/preferences/messages/inputsLarger.json
    M src/framework/preferences/messages/links.json
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Make use of the implementation of composite panel to re-write linksControls panel. In this commit, an error occurs at instantiating a sub panel of the composite linksControls.


  Commit: 9837599556879d68188d459ef257b01bdc13d36f
      https://github.com/fluid-project/infusion/commit/9837599556879d68188d459ef257b01bdc13d36f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/tests/framework-tests/preferences/html/Panels-test.html

  Log Message:
  -----------
  FLUID-5131: Fixed issue with subpanel init

When supPanels were being initialized onCreate, their containers had yet to be rendered into the markup. This caused errors to occur. To prevent this, the template from the composite panel is appended to the DOM before subPanel initialization.


  Commit: 53c0d95e707e0447a5f93be229606bf0e9d045c4
      https://github.com/fluid-project/infusion/commit/53c0d95e707e0447a5f93be229606bf0e9d045c4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: in progress commmit

Added a couple of tests for the emphasizeLinks and inputsLarger panels. Started to update the starterGrades for the composite panel, but haven't yet finished.


  Commit: 4f5bea925724cdcf473014e18784bdcfbaae7c81
      https://github.com/fluid-project/infusion/commit/4f5bea925724cdcf473014e18784bdcfbaae7c81
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/StarterGrades.js

  Log Message:
  -----------
  FLUID-5131: Fixed the starter panel grade to make use of composite panel for fluid.prefs.panel.linksControls.


  Commit: 0c342a5022cf9f610eaed89c15d59a899822c4f4
      https://github.com/fluid-project/infusion/commit/0c342a5022cf9f610eaed89c15d59a899822c4f4
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Fixed the aux builder unit test to demonstrate one panel for multiple prefs without using fluid.prefs.panel.linksControls component that has been converted to a composite panel.


  Commit: a6da5594bb54640554c58d28b56a1bb73991dcc9
      https://github.com/fluid-project/infusion/commit/a6da5594bb54640554c58d28b56a1bb73991dcc9
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: In progress with fixing prefs framework -> panels unit tests.


  Commit: 6c6a954393956ec169e11ab6cff0ed01dc8e2d42
      https://github.com/fluid-project/infusion/commit/6c6a954393956ec169e11ab6cff0ed01dc8e2d42
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    R src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/js/UIOptions.js
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/uiOptions/html/uiOptions.html

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


  Commit: 34fdd50fa3fa0859475e4bb3292e51723e0888b1
      https://github.com/fluid-project/infusion/commit/34fdd50fa3fa0859475e4bb3292e51723e0888b1
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    R src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    R src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/linksControls.json
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5131: fixed unit tests and renaming

Fixed the linksControls unit tests in the panels tests.
Renamed links related resources to linksControls to match the component.


  Commit: 55161ab40a9a707a925c0517cc27d1d23befcdbe
      https://github.com/fluid-project/infusion/commit/55161ab40a9a707a925c0517cc27d1d23befcdbe
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Modified the aux builder to allow users' own configuration defined in the aux schema being passed to constructed composite panels.


  Commit: 5abfe432513836956b500a8cddd41a32141a4598
      https://github.com/fluid-project/infusion/commit/5abfe432513836956b500a8cddd41a32141a4598
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    R src/components/uiOptions/UIOptions.js
    A src/components/uiOptions/js/UIOptions.js
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/uiOptions/html/uiOptions.html
    R src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    R src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/linksControls.json
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'justin/FLUID-5131' into FLUID-5131


  Commit: e9200595029cd4298da8b655d374617df3b0ac0c
      https://github.com/fluid-project/infusion/commit/e9200595029cd4298da8b655d374617df3b0ac0c
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M src/framework/preferences/css/PrefsEditor.css
    M src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/framework/preferences/html/PrefsEditorTemplate-layout.html
    M src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    M src/framework/preferences/html/prefsEditorTemplate-inputsLarger.html

  Log Message:
  -----------
  FLUID-5131: Replaced tabs with spaces.


  Commit: fb4c0167452ce23c91592a2d0f00b82e9f68c508
      https://github.com/fluid-project/infusion/commit/fb4c0167452ce23c91592a2d0f00b82e9f68c508
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M src/demos/keyboard-a11y/js/five-star.js

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


  Commit: 03927cf35e393ef467149a1c69eb4cd9d3bb0981
      https://github.com/fluid-project/infusion/commit/03927cf35e393ef467149a1c69eb4cd9d3bb0981
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M src/tests/framework-tests/preferences/js/PanelsTests.js

  Log Message:
  -----------
  FLUID-5131: Fixed typo


  Commit: 2a79fb7746b96f89abd5db437f74ca083f84b086
      https://github.com/fluid-project/infusion/commit/2a79fb7746b96f89abd5db437f74ca083f84b086
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5131: Typo in AuxBuilderTests.js


  Commit: 5b631da3519a797684a89a8fb494ca5a14ba2f22
      https://github.com/fluid-project/infusion/commit/5b631da3519a797684a89a8fb494ca5a14ba2f22
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/html/PrefsEditorTemplate-emphasizeLinks.html
    M src/framework/preferences/html/PrefsEditorTemplate-layout.html
    R src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-linksControls.html
    M src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    M src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/prefsEditorTemplate-inputsLarger.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    M src/framework/preferences/js/FullPreviewPrefsEditor.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/messages/emphasizeLinks.json
    A src/framework/preferences/messages/inputsLarger.json
    R src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/linksControls.json
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/BuilderTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js

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

* FLUID-5131: (39 commits)
  FLUID-5131: Typo in AuxBuilderTests.js
  FLUID-5131: Fixed typo
  FLUID-5131: Replaced tabs with spaces.
  FLUID-5131: Modified the aux builder to allow users' own configuration defined in the aux schema being passed to constructed composite panels.
  FLUID-5131: fixed unit tests and renaming
  FLUID-5131: In progress with fixing prefs framework -> panels unit tests.
  FLUID-5131: Fixed the aux builder unit test to demonstrate one panel for multiple prefs without using fluid.prefs.panel.linksControls component that has been converted to a composite panel.
  FLUID-5131: Fixed the starter panel grade to make use of composite panel for fluid.prefs.panel.linksControls.
  FLUID-5131: in progress commmit
  FLUID-5131: Fixed issue with subpanel init
  FLUID-5131: Make use of the implementation of composite panel to re-write linksControls panel. In this commit, an error occurs at instantiating a sub panel of the composite linksControls.
  FLUID-5131: refactored composite panel
  FLUID-5187: The aux builder adds container option to constructed enactors that are view or renderer components.
  FLUID-5182: Created onReady event for, 1) builder-constructed prefs editor; 2) full with/without preview components. Also distribute these options, store type and options, enhancer type and options, for builder-constructed prefs editor.
  FLUID-5181: The pref editor that's built from the aux schema supports top level options for template and message prefixes.
  FLUID-5170: Throws an error if the primary schema for a panel or a enactor that is included in the aux schema is not defined.
  FLUID-5131: Added the test case to make sure the aux builder handles a full aux schema containing composite panels correctly.
  FLUID-5131: Updated the aux builder to parse the schema for composite panels. Need another unit test to make sure the parsing on the full schema still works fine.
  FLUID-5131: moved string replacement to a function
  FLUID-5131: simplified tree rebasing
  ...

Conflicts:
	src/framework/preferences/js/Panels.js


Compare: https://github.com/fluid-project/infusion/compare/861d635d56c7...5b631da3519a


More information about the Commits mailing list