[Commits] [fluid-project/infusion] 0f1681: Merge branch 'master' into FLUID-5279-antranig

GitHub noreply at github.com
Tue Mar 18 04:37:18 EDT 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 0f1681fbe08ca2615463610f26201dcb205e3d0e
      https://github.com/fluid-project/infusion/commit/0f1681fbe08ca2615463610f26201dcb205e3d0e
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M Gruntfile.js
    M package.json

  Log Message:
  -----------
  Merge branch 'master' into FLUID-5279-antranig


  Commit: 1bd4befc6a4ed4329b5f0ff570c9361055909e39
      https://github.com/fluid-project/infusion/commit/1bd4befc6a4ed4329b5f0ff570c9361055909e39
  Author: Cindy Qi Li <cli at ocad.ca>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-5279: Added a unit test to demonstrate the issue that the default model value takes precedent over the relayed new model value in conditional renderers.


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

  Changed paths:
    M src/framework/core/js/DataBinding.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-5280: Stopgap fix for model relay conflict on init using "veterancy"


  Commit: 81e3e2e1543e6f3f19e68428e1a14ccceb9c9cb0
      https://github.com/fluid-project/infusion/commit/81e3e2e1543e6f3f19e68428e1a14ccceb9c9cb0
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M src/framework/core/js/DataBinding.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/FLUID-5280'

* amb26/FLUID-5280:
  FLUID-5280: Stopgap fix for model relay conflict on init using "veterancy"
  FLUID-5279: Added a unit test to demonstrate the issue that the default model value takes precedent over the relayed new model value in conditional renderers.

Conflicts:
	src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js


Compare: https://github.com/fluid-project/infusion/compare/137ddb0c8392...81e3e2e1543e


More information about the Commits mailing list