[Commits] [fluid-project/infusion] 83f03e: Merge branch 'master' into FLUID-5204

GitHub noreply at github.com
Fri Feb 7 17:00:08 EST 2014


  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: 83f03ecb71a31f21b65104d6650c1c5da0bca53d
      https://github.com/fluid-project/infusion/commit/83f03ecb71a31f21b65104d6650c1c5da0bca53d
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    A jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-dglg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-dglg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    A jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif b/src/lib/jquery/ui/css/fl-theme-lgdg/images/animated-overlay.gif
    R jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_555_256x240.png
    A jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    R jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png b/src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-icons_bdbdbb_256x240.png
    M src/components/inlineEdit/inlineEditDependencies.json
    M src/components/pager/js/PagedTable.js
    M src/components/pager/js/Pager.js
    M src/components/pager/pagerDependencies.json
    M src/components/reorderer/js/Reorderer.js
    M src/components/tabs/js/Tabs.js
    M src/components/tabs/tabsDependencies.json
    M src/components/tooltip/js/Tooltip.js
    M src/components/tooltip/tooltipDependencies.json
    M src/components/uploader/js/HTML5UploaderSupport.js
    M src/demos/fss/clearfix/html/clearfix.html
    M src/demos/fss/linearize/html/linearize.html
    M src/demos/inlineEdit/rich/html/inlineEdit.html
    M src/demos/inlineEdit/simple/html/inlineEdit.html
    M src/demos/pager/html/pager.html
    M src/demos/progress/html/progress.html
    M src/demos/renderer/html/renderer.html
    M src/demos/reorderer/layoutReorderer/css/layoutReorderer.css
    M src/framework/core/js/DataBinding.js
    M src/framework/core/js/Fluid.js
    M src/framework/core/js/FluidDocument.js
    M src/framework/core/js/FluidIoC.js
    M src/framework/core/js/FluidRequests.js
    M src/framework/core/js/FluidView.js
    M src/framework/core/js/ModelTransformation.js
    A src/framework/preferences/js/UIEnhancer.js
    R src/framework/preferences/js/UIEnhancer.js
    M src/integration-demos/sakai/html/pager-site-setting.html
    M src/lib/jquery/core/js/jquery.js
    R src/lib/jquery/plugins/ariaTabs/jQueryAriaTabsPluginDependencies.json
    R src/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js
    R src/lib/jquery/plugins/bgiframe/jQuerybgiframePluginDependencies.json
    R src/lib/jquery/plugins/bgiframe/js/jquery.bgiframe.js
    R src/lib/jquery/plugins/tooltip/README
    R src/lib/jquery/plugins/tooltip/css/jquery.tooltip.css
    R src/lib/jquery/plugins/tooltip/jQueryTooltipPluginDependencies.json
    R src/lib/jquery/plugins/tooltip/js/jquery.ui.tooltip.js
    A src/lib/jquery/ui/css/default-theme/images/animated-overlay.gif
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_dadada_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
    A src/lib/jquery/ui/css/default-theme/images/ui-bg_glass_95_fef1ec_1x400.png
    M src/lib/jquery/ui/css/default-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    R src/lib/jquery/ui/css/default-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_2e83ff_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_454545_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_888888_256x240.png
    M src/lib/jquery/ui/css/default-theme/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/default-theme/jquery.ui.theme.css
    M src/lib/jquery/ui/css/fl-theme-bw/bw.css
    A src/lib/jquery/ui/css/fl-theme-bw/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-bw/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-by/by.css
    A src/lib/jquery/ui/css/fl-theme-by/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-by/images/ui-icons_ffff00_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/coal.css
    A src/lib/jquery/ui/css/fl-theme-coal/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_flat_75_cccccc_40x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_25_575757_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_55_cccccc_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_65_000000_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_333333_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_highlight-soft_75_666666_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_333333_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_a3a3a3_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cccccc_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/fl-theme-coal/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-dglg/dglg.css
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_0_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-dglg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_0_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_555_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/images/ui-bg_flat_100_bdbdbb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-lgdg/lgdg.css
    A src/lib/jquery/ui/css/fl-theme-mist/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_0_2e83ff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_flat_75_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_65_ffffff_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_9dcaf6_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_glass_75_d9e8f7_1x400.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_highlight-soft_55_9dcaf6_1x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_222222_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_2e83ff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_454545_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_888888_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/images/ui-icons_cd0a0a_256x240.png
    M src/lib/jquery/ui/css/fl-theme-mist/mist.css
    A src/lib/jquery/ui/css/fl-theme-slate/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_666666_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_999999_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_cccccc_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ebebeb_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_glass_75_666666_1x400.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-hard_100_ebebeb_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_highlight-soft_75_999999_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-bg_inset-hard_100_ebebeb_1x100.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_666666_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ebebeb_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-slate/slate.css
    A src/lib/jquery/ui/css/fl-theme-wb/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-bg_flat_0_ffffff_40x100.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-wb/images/ui-icons_ffffff_256x240.png
    M src/lib/jquery/ui/css/fl-theme-wb/wb.css
    A src/lib/jquery/ui/css/fl-theme-yb/images/animated-overlay.gif
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_000000_40x100.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-bg_flat_0_ffff00_40x100.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_000000_256x240.png
    M src/lib/jquery/ui/css/fl-theme-yb/images/ui-icons_ffff00_256x240.png
    M src/lib/jquery/ui/css/fl-theme-yb/yb.css
    R src/lib/jquery/ui/css/jquery.ui.theme.css
    M src/lib/jquery/ui/jQueryUIWidgetsDependencies.json
    A src/lib/jquery/ui/js/jquery.ui.button.js
    M src/lib/jquery/ui/js/jquery.ui.core.js
    M src/lib/jquery/ui/js/jquery.ui.dialog.js
    M src/lib/jquery/ui/js/jquery.ui.draggable.js
    M src/lib/jquery/ui/js/jquery.ui.mouse.js
    M src/lib/jquery/ui/js/jquery.ui.position.js
    A src/lib/jquery/ui/js/jquery.ui.resizable.js
    M src/lib/jquery/ui/js/jquery.ui.slider.js
    M src/lib/jquery/ui/js/jquery.ui.tabs.js
    A src/lib/jquery/ui/js/jquery.ui.tooltip.js
    M src/lib/jquery/ui/js/jquery.ui.widget.js
    R src/lib/jquery/ui/js/ui-FLUID-readme.txt
    M src/standalone-demos/renderer/html/data-bound-menu.html
    M src/standalone-demos/renderer/html/id-based-inventory.html
    M src/standalone-demos/renderer/html/programmatic-tree-menu.html
    M src/standalone-demos/renderer/html/selector-based-inventory.html
    M src/tests/all-tests.html
    M src/tests/component-tests/inlineEdit/html/InlineEdit-test.html
    M src/tests/component-tests/inlineEdit/js/InlineEditTests.js
    M src/tests/component-tests/pager/html/PagedTable-test.html
    M src/tests/component-tests/pager/html/Pager-test.html
    M src/tests/component-tests/pager/js/PagedTableTests.js
    M src/tests/component-tests/reorderer/js/LayoutReordererTests.js
    M src/tests/component-tests/tabs/html/Tabs-test.html
    M src/tests/component-tests/tabs/js/TabsTests.js
    M src/tests/component-tests/tooltip/html/Tooltip-test.html
    M src/tests/component-tests/tooltip/js/TooltipTests.js
    M src/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html
    M src/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
    M src/tests/framework-tests/core/html/Caching-test.html
    M src/tests/framework-tests/core/html/FluidIoCView-test.html
    M src/tests/framework-tests/core/html/keyboard-a11y-test.html
    M src/tests/framework-tests/core/js/CachingTests.js
    M src/tests/framework-tests/core/js/FluidIoCTests.js
    M src/tests/framework-tests/core/js/ModelTransformationTests.js
    M src/tests/framework-tests/core/js/keyboard-a11y-tests.js
    M src/tests/framework-tests/preferences/all-tests.html
    M src/tests/framework-tests/preferences/html/Builder-test.html
    M src/tests/framework-tests/preferences/html/Enactors-test.html
    M src/tests/framework-tests/preferences/html/FullNoPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/FullPreviewPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/Panels-test.html
    M src/tests/framework-tests/preferences/html/PrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/SeparatedPanelPrefsEditor-test.html
    M src/tests/framework-tests/preferences/html/UIEnhancer-test.html
    M src/tests/framework-tests/preferences/js/PanelsTests.js
    M src/tests/framework-tests/renderer/html/Renderer-test.html
    M src/tests/framework-tests/renderer/html/RendererUtilities-test.html
    M src/tests/lib/mockjax/js/jquery.mockjax.js
    R src/tests/lib/qunit/VERSION
    M src/tests/lib/qunit/addons/composite/README.md
    R src/tests/lib/qunit/addons/composite/index.html
    M src/tests/lib/qunit/addons/composite/qunit-composite.css
    M src/tests/lib/qunit/addons/composite/qunit-composite.js
    M src/tests/lib/qunit/css/qunit.css
    M src/tests/lib/qunit/js/qunit.js
    M src/tests/manual-tests/html/dropdown.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreview.html
    M src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreview.html
    M src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
    M src/tests/manual-tests/html/renderer-component-types.html
    M src/tests/test-core/testTests/html/Testing-test.html
    M src/tests/test-core/testTests/js/TestingTests.js
    M src/tests/test-core/utils/js/IoCTestUtils.js

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


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

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

  Log Message:
  -----------
  FLUID-5268: Correction and test cases for new "afterDestroy" event


  Commit: 22ede0adb2419237b114709a3da4264080373a3f
      https://github.com/fluid-project/infusion/commit/22ede0adb2419237b114709a3da4264080373a3f
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

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

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

* amb26/FLUID-5268:
  FLUID-5268: Correction and test cases for new "afterDestroy" event


Compare: https://github.com/fluid-project/infusion/compare/c0e08caca633...22ede0adb241


More information about the Commits mailing list