[Commits] [fluid-project/infusion] 1e30af: Merge branch 'cindyli/FLUID-4207'

noreply at github.com noreply at github.com
Thu May 12 08:11:20 UTC 2011


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

Commit: 1e30af23a68ec2d0257133cbb2b1e4ab552d25fc
    https://github.com/fluid-project/infusion/commit/1e30af23a68ec2d0257133cbb2b1e4ab552d25fc
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/html/UIOptions.html
  R src/webapp/components/uiOptions/images/500x327_mint_truffle.jpg
  R src/webapp/components/uiOptions/images/border_1.png
  R src/webapp/components/uiOptions/images/expand_collapse.png
  R src/webapp/components/uiOptions/images/h1.png
  R src/webapp/components/uiOptions/images/main_bg.png
  R src/webapp/components/uiOptions/images/mintleaf.png
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/uiOptions/html/uiOptions.html
  M src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  A src/webapp/standalone-demos/uiOptions/images/500x327_mint_truffle.jpg
  A src/webapp/standalone-demos/uiOptions/images/border_1.png
  A src/webapp/standalone-demos/uiOptions/images/expand_collapse.png
  A src/webapp/standalone-demos/uiOptions/images/h1.png
  A src/webapp/standalone-demos/uiOptions/images/main_bg.png
  A src/webapp/standalone-demos/uiOptions/images/mintleaf.png
  M src/webapp/tests/component-tests/uiOptions/html/TextfieldSlider-test.html
  M src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  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 'cindyli/FLUID-4207'

* cindyli/FLUID-4207: (27 commits)
  FLUID-4171: Used change applier guards listener for the value validation for the slider text field input. Replaced the long chain of slider options assignments with jQuery extend call. These changes complete part of Antranig's code review feedback but not all. More adjustments are needed and followed.
  FLUID-4171: Separated setSliderValueAndArial() into 2 functions and fixed the spelling mistake.
  FLUID-4171: More adjustments according to code review feedbacks: encapsulate the slider init/setter method into slider sub-component itself.
  FLUID-4171: Adjusted various places according to Justin's code review comments.
  FLUID-4207: IoCified UI Enhancer. "autoInit" is not implemented because the container of UIEnhancer needs to be manipulated before the component initialization.
  FLUID-4171: fixed the bug that was introduced by the last commit where the wrong duplication was removed.
  FLUID-4171: removed the duplicated definition of textfieldSlider.events.modelChanged listener that has been defined in the defaults block
  FLUID-4171: Fires textfield slider refreshView() at modelChanged event instead of the other way around.
  FLUID-4171: Refactorred the text field slider to controls the behavior of the sub-components "textfield" and "slider" from the parent component. Also fixed the broken tests for UIOptions, UIEnhancer, textfield slider.
  FLUID-4171: The commit of a fully functioned text field slider that is enhanced in the ways: 1. allow the pass of the default min/max values from the top-level uiOptions component to the sub-component textfieldSlider; 2. make the preview respond to the sliders; 3. put the ARIA back in; 4. fix the lagging response of "reset" and "cancel" buttons due to the misplaced binding of the button events.
  FLUID-4171: The textfield sliders now render. We still need to set the options correctly for each of the sliders and make the preview respond to changes in the sliders.
  FLUID-4171: Pass the name of the function for produceTree as an an argument thru component defaults. Also auto-init fluid.uiEnhancer.cookieStore in UIEnhancer.js
  FLUID-4171: Added range handling in a non-ideal way - refactoring to come.
  FLUID-4171: Made the textfield respond to changes in the slider.
  FLUID-4171: fixed the empty template js error at turning on "table of content", by specifying the correct template url in caller html
  FLUID-3301: Set "arial" as initial default value of font style, instead of "serif".
  FLUID-4171: 1. manipulate change applier instead of directly on model whenever possible; 2. fix the initial default value of drop down list box "font style"; 3. fix the turning on/off on background images by moving "images" folder from components/uiOptions/ to "standalone-demos/uiOptions".
  FLUID-4171: Fixed the buttons' actions that were broken due to the re-construction of components fluid.uiOptions and fluid.uiOptions.controls. Also autoInitted the renderer component fluid.uiOptions.controls.
  FLUID-4171: TextfieldSlider now renders, next step is binding event handlers.
  FLUID-4171: Having problem with autoInit-ing a renderer component. A push-in of a interim version for Antranig's help
  ...


Commit: 434e7d8b832e4d551e4783cc536a8c9e15155da9
    https://github.com/fluid-project/infusion/commit/434e7d8b832e4d551e4783cc536a8c9e15155da9
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-05-12 (Thu, 12 May 2011)

Changed paths:
  M src/webapp/components/tableOfContents/js/TableOfContents.js
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_flat_75_ffffff_40x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_65_ffffff_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_dadada_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_222222_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_2e83ff_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_454545_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_888888_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/images/ui-icons_cd0a0a_256x240.png
  M src/webapp/demos/lib/jquery/ui/css/demo-theme/jquery.ui.theme.css
  M src/webapp/demos/uiOptions/js/uiOptions.js
  M src/webapp/standalone-demos/uiOptions/html/UIOptions.html
  M src/webapp/standalone-demos/uiOptions/images/500x327_mint_truffle.jpg
  M src/webapp/standalone-demos/uiOptions/images/border_1.png
  M src/webapp/standalone-demos/uiOptions/images/expand_collapse.png
  M src/webapp/standalone-demos/uiOptions/images/h1.png
  M src/webapp/standalone-demos/uiOptions/images/main_bg.png
  M src/webapp/standalone-demos/uiOptions/images/mintleaf.png

Log Message:
-----------
FLUID-4207: Corrected permissions of all files to 644


Commit: 8af64d5e457729fc6dadbfeeb7828bacf41d3f5b
    https://github.com/fluid-project/infusion/commit/8af64d5e457729fc6dadbfeeb7828bacf41d3f5b
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-05-12 (Thu, 12 May 2011)

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

Log Message:
-----------
FLUID-4207: Added missing FluidIoC.js dependency to UIEnhancer test case


Compare: https://github.com/fluid-project/infusion/compare/3e45b80...8af64d5



More information about the Commits mailing list