[Commits] [fluid-project/infusion] cf545f: FLUID-5029: Corrected matching for child selector ...

GitHub noreply at github.com
Wed Jun 26 20:59:15 EDT 2013 

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: cf545f1ae706827fa83fbd61ffd364db2a4fd323
      https://github.com/fluid-project/infusion/commit/cf545f1ae706827fa83fbd61ffd364db2a4fd323
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

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

  Log Message:
  -----------
  FLUID-5029: Corrected matching for child selector ">", tidied IoC tests a little


  Commit: a70f84562c609c93d6df78868c6a62e942f9cd4b
      https://github.com/fluid-project/infusion/commit/a70f84562c609c93d6df78868c6a62e942f9cd4b
  Author: Antranig Basman <antranig.basman at colorado.edu>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/css/FatPanelUIOptions.css
    M src/webapp/components/uiOptions/css/FatPanelUIOptionsFrame.css
    M src/webapp/components/uiOptions/css/FullUIOptions.css
    M src/webapp/components/uiOptions/css/UIOptions.css
    M src/webapp/components/uiOptions/css/ie8.css
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.eot
    A src/webapp/components/uiOptions/fonts/InfusionIcons-UIOptions.ttf
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-contrast.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-lineSpacer.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textFont.html
    M src/webapp/components/uiOptions/html/UIOptionsTemplate-textSizer.html
    R src/webapp/components/uiOptions/images/bw/uio_icon_bigA_hc_20x20.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_button.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_cancel_hc_13x13.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_layoutandnavigation_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesNarrow_hc_16x12.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linesWide_hc_16x21.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_linksandbuttons_hc_18x18.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_list.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_reset_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_save_hc_13x13.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_smallA_hc_10x10.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hcInverted_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_16x16.png
    R src/webapp/components/uiOptions/images/bw/uio_icon_textanddisplay_hc_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_bigA_blackYellow_20x20.png
    R src/webapp/components/uiOptions/images/by/uio_icon_button.png
    R src/webapp/components/uiOptions/images/by/uio_icon_cancel_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/by/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_layoutandnavigation_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesNarrow_blackYellow_16x12.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linesWide_blackYellow_16x21.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_linksandbuttons_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/by/uio_icon_list.png
    R src/webapp/components/uiOptions/images/by/uio_icon_reset_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_save_blackYellow_13x13.png
    R src/webapp/components/uiOptions/images/by/uio_icon_smallA_blackYellow_10x10.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellowInverted_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_16x16.png
    R src/webapp/components/uiOptions/images/by/uio_icon_textanddisplay_blackYellow_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_bigA_default_20x20.png
    R src/webapp/components/uiOptions/images/default/uio_icon_button.png
    R src/webapp/components/uiOptions/images/default/uio_icon_cancel_default_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/default/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_layoutandnavigation_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesNarrow_default_16x12.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linesWide_default_16x21.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_linksandbuttons_default_18x18.png
    R src/webapp/components/uiOptions/images/default/uio_icon_list.png
    R src/webapp/components/uiOptions/images/default/uio_icon_reset_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_save_default_13x13.png
    R src/webapp/components/uiOptions/images/default/uio_icon_smallA_default_10x10.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_defaultInverted_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_16x16.png
    R src/webapp/components/uiOptions/images/default/uio_icon_textanddisplay_default_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_bigA_hci_20x20.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_button.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_cancel_hci_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_layoutandnavigation_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesNarrow_hci_16x12.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linesWide_hci_16x21.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_linksandbuttons_hci_18x18.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_list.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_reset_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_save_hci_13x13.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_smallA_hci_10x10.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hciInverted_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_16x16.png
    R src/webapp/components/uiOptions/images/wb/uio_icon_textanddisplay_hci_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_bigA_yellowBlack_20x20.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_button.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_cancel_yellowBlack_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_contrast.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_indicator.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_layoutandnavigation_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_lineSpace.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesNarrow_yellowBlack_16x12.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linesWide_yellowBlack_16x21.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_linksandbuttons_yellowBlack_18x18.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_list.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_reset_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_save_yellowBlack_13x13.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_smallA_yellowBlack_10x10.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textSize.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textStyle.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlackInverted_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_16x16.png
    R src/webapp/components/uiOptions/images/yb/uio_icon_textanddisplay_yellowBlack_18x18.png
    M src/webapp/components/uiOptions/js/Enactor.js
    M src/webapp/components/uiOptions/js/FatPanelUIOptions.js
    M src/webapp/components/uiOptions/js/ModelRelay.js
    M src/webapp/components/uiOptions/js/SettingsPanels.js
    M src/webapp/components/uiOptions/js/Store.js
    M src/webapp/components/uiOptions/js/UIEnhancer.js
    M src/webapp/components/uiOptions/js/UIOptions.js
    A src/webapp/components/uiOptions/js/i18n.js
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/demos/uiOptions/css/uiOptions.css
    M src/webapp/demos/uiOptions/html/uiOptions.html
    M src/webapp/demos/uiOptions/js/uiOptionsDemo.js
    M src/webapp/framework/core/js/DataBinding.js
    M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
    M src/webapp/integration-demos/uportal/js/portal.js
    A src/webapp/lib/fonts/fontsDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    M src/webapp/tests/component-tests/uiOptions/all-tests.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
    A src/webapp/tests/component-tests/uiOptions/html/I18n-test.html
    M src/webapp/tests/component-tests/uiOptions/html/ModelRelay-test.html
    M src/webapp/tests/component-tests/uiOptions/html/PageEnhancer-test.html
    M src/webapp/tests/component-tests/uiOptions/html/SettingsPanels-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/EnactorTests.js
    M src/webapp/tests/component-tests/uiOptions/js/FatPanelUIOptionsTests.js
    A src/webapp/tests/component-tests/uiOptions/js/I18nTests.js
    M src/webapp/tests/component-tests/uiOptions/js/IntegrationTestsCommon.js
    M src/webapp/tests/component-tests/uiOptions/js/PageEnhancerTests.js
    M src/webapp/tests/component-tests/uiOptions/js/SettingsPanelsTests.js
    M src/webapp/tests/component-tests/uiOptions/js/StoreTests.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/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html
    M src/webapp/tests/manual-tests/js/someKindOfNews.js
    M src/webapp/tests/manual-tests/js/uiOptionsFullPage.js

  Log Message:
  -----------
  FLUID-5012: Corrected merge conflict in IOC tests

Merge branch 'master' into FLUID-5029

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


  Commit: 16b03e76462751a796912b2870a4651232fd53dc
      https://github.com/fluid-project/infusion/commit/16b03e76462751a796912b2870a4651232fd53dc
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

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

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

* amb26/FLUID-5029:
  FLUID-5029: Corrected matching for child selector ">", tidied IoC tests a little


Compare: https://github.com/fluid-project/infusion/compare/ba09d84abaad...16b03e764627

More information about the Commits mailing list