[Commits] [fluid-project/infusion] 42f56d: Merge branch 'FLUID-5127' into FLUID-5089

GitHub noreply at github.com
Thu Oct 31 15:30:54 EDT 2013


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 42f56d454044cfd968ea2f6cb76b464e6161bc2d
      https://github.com/fluid-project/infusion/commit/42f56d454044cfd968ea2f6cb76b464e6161bc2d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

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

  Log Message:
  -----------
  Merge branch 'FLUID-5127' into FLUID-5089


  Commit: 55576da771fee196484af6ee5d09700c43682cf7
      https://github.com/fluid-project/infusion/commit/55576da771fee196484af6ee5d09700c43682cf7
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M src/demos/keyboard-a11y/js/five-star.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/DataBindingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

  Log Message:
  -----------
  FLUID-3674: Working implementation of declarative change binding and firing, for local and IoC-resolved model-bearing components! Five-star demo updated and simplified to show new features.


  Commit: a385c0e3c560f24c58bbacbbe4712ce586c5da0d
      https://github.com/fluid-project/infusion/commit/a385c0e3c560f24c58bbacbbe4712ce586c5da0d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/test-core/testTests/js/TestingTests.js

  Log Message:
  -----------
  FLUID-3674: Merged up with master, added tests for source treatment in firing and listening, renamed source guarding property in listeners to "guardSource".

