[Commits] [fluid-project/infusion] de9e08: Merged conflict with FLUID-4626 changes which impr...

GitHub noreply at github.com
Thu Mar 22 19:09:53 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: de9e08a21a36846cb89e92115e5e5bfd6174c8ae
      https://github.com/fluid-project/infusion/commit/de9e08a21a36846cb89e92115e5e5bfd6174c8ae
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M src/webapp/framework/core/js/DataBinding.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/framework/core/js/jquery.standalone.js
  M src/webapp/module/fluid.js
  M src/webapp/module/includes.json
  A src/webapp/module/requireStub.js
  M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
  M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  Merged conflict with FLUID-4626 changes which improved use of instantiator stack

Merge remote-tracking branch 'origin/master' into FLUID-4633

Conflicts:
	src/webapp/framework/core/js/FluidIoC.js


  Commit: a61001900ddc39bb58e1c3c20679aef7c945aae3
      https://github.com/fluid-project/infusion/commit/a61001900ddc39bb58e1c3c20679aef7c945aae3
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M src/webapp/framework/core/js/DataBinding.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/framework/renderer/js/RendererUtilities.js
  M src/webapp/tests/framework-tests/core/js/DataBindingTests.js

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

* amb26/FLUID-4633:
  FLUID-4633: Reorganised threadLocal support to simplify renderer expander, which was previously broken. Weakened support for withEnvironment, added comments for these "loosely supported methods". Linting fixes to DataBinding.js which has seemingly not been linted in years.
  FLUID-4633: Implementation and test cases for source tracking facility in ChangeApplier. Note that this has required some upgrade in the underlying framework implementation of ThreadLocal - core facility moved into Fluid.js for use in DataBinding.js
  FLUID-4633: Incomplete changeApplier work
  FLUID-4633: Incomplete work on the ChangeApplier


Compare: https://github.com/fluid-project/infusion/compare/edc0401...a610019


More information about the Commits mailing list