[Commits] [fluid-project/infusion] c90983: Merge branch 'master' into FLUID-4140

noreply at github.com noreply at github.com
Fri Apr 1 16:44:13 UTC 2011


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

Commit: c909836790cf7d9708d910dcc8dbb02587ed614e
    https://github.com/fluid-project/infusion/commit/c909836790cf7d9708d910dcc8dbb02587ed614e
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  M src/webapp/demos/inlineEdit/rich/html/inlineEdit.html
  M src/webapp/demos/inlineEdit/simple/html/inlineEdit.html
  M src/webapp/demos/keyboard-a11y/html/keyboard.html
  M src/webapp/demos/progress/html/progress.html
  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/renderer/js/RendererUtilities.js
  M src/webapp/tests/component-tests/progress/html/Progress-test.html
  M src/webapp/tests/component-tests/tooltip/html/Tooltip-test.html
  M src/webapp/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
  M src/webapp/tests/framework-tests/core/html/FluidIoC-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/FluidJSTests.js
  M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
  M src/webapp/tests/lib/qunit/js/qunit.js
  M src/webapp/tests/test-core/jqUnit/js/jqUnit.js
  M src/webapp/tests/test-core/utils/js/TestUtils.js

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


Commit: f7ad48acc7db46642fe376530ad024e92d3f1cf7
    https://github.com/fluid-project/infusion/commit/f7ad48acc7db46642fe376530ad024e92d3f1cf7
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  R src/webapp/components/uiOptions/css/UIOptionsPreview.css
  M src/webapp/components/uiOptions/html/UIOptions.html
  R src/webapp/components/uiOptions/html/UIOptionsPreview.html
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/demos/uiOptions/html/uiOptions.html
  A src/webapp/standalone-demos/uiOptions/css/UIOptionsPreview.css
  A src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  A src/webapp/standalone-demos/uiOptions/html/UIOptionsPreview.html

Log Message:
-----------
FLUID-4140: Turned the UIOptions template into an HTML fragment. Created a standalone demo for UIOptions. Made use of the IoC 'createOnEvent' feature instead of using the instantiator work around.


Commit: 58773708c64eac3e4b8d5568dccba02658833b95
    https://github.com/fluid-project/infusion/commit/58773708c64eac3e4b8d5568dccba02658833b95
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html

Log Message:
-----------
NOJIRA: Adding dependencies to the TextfieldSlider and UIEnhancer test files so that the tests pass again. The tests had broken at commit db474aab142b1a91032a72bb06f4909315127af9


Commit: 38d0d93bb98bd17a7dc8b741d3606933f57080b1
    https://github.com/fluid-project/infusion/commit/38d0d93bb98bd17a7dc8b741d3606933f57080b1
Author: Michelle D'Souza <michelled33 at gmail.com>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  R src/webapp/components/uiOptions/css/UIOptionsPreview.css
  M src/webapp/components/uiOptions/html/UIOptions.html
  R src/webapp/components/uiOptions/html/UIOptionsPreview.html
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  A src/webapp/standalone-demos/uiOptions/css/UIOptionsPreview.css
  A src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  A src/webapp/standalone-demos/uiOptions/html/UIOptionsPreview.html
  M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  M src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js

Log Message:
-----------
Merge remote branch 'colinbdclark/FLUID-4140'

* colinbdclark/FLUID-4140:
  NOJIRA: Adding dependencies to the TextfieldSlider and UIEnhancer test files so that the tests pass again. The tests had broken at commit db474aab142b1a91032a72bb06f4909315127af9
  FLUID-4140: Turned the UIOptions template into an HTML fragment. Created a standalone demo for UIOptions. Made use of the IoC 'createOnEvent' feature instead of using the instantiator work around.
  FLUID-4140: Changed the rendering of UIOptions to render into the container of the controls instead of the overall container so that Preview is only rendered once.
  FLUID-4140: Wired the preview.eventBinder up properly using Yura's instantiator trick. Added an onReady event to the Preview, since it initializes itself asynchronously due to the iFrame.
  FLUID-4140: Preview now works as a subcomponent of UI Options.
  FLUID-4140, FLUID-2126: Made the Preview a subcomponent, which almost works. Changed UI Options to only load the template if there is a template URL.
  FLUID-4140: Rough sketch of parameterization of Preview from UI Options. Not yet working, but I don't want to lose these changes.


Compare: https://github.com/fluid-project/infusion/compare/1d8f205...38d0d93



More information about the Commits mailing list