[Commits] [fluid-project/infusion] f214fa: FLUID-5597: Cleaning up the resourceLoader

GitHub noreply at github.com
Thu Apr 2 11:35:40 EDT 2015


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: f214fad0cc1c1c3ed8c82b061d8e8b10ada2e573
      https://github.com/fluid-project/infusion/commit/f214fad0cc1c1c3ed8c82b061d8e8b10ada2e573
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js

  Log Message:
  -----------
  FLUID-5597: Cleaning up the resourceLoader

Removed references to templates from within the generalized resourceLoader component.


  Commit: 8c93768040ac09b04b122cd321a50e15fc0ac143
      https://github.com/fluid-project/infusion/commit/8c93768040ac09b04b122cd321a50e15fc0ac143
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M demos/prefsFramework/index.html
    M demos/prefsFramework/js/prefsEditorDemo.js
    M demos/uiOptions/index.html
    M examples/framework/preferences/conditionalAdjusters-singlePanel/index.html
    M examples/framework/preferences/conditionalAdjusters/index.html
    M examples/framework/preferences/shared/js/panels.js
    M examples/framework/preferences/usingGrades/index.html
    M examples/framework/preferences/usingGrades/js/prefsEditorSeparatedPanel.js
    M src/components/textToSpeech/js/TextToSpeech.js
    M src/components/textfieldSlider/js/TextfieldSlider.js
    M src/framework/core/js/ModelTransformationTransforms.js
    M src/framework/preferences/css/stylus/Enactors.styl
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Builder.js
    M src/framework/preferences/js/Enactors.js
    R src/framework/preferences/js/ModelRelay.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SelfVoicingEnactor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/js/Store.js
    M src/framework/preferences/js/UIEnhancer.js
    M src/framework/preferences/preferencesDependencies.json
    M tests/all-tests.html
    M tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    M tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    M tests/component-tests/uiOptions/html/UIOptions-test.html
    M tests/framework-tests/core/js/ModelTransformationTests.js
    M tests/framework-tests/preferences/all-tests.html
    M tests/framework-tests/preferences/html/Builder-test.html
    M tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    R tests/framework-tests/preferences/html/ModelRelay-test.html
    M tests/framework-tests/preferences/html/PageEnhancer-test.html
    M tests/framework-tests/preferences/html/Panels-test.html
    M tests/framework-tests/preferences/html/PrefsEditor-test.html
    M tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M tests/framework-tests/preferences/html/UIEnhancer-test.html
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/EnactorsTests.js
    M tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    R tests/framework-tests/preferences/js/ModelRelayTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    M tests/framework-tests/preferences/js/UIEnhancerTests.js
    M tests/manual-tests/framework/preferences/assortedContent/index.html
    M tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js
    M tests/manual-tests/framework/preferences/fullPage-schema/index.html
    M tests/manual-tests/framework/preferences/fullPage/index.html
    M tests/manual-tests/framework/preferences/fullPage/js/prefsEditorFullpage.js

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

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


  Commit: f9fbd8b4d1fbb25066fb13ba7b695739bcf00c0b
      https://github.com/fluid-project/infusion/commit/f9fbd8b4d1fbb25066fb13ba7b695739bcf00c0b
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/messages/textFont.json

  Log Message:
  -----------
  FLUID-5597: Passing message bundles down - grades

Passing the message bundles down to the components directly. Currently only working for the grade version of the preferences framework.
The schema version is broken at the moment, but will be updated shortly.


  Commit: 32cfc6a1b1f3fb65765836396ead83fa0e6bc6dd
      https://github.com/fluid-project/infusion/commit/32cfc6a1b1f3fb65765836396ead83fa0e6bc6dd
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  FLUID-5597: Passing message bundles down - schema

