[Commits] [fluid-project/infusion] 5e8eff: Merge remote branch 'amb26/FLUID-4174-ii'

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/fluid-project/infusion

Commit: 5e8eff4a8f6e849459076195559b327faff39dc7
    https://github.com/fluid-project/infusion/commit/5e8eff4a8f6e849459076195559b327faff39dc7
Author: Colin Clark <colinbdclark at gmail.com>
Date:   2011-05-10 (Tue, 10 May 2011)

Changed paths:
  M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  M src/webapp/framework/renderer/js/fluidRenderer.js
  A src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
  A src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js

Log Message:
-----------
Merge remote branch 'amb26/FLUID-4174-ii'

* amb26/FLUID-4174-ii:
  FLUID-4174: Changes to IoC and core framework to allow transformOptions to work in the conventional way with the uploader tests - at least when using mergeOptions (plain "options" does not work)
  FLUID-4174: Minor test refactoring of UploaderCompatibilityTests.js to reduce redundancy.
  FLUID-4174: Created options backwards compatibility tests for Uploader, along with IoC-ifying the implementation.

Conflicts:
	src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js