Merge branch 'master' into FLUID-3674

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


  Commit: bb78778e1e97d839fd0983efe9077ce64eacffb0
      https://github.com/fluid-project/infusion/commit/bb78778e1e97d839fd0983efe9077ce64eacffb0
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M .gitignore
    M build-scripts/build.properties
    M build-scripts/build.xml
    A build-scripts/prefsFramework/js/BrowserStylesheetHandler.js
    A build-scripts/prefsFramework/js/CSSGenerator.js
    A build-scripts/prefsFramework/js/RhinoStylesheetHandler.js
    A build-scripts/prefsFramework/js/StylesheetImportant.js
    R build-scripts/uiOptions/js/BrowserStylesheetHandler.js
    R build-scripts/uiOptions/js/CSSGenerator.js
    R build-scripts/uiOptions/js/RhinoStylesheetHandler.js
    R build-scripts/uiOptions/js/StylesheetImportant.js
    A src/components/slidingPanel/js/SlidingPanel.js
    A src/components/slidingPanel/slidingPanelDependencies.json
    A src/components/textfieldSlider/js/TextfieldSlider.js
    A src/components/textfieldSlider/textfieldSliderDependencies.json
    A src/components/uiOptions/UIOptions.js
    R src/components/uiOptions/css/FatPanelUIOptions.css
    R src/components/uiOptions/css/FatPanelUIOptionsFrame.css
    R src/components/uiOptions/css/FullNoPreviewUIOptions.css
    R src/components/uiOptions/css/FullPreviewUIOptions.css
    R src/components/uiOptions/css/FullUIOptions.css
    R src/components/uiOptions/css/UIOptions.css
    R src/components/uiOptions/css/ie8.css
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    R src/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    R src/components/uiOptions/html/FatPanelUIOptions.html
    R src/components/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/components/uiOptions/html/FullNoPreviewUIOptions.html
    R src/components/uiOptions/html/FullPreviewUIOptions.html
    R src/components/uiOptions/html/UIOptionsTemplate-contrast.html
    R src/components/uiOptions/html/UIOptionsTemplate-layout.html
    R src/components/uiOptions/html/UIOptionsTemplate-lineSpace.html
    R src/components/uiOptions/html/UIOptionsTemplate-links.html
    R src/components/uiOptions/html/UIOptionsTemplate-textFont.html
    R src/components/uiOptions/html/UIOptionsTemplate-textSize.html
    R src/components/uiOptions/images/default/fatpanelbg.png
    R src/components/uiOptions/js/AuxBuilder.js
    R src/components/uiOptions/js/Builder.js
    R src/components/uiOptions/js/Enactors.js
    R src/components/uiOptions/js/FatPanelUIOptions.js
    R src/components/uiOptions/js/FullNoPreviewUIOptions.js
    R src/components/uiOptions/js/FullPreviewUIOptions.js
    R src/components/uiOptions/js/ModelRelay.js
    R src/components/uiOptions/js/Panels.js
    R src/components/uiOptions/js/PrimaryBuilder.js
    R src/components/uiOptions/js/SlidingPanel.js
    R src/components/uiOptions/js/StarterGrades.js
    R src/components/uiOptions/js/StarterSchemas.js
    R src/components/uiOptions/js/Store.js
    R src/components/uiOptions/js/TextfieldSlider.js
    R src/components/uiOptions/js/UIEnhancer.js
    R src/components/uiOptions/js/UIOptions.js
    R src/components/uiOptions/js/URLUtilities.js
    R src/components/uiOptions/messages/contrast.json
    R src/components/uiOptions/messages/lineSpace.json
    R src/components/uiOptions/messages/links.json
    R src/components/uiOptions/messages/tableOfContents.json
    R src/components/uiOptions/messages/textFont.json
    R src/components/uiOptions/messages/textSize.json
    R src/components/uiOptions/messages/uiOptions.json
    M src/components/uiOptions/uiOptionsDependencies.json
    M src/demos/index.html
    M src/demos/portal/css/portal.css
    M src/demos/portal/js/demoAssets.js
    A src/demos/uiOptions/css/ie8.css
    A src/demos/uiOptions/css/uiOptions.css
    A src/demos/uiOptions/demo.html
    R src/demos/uiOptions/gradesDemo/css/uiOptions.css
    R src/demos/uiOptions/gradesDemo/demo.html
    R src/demos/uiOptions/gradesDemo/html/uiOptions.html
    R src/demos/uiOptions/gradesDemo/js/uiOptionsDemo.js
    A src/demos/uiOptions/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/css/uiOptions.css
    R src/demos/uiOptions/schemaDemo/demo.html
    R src/demos/uiOptions/schemaDemo/html/uiOptions.html
    R src/demos/uiOptions/schemaDemo/js/uiOptionsDemo.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/ModelTransformation.js
    M src/framework/core/js/ModelTransformationTransforms.js
    A src/framework/preferences/css/FullNoPreviewPrefsEditor.css
    A src/framework/preferences/css/FullPrefsEditor.css
    A src/framework/preferences/css/FullPreviewPrefsEditor.css
    A src/framework/preferences/css/PrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditor.css
    A src/framework/preferences/css/SeparatedPanelPrefsEditorFrame.css
    A src/framework/preferences/css/ie8.css
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.eot
    A src/framework/preferences/fonts/InfusionIcons-PrefsEditor.ttf
    A src/framework/preferences/html/FullNoPreviewPrefsEditor.html
    A src/framework/preferences/html/FullPreviewPrefsEditor.html
    A src/framework/preferences/html/PrefsEditorTemplate-contrast.html
    A src/framework/preferences/html/PrefsEditorTemplate-layout.html
    A src/framework/preferences/html/PrefsEditorTemplate-lineSpace.html
    A src/framework/preferences/html/PrefsEditorTemplate-links.html
    A src/framework/preferences/html/PrefsEditorTemplate-textFont.html
    A src/framework/preferences/html/PrefsEditorTemplate-textSize.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditor.html
    A src/framework/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/framework/preferences/images/default/separatedpanelbg.png
    A src/framework/preferences/js/AuxBuilder.js
    A src/framework/preferences/js/Builder.js
    A src/framework/preferences/js/Enactors.js
    A src/framework/preferences/js/FullNoPreviewPrefsEditor.js
    A src/framework/preferences/js/FullPreviewPrefsEditor.js
    A src/framework/preferences/js/ModelRelay.js
    A src/framework/preferences/js/Panels.js
    A src/framework/preferences/js/PrefsEditor.js
    A src/framework/preferences/js/PrimaryBuilder.js
    A src/framework/preferences/js/SeparatedPanelPrefsEditor.js
    A src/framework/preferences/js/StarterGrades.js
    A src/framework/preferences/js/StarterSchemas.js
    A src/framework/preferences/js/Store.js
    A src/framework/preferences/js/UIEnhancer.js
    A src/framework/preferences/js/URLUtilities.js
    A src/framework/preferences/messages/contrast.json
    A src/framework/preferences/messages/lineSpace.json
    A src/framework/preferences/messages/links.json
    A src/framework/preferences/messages/prefsEditor.json
    A src/framework/preferences/messages/tableOfContents.json
    A src/framework/preferences/messages/textFont.json
    A src/framework/preferences/messages/textSize.json
    A src/framework/preferences/preferencesDependencies.json
    M src/tests/all-tests.html
    A src/tests/component-tests/slidingPanel/html/SlidingPanel-test.html
    A src/tests/component-tests/slidingPanel/js/SlidingPanelTests.js
    A src/tests/component-tests/textfieldSlider/html/TextfieldSlider-test.html
    A src/tests/component-tests/textfieldSlider/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/all-tests.html
    R src/tests/component-tests/uiOptions/css/test-theme.css
    R src/tests/component-tests/uiOptions/html/AuxBuilder-test.html
    R src/tests/component-tests/uiOptions/html/Builder-test.html
    R src/tests/component-tests/uiOptions/html/CSSGenerator-test.html
    R src/tests/component-tests/uiOptions/html/Enactors-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FatPanelUIOptionsFrame.html
    R src/tests/component-tests/uiOptions/html/FullNoPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/FullPreviewUIOptions-test.html
    R src/tests/component-tests/uiOptions/html/ModelRelay-test.html
    R src/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/Panels-test.html
    R src/tests/component-tests/uiOptions/html/PrimaryBuilder-test.html
    R src/tests/component-tests/uiOptions/html/SlidingPanel-test.html
    R src/tests/component-tests/uiOptions/html/Store-test.html
    R src/tests/component-tests/uiOptions/html/TestPreviewTemplate.html
    R src/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
    R src/tests/component-tests/uiOptions/html/UIEnhancer-test.html
    R src/tests/component-tests/uiOptions/html/UIOptions-test.html
    R src/tests/component-tests/uiOptions/html/URLUtilities-test.html
    R src/tests/component-tests/uiOptions/js/AuxBuilderTests.js
    R src/tests/component-tests/uiOptions/js/BuilderTests.js
    R src/tests/component-tests/uiOptions/js/CSSGeneratorTests.js
    R src/tests/component-tests/uiOptions/js/EnactorsTests.js
    R src/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/FullPreviewUIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    R src/tests/component-tests/uiOptions/js/ModelRelayTests.js
    R src/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/PanelsTests.js
    R src/tests/component-tests/uiOptions/js/PrimaryBuilderTests.js
    R src/tests/component-tests/uiOptions/js/SlidingPanelTests.js
    R src/tests/component-tests/uiOptions/js/StoreTests.js
    R src/tests/component-tests/uiOptions/js/TextfieldSliderTests.js
    R src/tests/component-tests/uiOptions/js/UIEnhancerTests.js
    R src/tests/component-tests/uiOptions/js/UIOptionsTests.js
    R src/tests/component-tests/uiOptions/js/URLUtilitiesTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/FluidJSTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js
    A src/tests/framework-tests/preferences/all-tests.html
    A src/tests/framework-tests/preferences/css/test-theme.css
    A src/tests/framework-tests/preferences/html/AuxBuilder-test.html
    A src/tests/framework-tests/preferences/html/Builder-test.html
    A src/tests/framework-tests/preferences/html/CSSGenerator-test.html
    A src/tests/framework-tests/preferences/html/Enactors-test.html
    A src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/ModelRelay-test.html
    A src/tests/framework-tests/preferences/html/PageEnhancer-test.html
    A src/tests/framework-tests/preferences/html/Panels-test.html
    A src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/PrimaryBuilder-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    A src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditorFrame.html
    A src/tests/framework-tests/preferences/html/Store-test.html
    A src/tests/framework-tests/preferences/html/TestPreviewTemplate.html
    A src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    A src/tests/framework-tests/preferences/html/URLUtilities-test.html
    A src/tests/framework-tests/preferences/js/AuxBuilderTests.js
    A src/tests/framework-tests/preferences/js/BuilderTests.js
    A src/tests/framework-tests/preferences/js/CSSGeneratorTests.js
    A src/tests/framework-tests/preferences/js/EnactorsTests.js
    A src/tests/framework-tests/preferences/js/FullNoPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/FullPreviewPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/IntegrationTestsCommon.js
    A src/tests/framework-tests/preferences/js/ModelRelayTests.js
    A src/tests/framework-tests/preferences/js/PageEnhancerTests.js
    A src/tests/framework-tests/preferences/js/PanelsTests.js
    A src/tests/framework-tests/preferences/js/PrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/PrimaryBuilderTests.js
    A src/tests/framework-tests/preferences/js/SeparatedPanelPrefsEditorTests.js
    A src/tests/framework-tests/preferences/js/StoreTests.js
    A src/tests/framework-tests/preferences/js/UIEnhancerTests.js
    A src/tests/framework-tests/preferences/js/URLUtilitiesTests.js
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/framework-tests/renderer/js/RendererUtilitiesTests.js
    M src/tests/manual-tests/ReadMe.txt
    A src/tests/manual-tests/css/PrefsEditorFullPage.css
    R src/tests/manual-tests/css/UIOptionsFullPage.css
    M src/tests/manual-tests/html/SomeKindOfNews.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    A src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    A src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    A src/tests/manual-tests/html/prefsEditorPreview.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanel.html
    A src/tests/manual-tests/html/prefsEditorSeparatedPanelSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    R src/tests/manual-tests/html/uiOptionsFullWithoutPreviewSchema.html
    R src/tests/manual-tests/html/uiOptionsPreview.html
    A src/tests/manual-tests/js/prefsEditorFullPage.js
    A src/tests/manual-tests/js/prefsEditorFullPageSchema.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanel.js
    A src/tests/manual-tests/js/prefsEditorSeparatedPanelSchema.js
    M src/tests/manual-tests/js/someKindOfNews.js
    R src/tests/manual-tests/js/uiOptionsFullPage.js
    R src/tests/manual-tests/js/uiOptionsFullPageSchema.js

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


  Commit: 1a34a9046c2d9ee4b6801f3df59f186af1b84c0f
      https://github.com/fluid-project/infusion/commit/1a34a9046c2d9ee4b6801f3df59f186af1b84c0f
  Author: Colin Clark <colinbdclark at gmail.com>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M src/demos/keyboard-a11y/js/five-star.js
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidIoC.js
    M src/tests/framework-tests/core/js/DataBindingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js

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

* amb26/FLUID-4258:
  FLUID-3674: Working implementation of declarative change binding and firing, for local and IoC-resolved model-bearing components! Five-star demo updated and simplified to show new features.

Conflicts:
	src/demos/keyboard-a11y/js/five-star.js


Compare: https://github.com/fluid-project/infusion/compare/b20510c949cd...1a34a9046c2d


More information about the Commits mailing list