[Commits] [fluid-project/infusion] 427546: FLUID-4330: "Code for staring at" towards the GING...

GitHub noreply at github.com
Sat Feb 16 14:04:56 EST 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 4275469210207c9c5d2983627e05f3ba63b8c9d2
      https://github.com/fluid-project/infusion/commit/4275469210207c9c5d2983627e05f3ba63b8c9d2
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/manual-tests/js/performance-test.js

  Log Message:
  -----------
  FLUID-4330: "Code for staring at" towards the GINGER WORLD


  Commit: 5e4dd653826a7de3a462d703a2e04ab82263198b
      https://github.com/fluid-project/infusion/commit/5e4dd653826a7de3a462d703a2e04ab82263198b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: Experimental work exploring whether expansion can happen subsequent to merging (result - it probably can't). IoC test cases pass, but will be widespread failures in UIOptions etc.


  Commit: bb23fb1552e68d739215120c0bdd905e85ec363e
      https://github.com/fluid-project/infusion/commit/bb23fb1552e68d739215120c0bdd905e85ec363e
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: First working implementation of SELF-REFERENTIAL GINGER EXPANSION


  Commit: f0cb86d12abd47702f49608c5596f07d53f1732c
      https://github.com/fluid-project/infusion/commit/f0cb86d12abd47702f49608c5596f07d53f1732c
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

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


  Commit: f3b6f13d4b63d58a4de16fe8add0808502097b33
      https://github.com/fluid-project/infusion/commit/f3b6f13d4b63d58a4de16fe8add0808502097b33
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-09-11 (Tue, 11 Sep 2012)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: Working version with expanders and elaborated tests!


  Commit: fae47a09fe6675dba2f642c2cba605c1468356f9
      https://github.com/fluid-project/infusion/commit/fae47a09fe6675dba2f642c2cba605c1468356f9
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-10-14 (Sun, 14 Oct 2012)

  Changed paths:
    M src/webapp/components/tableOfContents/js/TableOfContents.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-4330: Before main phase of ginger work. All framework test cases now passing again as a result of adjustment of model idiom of TableOfContents component as well as new and highly expensive "miniWorld" idiom


  Commit: a1d7bd329191ad6f85a476a8c799c1cd744991ea
      https://github.com/fluid-project/infusion/commit/a1d7bd329191ad6f85a476a8c799c1cd744991ea
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M src/webapp/components/uiOptions/js/URLUtilities.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-4330: "reverse merge" removed from core merging algorithm, corrections to idiom throughout framework to deal with new semantic for "non-incremental merging". Core test cases now passing again, remaining failures within Reorderer (which now needs to be rewritten to use IoC proper) and Renderer Utilities failures with expanders which remain to be diagnosed


  Commit: 17ec5e0ad42f4f894d19ae824353778af663a248
      https://github.com/fluid-project/infusion/commit/17ec5e0ad42f4f894d19ae824353778af663a248
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  FLUID-4330: Fixed version of replace mergePolicy and further tests bring all framework tests back into function except for LayoutReorderer. May now progress to stage 3 of work - test case for genuinely interleaved merging and expansion


  Commit: 7af8f506d7b17950b7e5da9056f19f70481e7a19
      https://github.com/fluid-project/infusion/commit/7af8f506d7b17950b7e5da9056f19f70481e7a19
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: First passing test case for SIMULTANEOUS MERGING AND EXPANSION!!


  Commit: c7ab35c516adc1f6f40310f74fbf0050f83ed068
      https://github.com/fluid-project/infusion/commit/c7ab35c516adc1f6f40310f74fbf0050f83ed068
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: Another ginger test, reorganised tests


  Commit: 79ebbe82cae10936e4c8958add86120deba5ca21
      https://github.com/fluid-project/infusion/commit/79ebbe82cae10936e4c8958add86120deba5ca21
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    M src/webapp/tests/framework-tests/core/html/FluidIoC-test.html
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/lib/qunit/addons/composite/qunit-composite.js

  Log Message:
  -----------
  FLUID-4330: All tests except LayoutReorderer now working again with rationalised and simplified instantiator system - instantiators are now looked up from component records in all cases where they can (only 4 instances of fluid.withInstantiator now remain) - unified lookup of component records within instantiators within "shadow record". Fix to qunit-composite to update link to individual test before test starts


  Commit: fc00b7781d3ca7fb48d0d10a6797e6ec7484038a
      https://github.com/fluid-project/infusion/commit/fc00b7781d3ca7fb48d0d10a6797e6ec7484038a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: Further rationalisation in expandOptions - eliminated "preserveFromExpansion" in favour of mergePolicy modification, preparing final conversion to gingerness. Fixed further bugs in expansion pathway relating to "tall late things" with further tests for ginger cases. Improved messages in CachingTests.js


  Commit: f9ed12b9c843bb6e7630c9845ccac62eb1265f80
      https://github.com/fluid-project/infusion/commit/f9ed12b9c843bb6e7630c9845ccac62eb1265f80
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M src/webapp/components/inlineEdit/js/InlineEdit.js
    M src/webapp/components/tooltip/js/Tooltip.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/tests/component-tests/inlineEdit/html/InlineEdit-test.html
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/webapp/tests/component-tests/tooltip/js/TooltipTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

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

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


  Commit: 39509ab5f611dbbf90fe375cec306a6dcac60afc
      https://github.com/fluid-project/infusion/commit/39509ab5f611dbbf90fe375cec306a6dcac60afc
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidDebugging.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    M src/webapp/module/fluid.js
    M src/webapp/module/includes.json
    M src/webapp/tests/3rd-party-tests/jscssp/html/jscsspTests.html
    M src/webapp/tests/all-tests.html
    M src/webapp/tests/component-tests/inlineEdit/html/InlineEdit-test.html
    M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/webapp/tests/component-tests/pager/html/Pager-test.html
    M src/webapp/tests/component-tests/pager/js/PagerTests.js
    M src/webapp/tests/component-tests/progress/html/Progress-test.html
    M src/webapp/tests/component-tests/progress/js/ProgressTests.js
    M src/webapp/tests/component-tests/reorderer/html/AriaLabeller-test.html
    M src/webapp/tests/component-tests/reorderer/html/GeometricManager-test.html
    M src/webapp/tests/component-tests/reorderer/html/ImageReorderer-test.html
    M src/webapp/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/webapp/tests/component-tests/reorderer/html/ReorderList-test.html
    M src/webapp/tests/component-tests/reorderer/html/Scheduler-test.html
    M src/webapp/tests/component-tests/reorderer/js/AriaLabellerTests.js
    M src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
    M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
    M src/webapp/tests/component-tests/reorderer/js/LayoutReordererTests.js
    M src/webapp/tests/component-tests/reorderer/js/ModuleLayoutTests.js
    M src/webapp/tests/component-tests/reorderer/js/ReorderGridTests.js
    M src/webapp/tests/component-tests/reorderer/js/ReorderListTests.js
    M src/webapp/tests/component-tests/reorderer/js/ReordererTestUtils.js
    M src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
    R src/webapp/tests/component-tests/reorderer/js/UnorderedListTestConstants.js
    M src/webapp/tests/component-tests/tableOfContents/html/TableOfContents-test.html
    M src/webapp/tests/component-tests/tableOfContents/js/TableOfContentsTests.js
    M src/webapp/tests/component-tests/tabs/js/TabsTests.js
    M src/webapp/tests/component-tests/tooltip/js/TooltipTests.js
    M src/webapp/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    M src/webapp/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    M src/webapp/tests/component-tests/uiOptions/html/Store-test.html
    M src/webapp/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    M src/webapp/tests/component-tests/uiOptions/js/StoreTests.js
    M src/webapp/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/ErrorPanel-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueueView-test.html
    M src/webapp/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
    M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    M src/webapp/tests/component-tests/uploader/js/DemoUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/ErrorPanelTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueTests.js
    M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
    M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/html/Caching-test.html
    M src/webapp/tests/framework-tests/core/html/DataBinding-test.html
    M src/webapp/tests/framework-tests/core/html/FluidIoC-test.html
    M src/webapp/tests/framework-tests/core/html/FluidIoCStandalone-test.html
    M src/webapp/tests/framework-tests/core/html/FluidIoCView-test.html
    M src/webapp/tests/framework-tests/core/html/FluidJS-test.html
    M src/webapp/tests/framework-tests/core/html/FluidJSStandalone-test.html
    M src/webapp/tests/framework-tests/core/html/ModelTransformations-test.html
    M src/webapp/tests/framework-tests/core/html/keyboard-a11y-test.html
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/DataBindingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/FluidViewTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/core/js/keyboard-a11y-tests.js
    M src/webapp/tests/framework-tests/enhancement/html/ProgressiveEnhancement-test.html
    M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js
    M src/webapp/tests/framework-tests/jqUnit/html/jqUnit-tests.html
    M src/webapp/tests/framework-tests/jqUnit/js/jqUnit-tests.js
    M src/webapp/tests/framework-tests/renderer/html/Renderer-test.html
    M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/lib/qunit/VERSION
    M src/webapp/tests/lib/qunit/addons/composite/README.md
    M src/webapp/tests/lib/qunit/addons/composite/qunit-composite.css
    M src/webapp/tests/lib/qunit/addons/composite/qunit-composite.js
    M src/webapp/tests/lib/qunit/css/qunit.css
    M src/webapp/tests/lib/qunit/js/qunit.js
    M src/webapp/tests/test-core/jqUnit/html/test-template.html
    A src/webapp/tests/test-core/jqUnit/js/jqUnit-browser.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js
    A src/webapp/tests/test-core/testTests/html/Testing-test.html
    A src/webapp/tests/test-core/testTests/js/TestingTests.js
    M src/webapp/tests/test-core/utils/js/DebugFocus.js
    A src/webapp/tests/test-core/utils/js/IoCTestUtils.js
    R src/webapp/tests/test-core/utils/js/TestUtils.js

  Log Message:
  -----------
  FLUID-4330: Merged up with testing framework in master and resolved conflicts as well as latent bug in FluidRequests "deferredExpander" (see https://github.com/jquery/qunit/issues/397 )

Merge branch 'master' into FLUID-4330

Conflicts:
	src/webapp/framework/core/js/FluidIoC.js
	src/webapp/tests/framework-tests/core/js/CachingTests.js
	src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
	src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js
	src/webapp/tests/framework-tests/core/js/FluidJSTests.js
	src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
	src/webapp/tests/lib/qunit/addons/composite/qunit-composite.js


  Commit: 6b7075cdeb58a8236d2a9e33857632e3087fd8f0
      https://github.com/fluid-project/infusion/commit/6b7075cdeb58a8236d2a9e33857632e3087fd8f0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js

  Log Message:
  -----------
  FLUID-4330: Moving towards the last unwrapping - passing mergeRecords from embodyDemands and eliminating localRecord from expandComponentOptions


  Commit: ea41ef9456365e235dc4b8dc0b82e721fbc0b24d
      https://github.com/fluid-project/infusion/commit/ea41ef9456365e235dc4b8dc0b82e721fbc0b24d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js

  Log Message:
  -----------
  FLUID-4330: Really now FINALLY ready for the ginger world. All outstanding work imported from FLUID-4392 additive demands block branch, and communication between embodyDemands and expandComponentOptions now occurs via the appropriate "mergeRecords" - "localRecord" now abolished. "mergeAllOptions" also abolished, along with support for encoding this inside the options record itself. Inverted sort order of listener priority so it can be shared with mergeRecord priority. Three test cases now failing - layoutReorderer (requires reimplementing, main aim of branch), IoC-driven options transformation, and an obscure RendererUtilitiesTest which relied on being able to fish "{arguments}.1" out of the soup. Expansion pathway is now completely clear - only remaining mess lies behind in embodyDemands handling of its own "localRecord".


  Commit: 15b4e89a483f20eec2e8e4cd2a9871f8d168d4ab
      https://github.com/fluid-project/infusion/commit/15b4e89a483f20eec2e8e4cd2a9871f8d168d4ab
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/core/js/FluidRequests.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js

  Log Message:
  -----------
  FLUID-4330: Final tidy-up - eliminated fluid.resolveEnvironment and kin, as well as fluid.expander.expandLight - consolidated into a single fluid.expand with consistent "initter" and "target" semantics for all source types


  Commit: 004301fad9091f71a421dc3089d405a4a256f559
      https://github.com/fluid-project/infusion/commit/004301fad9091f71a421dc3089d405a4a256f559
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js

  Log Message:
  -----------
  FLUID-4330: First ACTUAL DEMONSTRATION of component-cyclic ginger options!!!
Improvements to fluid.fail diagnostics in jqUnit environment - also
FLUID-4707: no demands block resolution onto mismatched options -
FLUID-4236: merging between decorator and demands block options
FLUID-4733: regularised default value merge algorithm


  Commit: 95a2cfc3e7b9d1fef45eab9d7f01294c2ccca1fc
      https://github.com/fluid-project/infusion/commit/95a2cfc3e7b9d1fef45eab9d7f01294c2ccca1fc
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/ImageReorderer.js
    M src/webapp/components/reorderer/js/ModuleLayout.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/uploader/js/Flash9UploaderSupport.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    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/FluidView.js
    M src/webapp/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4330: All Reorderer configurations now working again with EXTREME GINGERNESS - beginnings of "Luke Skywalker" actually constructs a prophecy for his father first... support for "upwards injection" of previously unknown material from child. Corrected context names in Uploader since now mismatched demands blocks are discarded - a specific version number is now required to be computed somehow (for the time being, just by inclusion) otherwise no configuration is selected. New support for "members" directive allows arbitrary material to be copied to component root. Support for dynamic resolution of subcomponent types. Full ginger support for events, invokers, members, and the DOM binder! deferredInvokeExpander made the default expander, and made capable of all expansion cases. Removed more cases of withInstantiator, now pending total removal. Next steps: restore options transformation, allow dynamic mergePolicies, and multiple demands blocks! And then, the WAVE OF EXPLOSION ...


  Commit: c42a89b92b770fc5a48fce5fb95707fc295814e2
      https://github.com/fluid-project/infusion/commit/c42a89b92b770fc5a48fce5fb95707fc295814e2
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/ModuleLayout.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/component-tests/uploader/html/Uploader-test.html
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/lib/qunit/js/qunit.js

  Log Message:
  -----------
  FLUID-4330 - All test cases working again! Restored functionality to basic options transformation, eliminating old scheme based on demands for the function "fluid.transformOptions" - this will be unnecessary with FLUID-4392. Added temporary hack to fluid.embodyOptions to give special support for the record entry "preOptions", since support for the previous pathway whereby options would be "accidentally" doubly expanded has been removed which was being used by the IoC-based Uploader options transformation examples. Updated qunit latest trunk to get some bug fixes.


  Commit: 8052efb6ed89f034cc961ce1dfb831b6a4994a2a
      https://github.com/fluid-project/infusion/commit/8052efb6ed89f034cc961ce1dfb831b6a4994a2a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

  Log Message:
  -----------
  FLUID-4129: mergePolicy is now responded to from all sources. A mostly invalid test case from RenderUtilities has been lost which purportedly demonstrate the ability to IoC-resolve values within a protoTree


  Commit: fbcd95dc3864dd506877f8f4e1b20b5d84851f91
      https://github.com/fluid-project/infusion/commit/fbcd95dc3864dd506877f8f4e1b20b5d84851f91
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4392: Additive demands blocks!!


  Commit: 7439286968449e6418dd929159fa5b6c5e891e0b
      https://github.com/fluid-project/infusion/commit/7439286968449e6418dd929159fa5b6c5e891e0b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js

  Log Message:
  -----------
  FLUID-4330: Removed "reverse merge" and tests, added non-api comments


  Commit: 556b45328861d82a90709c114d980085f7d621eb
      https://github.com/fluid-project/infusion/commit/556b45328861d82a90709c114d980085f7d621eb
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-04 (Mon, 04 Feb 2013)

  Changed paths:
    M .npmignore
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    R src/webapp/module/requireStub.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/renderer/html/Renderer-test.html
    M src/webapp/tests/framework-tests/renderer/html/RendererUtilitiesIFrame.html
    M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

  Log Message:
  -----------
  FLUID-4330: Merge branch 'master' into FLUID-4330, speeded up Uploader tests a little

Conflicts:
	src/webapp/framework/core/js/FluidIoC.js
	src/webapp/tests/test-core/utils/js/IoCTestUtils.js


  Commit: 6538bb4e64bc09877e8607abfef6d96cf05f7c30
      https://github.com/fluid-project/infusion/commit/6538bb4e64bc09877e8607abfef6d96cf05f7c30
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

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

  Log Message:
  -----------
  FLUID-4330: Two helpful test cases from KINGG reveal argument mangling in event dispatch through double resolution (FLUID-4631, FLUID-4634). fluid.withInstantiator finally bites the dust, and with it various annoying pathways trailing instantiators through RendererUtilities. RIP - IoC is now threadLocal free


  Commit: 919d21b3c7d0435ce3562c4cee4909b08d96a81a
      https://github.com/fluid-project/infusion/commit/919d21b3c7d0435ce3562c4cee4909b08d96a81a
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4914: Resolve onto grade names during both value context and demands context resolution. Next step - abolish fluid.alias and Uploader.


  Commit: 11cb025fc7922b116068820a17e3c30368fba3c0
      https://github.com/fluid-project/infusion/commit/11cb025fc7922b116068820a17e3c30368fba3c0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  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/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-4637: A test case from KING (not a bug in this case), and some comment and definition cleanup following review


  Commit: 12c611e2b2be2c4a150af7ff4eae425db701d15b
      https://github.com/fluid-project/infusion/commit/12c611e2b2be2c4a150af7ff4eae425db701d15b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/core/js/FluidIoC.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/framework/renderer/js/fluidParser.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/html/FluidIoC-test.html
    M src/webapp/tests/framework-tests/core/html/FluidIoCStandalone-test.html
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js

  Log Message:
  -----------
  FLUID-4873: First working test case for LUKE SKYWALKER OPTIONS and IOCSS! Cleaner workflow for component accessor hopefully allows "transformOptions" to pass through "distributOptions". Some linting, added "throws" to our set of jqUnit passthroughs.


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

  Changed paths:
    M src/webapp/components/uploader/js/Uploader.js
    M src/webapp/framework/core/js/Fluid.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/tests/component-tests/uploader/html/ErrorPanel-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueue-test.html
    M src/webapp/tests/component-tests/uploader/html/FileQueueView-test.html
    M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/enhancement/js/ProgressiveEnhancementTests.js

  Log Message:
  -----------
   FLUID-4794: Merge branch 'master' into FLUID-4330, apply new "forgetAll" enhancement to sanitise test


  Commit: 8438530816d713756f5c5776a0031ee0dd48cc14
      https://github.com/fluid-project/infusion/commit/8438530816d713756f5c5776a0031ee0dd48cc14
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Log Message:
  -----------
  FLUID-4794: Merge branch 'master' into FLUID-4330, apply new "forgetAll" enhancement to sanitise test

Conflicts:
	src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
	src/webapp/tests/component-tests/uploader/js/UploaderTests.js


  Commit: 91d5d1ccfee4b12030bc12ea812749476c0f2a16
      https://github.com/fluid-project/infusion/commit/91d5d1ccfee4b12030bc12ea812749476c0f2a16
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M src/webapp/components/reorderer/js/ImageReorderer.js
    M src/webapp/components/reorderer/js/ModuleLayout.js
    M src/webapp/components/reorderer/js/Reorderer.js
    M src/webapp/components/tableOfContents/js/TableOfContents.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/URLUtilities.js
    M src/webapp/components/uploader/js/DemoUploadManager.js
    M src/webapp/components/uploader/js/Flash9UploaderSupport.js
    M src/webapp/components/uploader/js/FlashUploaderSupport.js
    M src/webapp/components/uploader/js/Uploader.js
    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/FluidRequests.js
    M src/webapp/framework/core/js/FluidView.js
    M src/webapp/framework/enhancement/js/ProgressiveEnhancement.js
    M src/webapp/framework/renderer/js/RendererUtilities.js
    M src/webapp/framework/renderer/js/fluidParser.js
    M src/webapp/framework/renderer/js/fluidRenderer.js
    M src/webapp/tests/component-tests/reorderer/html/LayoutReorderer-test.html
    M src/webapp/tests/component-tests/uploader/html/Uploader-test.html
    M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
    M src/webapp/tests/framework-tests/core/html/FluidIoC-test.html
    M src/webapp/tests/framework-tests/core/html/FluidIoCStandalone-test.html
    M src/webapp/tests/framework-tests/core/js/CachingTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCTests.js
    M src/webapp/tests/framework-tests/core/js/FluidIoCViewTests.js
    M src/webapp/tests/framework-tests/core/js/FluidJSTests.js
    M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererTests.js
    M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/webapp/tests/lib/qunit/addons/composite/qunit-composite.js
    M src/webapp/tests/lib/qunit/js/qunit.js
    M src/webapp/tests/manual-tests/js/performance-test.js
    M src/webapp/tests/test-core/jqUnit/js/jqUnit.js
    M src/webapp/tests/test-core/utils/js/IoCTestUtils.js

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

* amb26/FLUID-4330:
  FLUID-4794: Merge branch 'master' into FLUID-4330, apply new "forgetAll" enhancement to sanitise test
  FLUID-4873: First working test case for LUKE SKYWALKER OPTIONS and IOCSS! Cleaner workflow for component accessor hopefully allows "transformOptions" to pass through "distributOptions". Some linting, added "throws" to our set of jqUnit passthroughs.
  FLUID-4637: A test case from KING (not a bug in this case), and some comment and definition cleanup following review
  FLUID-4914: Resolve onto grade names during both value context and demands context resolution. Next step - abolish fluid.alias and Uploader.
  FLUID-4330: Two helpful test cases from KINGG reveal argument mangling in event dispatch through double resolution (FLUID-4631, FLUID-4634). fluid.withInstantiator finally bites the dust, and with it various annoying pathways trailing instantiators through RendererUtilities. RIP - IoC is now threadLocal free
  FLUID-4330: Removed "reverse merge" and tests, added non-api comments
  FLUID-4392: Additive demands blocks!!
  FLUID-4129: mergePolicy is now responded to from all sources. A mostly invalid test case from RenderUtilities has been lost which purportedly demonstrate the ability to IoC-resolve values within a protoTree
  FLUID-4330 - All test cases working again! Restored functionality to basic options transformation, eliminating old scheme based on demands for the function "fluid.transformOptions" - this will be unnecessary with FLUID-4392. Added temporary hack to fluid.embodyOptions to give special support for the record entry "preOptions", since support for the previous pathway whereby options would be "accidentally" doubly expanded has been removed which was being used by the IoC-based Uploader options transformation examples. Updated qunit latest trunk to get some bug fixes.
  FLUID-4330: All Reorderer configurations now working again with EXTREME GINGERNESS - beginnings of "Luke Skywalker" actually constructs a prophecy for his father first... support for "upwards injection" of previously unknown material from child. Corrected context names in Uploader since now mismatched demands blocks are discarded - a specific version number is now required to be computed somehow (for the time being, just by inclusion) otherwise no configuration is selected. New support for "members" directive allows arbitrary material to be copied to component root. Support for dynamic resolution of subcomponent types. Full ginger support for events, invokers, members, and the DOM binder! deferredInvokeExpander made the default expander, and made capable of all expansion cases. Removed more cases of withInstantiator, now pending total removal. Next steps: restore options transformation, allow dynamic mergePolicies, and multiple demands blocks! And then, the WAVE OF EXPLOSION ...
  FLUID-4330: First ACTUAL DEMONSTRATION of component-cyclic ginger options!!! Improvements to fluid.fail diagnostics in jqUnit environment - also FLUID-4707: no demands block resolution onto mismatched options - FLUID-4236: merging between decorator and demands block options FLUID-4733: regularised default value merge algorithm
  FLUID-4330: Final tidy-up - eliminated fluid.resolveEnvironment and kin, as well as fluid.expander.expandLight - consolidated into a single fluid.expand with consistent "initter" and "target" semantics for all source types
  FLUID-4330: Really now FINALLY ready for the ginger world. All outstanding work imported from FLUID-4392 additive demands block branch, and communication between embodyDemands and expandComponentOptions now occurs via the appropriate "mergeRecords" - "localRecord" now abolished. "mergeAllOptions" also abolished, along with support for encoding this inside the options record itself. Inverted sort order of listener priority so it can be shared with mergeRecord priority. Three test cases now failing - layoutReorderer (requires reimplementing, main aim of branch), IoC-driven options transformation, and an obscure RendererUtilitiesTest which relied on being able to fish "{arguments}.1" out of the soup. Expansion pathway is now completely clear - only remaining mess lies behind in embodyDemands handling of its own "localRecord".
  FLUID-4330: Moving towards the last unwrapping - passing mergeRecords from embodyDemands and eliminating localRecord from expandComponentOptions
  FLUID-4330: Further rationalisation in expandOptions - eliminated "preserveFromExpansion" in favour of mergePolicy modification, preparing final conversion to gingerness. Fixed further bugs in expansion pathway relating to "tall late things" with further tests for ginger cases. Improved messages in CachingTests.js
  FLUID-4330: All tests except LayoutReorderer now working again with rationalised and simplified instantiator system - instantiators are now looked up from component records in all cases where they can (only 4 instances of fluid.withInstantiator now remain) - unified lookup of component records within instantiators within "shadow record". Fix to qunit-composite to update link to individual test before test starts
  FLUID-4330: Another ginger test, reorganised tests
  FLUID-4330: First passing test case for SIMULTANEOUS MERGING AND EXPANSION!!
  FLUID-4330: Fixed version of replace mergePolicy and further tests bring all framework tests back into function except for LayoutReorderer. May now progress to stage 3 of work - test case for genuinely interleaved merging and expansion
  FLUID-4330: "reverse merge" removed from core merging algorithm, corrections to idiom throughout framework to deal with new semantic for "non-incremental merging". Core test cases now passing again, remaining failures within Reorderer (which now needs to be rewritten to use IoC proper) and Renderer Utilities failures with expanders which remain to be diagnosed
  FLUID-4330: Before main phase of ginger work. All framework test cases now passing again as a result of adjustment of model idiom of TableOfContents component as well as new and highly expensive "miniWorld" idiom
  FLUID-4330: Working version with expanders and elaborated tests!
  FLUID-4330: First working implementation of SELF-REFERENTIAL GINGER EXPANSION
  FLUID-4330: Experimental work exploring whether expansion can happen subsequent to merging (result - it probably can't). IoC test cases pass, but will be widespread failures in UIOptions etc.
  FLUID-4330: "Code for staring at" towards the GINGER WORLD


Compare: https://github.com/fluid-project/infusion/compare/585ae84e6520...91d5d1ccfee4


More information about the Commits mailing list