[Commits] [fluid-project/infusion] 0712bc: FLUID-5213: Allow the specifying of a merge functi...

GitHub noreply at github.com
Tue Feb 11 04:14:31 EST 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 0712bc0e55ab5ddf35e01e474b3c6d673ac0bf8e
      https://github.com/fluid-project/infusion/commit/0712bc0e55ab5ddf35e01e474b3c6d673ac0bf8e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: Allow the specifying of a merge function to output the to-be-added option based on both existing and new values. Also removed the feature in the aux builder that adds "fluid.prefs.compositePanel" grade to composite panels.


  Commit: d9c6bc2f9a88efb43b68d23b6f03645c8d84a2d6
      https://github.com/fluid-project/infusion/commit/d9c6bc2f9a88efb43b68d23b6f03645c8d84a2d6
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

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


  Commit: 59176fb8aa393de59ff3bc103f5507fd901c3714
      https://github.com/fluid-project/infusion/commit/59176fb8aa393de59ff3bc103f5507fd901c3714
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: Code clean up.


  Commit: 1edaa22529e47f4e13e0a210189744286cf97ec5
      https://github.com/fluid-project/infusion/commit/1edaa22529e47f4e13e0a210189744286cf97ec5
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: Use fluid.model.parseEL to split string by delimiter.


  Commit: 9146d763a795d6f553c04bf00355208047697230
      https://github.com/fluid-project/infusion/commit/9146d763a795d6f553c04bf00355208047697230
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: The auxiliary builder uses framework built-in mergePolicy to merge gradeNames rather than manually invoking the merge function.


  Commit: 6d177e83472b64b0700bc5790380351ef9bab7ca
      https://github.com/fluid-project/infusion/commit/6d177e83472b64b0700bc5790380351ef9bab7ca
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5213 and resolve conflicts

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


  Commit: 8455a1e0784aaa0c8934524d3d0c035be3f0a6a0
      https://github.com/fluid-project/infusion/commit/8455a1e0784aaa0c8934524d3d0c035be3f0a6a0
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.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/js/prefsEditorFullPageSchema.js
    M src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5213, resolve conflicts and renamed "validationFunc" in the aux builder to "optionRequired".

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


  Commit: 6894e1147c5461510f83a38ee6730647b79cdd74
      https://github.com/fluid-project/infusion/commit/6894e1147c5461510f83a38ee6730647b79cdd74
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/conditional.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/auxiliarySchema.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/conditional.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters1/js/panels.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/conditional.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/auxiliarySchema.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/conditional.js
    A src/instructionalDemos/framework/preferences/conditionalAdjusters2/js/panels.js
    A src/instructionalDemos/framework/preferences/shared/css/demo.css
    A src/instructionalDemos/framework/preferences/shared/html/README.txt
    A src/instructionalDemos/framework/preferences/shared/html/SeparatedPanelPrefsEditorFrame.html
    A src/instructionalDemos/framework/preferences/shared/html/incSize-template.html
    A src/instructionalDemos/framework/preferences/shared/html/increasing.html
    A src/instructionalDemos/framework/preferences/shared/html/prefsEditor.html
    A src/instructionalDemos/framework/preferences/shared/html/radioButton-template.html
    A src/instructionalDemos/framework/preferences/shared/html/slider-template.html
    A src/instructionalDemos/framework/preferences/shared/html/speak-template.html
    A src/instructionalDemos/framework/preferences/shared/html/speakIncrease.html
    A src/instructionalDemos/framework/preferences/shared/html/speaking.html
    A src/instructionalDemos/framework/preferences/shared/js/enactors.js
    A src/instructionalDemos/framework/preferences/shared/js/panels.js
    A src/instructionalDemos/framework/preferences/shared/js/primarySchema.js
    A src/instructionalDemos/framework/preferences/shared/js/utilities.js
    A src/instructionalDemos/framework/preferences/shared/messages/README.txt
    A src/instructionalDemos/framework/preferences/shared/messages/increasing.json
    A src/instructionalDemos/framework/preferences/shared/messages/prefsEditor.json
    A src/instructionalDemos/framework/preferences/shared/messages/speakIncrease.json
    A src/instructionalDemos/framework/preferences/shared/messages/speaking.json
    M src/tests/framework-tests/preferences/html/Builder-test.html
    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/PanelsTests.js
    A src/tests/framework-tests/preferences/testResources/html/checkboxTemplate.html
    A src/tests/framework-tests/preferences/testResources/html/compositePrefsEditorTemplate.html
    A src/tests/framework-tests/preferences/testResources/html/increaseTemplate.html

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


  Commit: 683611d89703936d1d576dacd8e737c2d222660b
      https://github.com/fluid-project/infusion/commit/683611d89703936d1d576dacd8e737c2d222660b
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: Fixed the aux builder unit tests due to merging in master.


  Commit: ba9204348ef9cd1475eee0e0ad17ac531e086029
      https://github.com/fluid-project/infusion/commit/ba9204348ef9cd1475eee0e0ad17ac531e086029
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

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

  Log Message:
  -----------
  FLUID-5213: Simplified the ways to, 1. merge existing option values with system default values; 2. add "container" option for view or renderer components only.


  Commit: bcff5f33474ce3dcf965e4d89924c3f1768b9757
      https://github.com/fluid-project/infusion/commit/bcff5f33474ce3dcf965e4d89924c3f1768b9757
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-12-09 (Mon, 09 Dec 2013)

  Changed paths:
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/preferences/js/PrimaryBuilder.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js

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


  Commit: 71c25730c92281a929c6c78ff546668f8664eb5d
      https://github.com/fluid-project/infusion/commit/71c25730c92281a929c6c78ff546668f8664eb5d
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-12-09 (Mon, 09 Dec 2013)

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

  Log Message:
  -----------
  FLUID-5213: Use the presence of "container" in the component's "argumentMap" to detect whether a component accepts a "container", as well as cleaning up the unit tests.


  Commit: f620379532cd00a4f3a28e3989abef33149240d6
      https://github.com/fluid-project/infusion/commit/f620379532cd00a4f3a28e3989abef33149240d6
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

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

  Log Message:
  -----------
  FLUID-5213: Adjusted comment and logic for "container detection functionality"


  Commit: a6cd793605564887e948143c20718efe53e47bed
      https://github.com/fluid-project/infusion/commit/a6cd793605564887e948143c20718efe53e47bed
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

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

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

* FLUID-5213:
  FLUID-5213: Adjusted comment and logic for "container detection functionality"
  FLUID-5213: Use the presence of "container" in the component's "argumentMap" to detect whether a component accepts a "container", as well as cleaning up the unit tests.
  FLUID-5213: Simplified the ways to, 1. merge existing option values with system default values; 2. add "container" option for view or renderer components only.
  FLUID-5213: Fixed the aux builder unit tests due to merging in master.
  FLUID-5213: The auxiliary builder uses framework built-in mergePolicy to merge gradeNames rather than manually invoking the merge function.
  FLUID-5213: Use fluid.model.parseEL to split string by delimiter.
  FLUID-5213: Code clean up.
  FLUID-5213: Allow the specifying of a merge function to output the to-be-added option based on both existing and new values. Also removed the feature in the aux builder that adds "fluid.prefs.compositePanel" grade to composite panels.


Compare: https://github.com/fluid-project/infusion/compare/796e6cdc4939...a6cd79360556


More information about the Commits mailing list