[Commits] [fluid-project/infusion] df2de8: FLUID-5191: Add fluid.prefs.uiEnhancerConnections ...

GitHub noreply at github.com
Thu Nov 21 17:38:08 EST 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: df2de8229a5c139a92b1c7fe58d2f77ac6e94d65
      https://github.com/fluid-project/infusion/commit/df2de8229a5c139a92b1c7fe58d2f77ac6e94d65
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2013-10-25 (Fri, 25 Oct 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/js/AuxBuilderTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js

  Log Message:
  -----------
  FLUID-5191: Add fluid.prefs.uiEnhancerConnections to keep the common options used to connect enactors with uiEnhancer.


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

  Changed paths:
    M src/components/slidingPanel/js/SlidingPanel.js
    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/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    M src/framework/preferences/messages/contrast.json
    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/framework/preferences/messages/textFont.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 'master' into FLUID-5191 and resolve conflicts

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


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

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

  Log Message:
  -----------
  FLUID-5191: Use common grade names for prefEditor and uiEnhancer connections grades to be shared by enactor and panel components, as well as fixing a typo.


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

  Changed paths:
    M src/framework/core/js/Fluid.js
    A src/framework/preferences/html/PrefsEditorTemplate-inputsLarger.html
    R src/framework/preferences/html/prefsEditorTemplate-inputsLarger.html
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/StarterSchemas.js
    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/EnactorsTests.js
    M src/tests/framework-tests/preferences/js/IntegrationTestsCommon.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-5191


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

  Changed paths:
    M src/framework/preferences/js/Enactors.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/framework-tests/preferences/js/EnactorsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js

  Log Message:
  -----------
  FLUID-5191: A work around of FLUID-5193 by having "fluid.prefs.uiEnhancerConnections" as a grade of "fluid.prefs.enactor" to reduce the noise of repeating "uiEnhancerConnections" in every enactor. However, this adds the dependency on uiEnhancer by enactors.


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

  Changed paths:
    M src/demos/keyboard-a11y/js/five-star.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/DataBindingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

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


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

  Changed paths:
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/StarterGrades.js
    M src/tests/component-tests/textfieldSlider/html/TextfieldSlider-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/PanelsTests.js

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


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

  Changed paths:
    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/EnactorsTests.js
    M src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    M src/tests/framework-tests/preferences/js/UIEnhancerTests.js

  Log Message:
  -----------
  FLUID-5191: Use IoCSS reference to pass uiEnhancerConnections grade to enactors rather than adding it in the grade list of fluid.prefs.enactor.


  Commit: ae07cd484177b64e5a0a4dd9478c83099aa7a25a
      https://github.com/fluid-project/infusion/commit/ae07cd484177b64e5a0a4dd9478c83099aa7a25a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-11-21 (Thu, 21 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 'FLUID-5191'

* FLUID-5191:
  FLUID-5191: Use IoCSS reference to pass uiEnhancerConnections grade to enactors rather than adding it in the grade list of fluid.prefs.enactor.
  FLUID-5191: A work around of FLUID-5193 by having "fluid.prefs.uiEnhancerConnections" as a grade of "fluid.prefs.enactor" to reduce the noise of repeating "uiEnhancerConnections" in every enactor. However, this adds the dependency on uiEnhancer by enactors.
  FLUID-5191: Use common grade names for prefEditor and uiEnhancer connections grades to be shared by enactor and panel components, as well as fixing a typo.
  FLUID-5191: Add fluid.prefs.uiEnhancerConnections to keep the common options used to connect enactors with uiEnhancer.


Compare: https://github.com/fluid-project/infusion/compare/5a3bcdf175c4...ae07cd484177


More information about the Commits mailing list