[Commits] [fluid-project/infusion] 26b4c3: Merge branch 'master' into FLUID-4109

noreply at github.com noreply at github.com
Mon Jun 6 21:50:43 UTC 2011


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

Commit: 26b4c3180178b57ec9515142d2c707ef57416bde
    https://github.com/fluid-project/infusion/commit/26b4c3180178b57ec9515142d2c707ef57416bde
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-06-06 (Mon, 06 Jun 2011)

Changed paths:
  M build-scripts/build.properties
  M src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
  A src/webapp/components/uiOptions/css/FatPanelUIOptions.css
  A src/webapp/components/uiOptions/css/FullNoPreviewUIOptions.css
  A src/webapp/components/uiOptions/css/FullPreviewUIOptions.css
  A src/webapp/components/uiOptions/css/FullUIOptions.css
  R src/webapp/components/uiOptions/css/Slider.css
  M src/webapp/components/uiOptions/css/UIOptions.css
  A src/webapp/components/uiOptions/html/FatPanelUIOptions.html
  A src/webapp/components/uiOptions/html/FullNoPreviewUIOptions.html
  A src/webapp/components/uiOptions/html/FullPreviewUIOptions.html
  R src/webapp/components/uiOptions/html/UIOptions.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-layout.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-links.html
  M src/webapp/components/uiOptions/html/UIOptionsTemplate-text.html
  A src/webapp/components/uiOptions/images/select_arrow.png
  A src/webapp/components/uiOptions/images/uio_icon_bigA_20x20.png
  A src/webapp/components/uiOptions/images/uio_icon_cancel_13x13.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_layoutandnavigation_inverted_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_linesNarrow_16x12.png
  A src/webapp/components/uiOptions/images/uio_icon_linesWide_16x21.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_linksandbuttons_inverted_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_reset_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_save_13x13.png
  A src/webapp/components/uiOptions/images/uio_icon_sliderhandle.png
  A src/webapp/components/uiOptions/images/uio_icon_smallA_10x10.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_16x16.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_18x18.png
  A src/webapp/components/uiOptions/images/uio_icon_textanddisplay_inverted_16x16.png
  A src/webapp/components/uiOptions/js/FatPanelUIOptions.js
  A src/webapp/components/uiOptions/js/FullNoPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/FullPreviewUIOptions.js
  A src/webapp/components/uiOptions/js/SlidingPanel.js
  A src/webapp/components/uiOptions/js/Store.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/components/uiOptions/uiOptionsDependencies.json
  M src/webapp/demos/fss/clearfix/css/clearfix.css
  M src/webapp/demos/fss/clearfix/html/clearfix.html
  R src/webapp/demos/lib/jquery/jQuery-LICENSE.txt
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_75_ffffff_40x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_65_ffffff_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_dadada_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_222222_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_2e83ff_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_454545_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_888888_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_cd0a0a_256x240.png
  R src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  R src/webapp/demos/lib/jquery/ui/js/jquery.ui.tabs.js
  A src/webapp/demos/uiOptions/FatPanelUIOptions/css/uiOptions.css
  A src/webapp/demos/uiOptions/FatPanelUIOptions/demo.html
  A src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptions.css
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptionsPreview.css
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/demo.html
  A src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/css/UIOptionsPreview.css
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/css/uiOptions.css
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/demo.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/500x327_mint_truffle.jpg
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/border_1.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/expand_collapse.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/h1.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/main_bg.png
  A src/webapp/demos/uiOptions/FullPreviewUIOptions/images/mintleaf.png
  R src/webapp/demos/uiOptions/css/uiOptions.css
  R src/webapp/demos/uiOptions/demo.html
  R src/webapp/demos/uiOptions/html/UIOptionsPreview.html
  R src/webapp/demos/uiOptions/html/uiOptions.html
  R src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/framework/fss/css/fss-layout.css
  M src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  M src/webapp/integration-demos/uportal/html/portal.html
  M src/webapp/integration-demos/uportal/js/portal.js
  A src/webapp/lib/jquery/plugins/ariaTabs/jQueryAriaTabsPluginDependencies.json
  A src/webapp/lib/jquery/plugins/ariaTabs/js/ui.ariaTabs.js
  M src/webapp/lib/jquery/ui/jQueryUIWidgetsDependencies.json
  A src/webapp/lib/jquery/ui/js/jquery.ui.tabs.js
  A src/webapp/standalone-demos/uiOptions/css/SomeKindOfNews.css
  R src/webapp/standalone-demos/uiOptions/css/UIOptionsPreview.css
  A src/webapp/standalone-demos/uiOptions/html/SomeKindOfNews.html
  R src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  R src/webapp/standalone-demos/uiOptions/html/UIOptionsPreview.html
  R src/webapp/standalone-demos/uiOptions/images/500x327_mint_truffle.jpg
  A src/webapp/standalone-demos/uiOptions/images/bg-grad.png
  R src/webapp/standalone-demos/uiOptions/images/border_1.png
  R src/webapp/standalone-demos/uiOptions/images/expand_collapse.png
  R src/webapp/standalone-demos/uiOptions/images/h1.png
  R src/webapp/standalone-demos/uiOptions/images/main_bg.png
  R src/webapp/standalone-demos/uiOptions/images/mintleaf.png
  A src/webapp/standalone-demos/uiOptions/js/someKindOfNews.js
  A src/webapp/tests/component-tests/uiOptions/html/SlidingPanel-test.html
  A src/webapp/tests/component-tests/uiOptions/html/Store-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  A src/webapp/tests/component-tests/uiOptions/js/SlidingPanelTests.js
  A 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

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


Commit: 958507e2bd233ca893065a8e92996addaa26c2d2
    https://github.com/fluid-project/infusion/commit/958507e2bd233ca893065a8e92996addaa26c2d2
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-06-06 (Mon, 06 Jun 2011)

Changed paths:
  M build-scripts/build.js
  M build-scripts/build.xml

Log Message:
-----------
FLUID-4109: Instead of adding the front slash to the actual build.js, we can modify the rules in the build.xml instead. Change line 18
<property name="regexStartJS" value="<script{1,1}?.*" /> to
<property name="regexStartJS" value="<script{1,1}?.*\/" />


Commit: a60418a57b88923ff2dd33d61b44c5f49bbeafac
    https://github.com/fluid-project/infusion/commit/a60418a57b88923ff2dd33d61b44c5f49bbeafac
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-06-06 (Mon, 06 Jun 2011)

Changed paths:
  M build-scripts/build.xml

Log Message:
-----------
Merge remote branch 'harris/FLUID-4109'

* harris/FLUID-4109:
  FLUID-4109: Instead of adding the front slash to the actual build.js, we can modify the rules in the build.xml instead. Change line 18 <property name="regexStartJS" value="<script{1,1}?.*" /> to <property name="regexStartJS" value="<script{1,1}?.*\/" />
  FLUID-4109: Edited buildRegExpression() to generate the regular expression with a directory separator in front of the module, so then the (.*) is only comparing the path, but not the filename itself.  Allowing us to have more control over which file to be replaced.


Compare: https://github.com/fluid-project/infusion/compare/be3fb27...a60418a



More information about the Commits mailing list