The builder has been updated to pass along the message bundles to the individual panels.


  Commit: ed63ff65ed17cff2fc95cb50dbe4a4b1b61cf1aa
      https://github.com/fluid-project/infusion/commit/ed63ff65ed17cff2fc95cb50dbe4a4b1b61cf1aa
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  FLUID-5597: Fixed AuxBuilderTests.js


  Commit: d3e9539a20698261b389a3567bb2e641825fc8a4
      https://github.com/fluid-project/infusion/commit/d3e9539a20698261b389a3567bb2e641825fc8a4
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  FLUID-5597: Fixed BuilderTests.js


  Commit: 94fa923011a2d80a7dce40c54c66ce3fd34a4077
      https://github.com/fluid-project/infusion/commit/94fa923011a2d80a7dce40c54c66ce3fd34a4077
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  FLUID-5597: Fixed the panel tests


  Commit: 39d954648bf8559d222e619bd78e9fc6d338c589
      https://github.com/fluid-project/infusion/commit/39d954648bf8559d222e619bd78e9fc6d338c589
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M src/components/tooltip/js/Tooltip.js

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


  Commit: 342c7868dba6e8585c88e1c915d54c361d39c539
      https://github.com/fluid-project/infusion/commit/342c7868dba6e8585c88e1c915d54c361d39c539
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

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

  Log Message:
  -----------
  FLUID-5597: Using jquery to parse resource


  Commit: 80c5f10327038b4d1e55b8647d3178a0e8152082
      https://github.com/fluid-project/infusion/commit/80c5f10327038b4d1e55b8647d3178a0e8152082
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    M src/framework/preferences/js/Panels.js
    M tests/framework-tests/preferences/js/AuxBuilderTests.js

  Log Message:
  -----------
  FLUID-5597: refactoring rebasing

Refactoring the tree rebasing for the composite panels so that another object isn't introduced. Also fixing up the unit tests. The separatedPanel still has a test that isn't running.


  Commit: bb57940881d7bc346340e4af5c99db63634c7887
      https://github.com/fluid-project/infusion/commit/bb57940881d7bc346340e4af5c99db63634c7887
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/messages/prefsEditor.json

  Log Message:
  -----------
  FLUID-5597: Fixed messageBase config

Fixed the messageBase config for the separatePanel prefsEditor. It is now directly inside of the messageResolver subComponent, which will only be created after the message bundles have been fetched.


  Commit: 5b68570fc60c23a5962637c9d4a037be5cbb50de
      https://github.com/fluid-project/infusion/commit/5b68570fc60c23a5962637c9d4a037be5cbb50de
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

  Log Message:
  -----------
  FLUID-5597: Added a comment


  Commit: 8e3802078309ee2ca9b42abaedd4048e77c80d7d
      https://github.com/fluid-project/infusion/commit/8e3802078309ee2ca9b42abaedd4048e77c80d7d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

  Log Message:
  -----------
  FLUID-5597: Adding else blocks in rebasing

Using as many else blocks as possible in the rebasing method.


  Commit: 9e818bf1b836f26a1c7e603dae57a9181c10a08f
      https://github.com/fluid-project/infusion/commit/9e818bf1b836f26a1c7e603dae57a9181c10a08f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

  Log Message:
  -----------
  FLUID-5597: More structural clean up


  Commit: 809231c7525798ead15f214497721b6ea9e619f7
      https://github.com/fluid-project/infusion/commit/809231c7525798ead15f214497721b6ea9e619f7
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M examples/framework/preferences/conditionalAdjusters-singlePanel/js/auxiliarySchema.js
    M examples/framework/preferences/conditionalAdjusters/js/auxiliarySchema.js
    M src/framework/preferences/js/AuxBuilder.js
    M src/framework/preferences/js/Panels.js
    M src/framework/preferences/js/PrefsEditor.js
    M src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    M src/framework/preferences/js/StarterGrades.js
    M src/framework/preferences/messages/prefsEditor.json
    M src/framework/preferences/messages/textFont.json
    M tests/framework-tests/preferences/js/AuxBuilderTests.js
    M tests/framework-tests/preferences/js/BuilderTests.js
    M tests/framework-tests/preferences/js/PanelsTests.js
    M tests/framework-tests/preferences/js/PrefsEditorTests.js
    M tests/framework-tests/preferences/js/SelfVoicingPanelTests.js

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

* FLUID-5597:
  FLUID-5597: More structural clean up
  FLUID-5597: Adding else blocks in rebasing
  FLUID-5597: Added a comment
  FLUID-5597: Fixed messageBase config
  FLUID-5597: refactoring rebasing
  FLUID-5597: Using jquery to parse resource
  FLUID-5597: Fixed the panel tests
  FLUID-5597: Fixed BuilderTests.js
  FLUID-5597: Fixed AuxBuilderTests.js
  FLUID-5597: Passing message bundles down - schema
  FLUID-5597: Passing message bundles down - grades
  FLUID-5597: Cleaning up the resourceLoader


Compare: https://github.com/fluid-project/infusion/compare/a930d31ca643...809231c75257


More information about the Commits mailing list