Permalink
Commits on May 17, 2011
  1. Merge branch 'FLUID-4160'

    * FLUID-4160:
      FLUID-4160: Add non-API comments to FluidIoC.js
    jobara committed May 17, 2011
  2. Merge branch 'FLUID-4197'

    * FLUID-4197:
      FLUID-4197: Removed historical use of compound fluid.fail argument - more readability on platforms without JSON, and change of policy re exceptions since we no longer expect to catch
    jobara committed May 17, 2011
  3. Merge remote branch 'colin/FLUID-3886'

    * colin/FLUID-3886:
      FLUID-4237: Linting and tidy of Uploader.
      FLUID-3886: Fixed bug in Uploader 1.2->1.4 options compatibility by working around limitations in ModelTransformation.js with an excessively verbose rule set. Added unsupported API for monkey patching Uploader options for non-IoC convenience.
      FLUID-3886: Tweaked version of Mike's fixes to support a standard API for fileTypes across both Flash and HTML5. Notable changes from Mike's version:  * Simplified MimeTypesRegistry (consisting now of extension key and MIME type values)  * Support for options backwards compatibility 1.3->1.4  * Multiple rules now supported in ModelTransformations.js  * Failing tests for 1.2->1.4 showing inability to support "pass-through" transformation rules.
      FLUID-3886: Moved MIME type compatibility work into FlashUploaderSupport.js
      FLUID-3886:  Code reviewed and refactored.   Unit tests added.
      FLUID-3886:  Add the backwards compatibility files to the repository
      FLUID-3886: Initial backwards compatibility work
      FLUID-3886:  Fix broken unit test
      FLUID-3886:  Add in a missing comma from the fileTypes list :P
      FLUID-3886: Reset fileTypes default to accept all files.
      FLUID-3886:  Fix SWFUpload file_type format.  Fixed unit tests to reflect format change.
      FLUID-3886: Expanded default MIME type coverage
      FLUID-3886: Refactored unit tests
      FLUID-3886:  File type inclusion for file dialog
    jobara committed May 17, 2011
  4. Merge branch 'FLUID-4236'

    * FLUID-4236:
      FLUID-4236: Adjusted test case from JURA to show use of "mergeAllOptions" to arbitrate between decorator contributed-options and demands block-contributed options
    jobara committed May 17, 2011
  5. Merge branch 'FLUID-4113'

    * FLUID-4113:
      FLUID-4113: Reverted all uses of attr("disabled") to the form which is now recommended by jQuery 1.6.1. It appears that there was a momentary appearance of a backwards incompatible API for jQuery 1.6.0 which required the use of jQuery.prop() and since we have started moving forward on this, we may as well move forwards to the recommended form of $.prop("disabled", true/false) consistently rather than having a mismatch of incompatible styles - as well as the syntax of $.prop("disabled", "disabled") not being one of the forms blessed in the recent jQuery blog posting "Upgrading from 1.5.2 to 1.6.1". Also restored the test case in ImageReorderer so that it makes at least *some* check of the selection listener - just because we can't rely on multiplicity, doesn't mean we should test it is > 0. All test cases verified running at least on one platform, FF 3.6, awaiting full testing on Monday.
      FLUID-4113: Taken out the count test within "testFocusBlur".  Not important to test how many events are fired, as long as the test make sure the event was fired and blurred.
      jkkremer-FLUID-4113: Use prop() for HTML5 browseButton instead of attr()
      jkkremer-FLUID-4113:  Use prop() to set Uploader browseButton state
      FLUID-4113: Replaced jquery library to 1.6.1.  Replaced mockjax.js to 1.4 to address the change of ajax API introduced in jquery 1.5, which causes cache test to fail.
      jkkremer-FLUID-4113: Fixed 3rd party jQuery tests
      jkkremer-FLUID-4113: upgraded to jQuery 1.6.1
      jkkremer-FLUID-4113:  Fixed inline edit tests for jQuery 1.6
      FLUID-4113: Replaced tooltip plugin with another snapshot from jQuery ui 1.9.  jquery/jquery-ui@1fd3419#ui/jquery.ui.tooltip.js.
      FLUID-4113: Replaced jquery.js to 1.6 stabled. http://blog.jquery.com/2011/05/03/jquery-16-released/
      jkkremer-FLUID-4113: Fixed broken Inline Edit tests by using fluid.value in the standardAccessor() function
      FLUID-4113: Related to http://bugs.jquery.com/ticket/5241, all special meta chars need to be escaped. Use "fluid.jById" instead.
      FLUID-4113: Replaced jquery 1.5.1 library with 1.5.2.
      FLUID-4113: jQuery .val() Tests
      FLUID-4113: Resolved bug dealing with px/pt issue
      FLUID-4113: Updated jQuery from 1.5.1rc1 to 1.5.1
      FLUID-4113: Updated jQuery to 1.5.1rc1
    jobara committed May 17, 2011
Commits on May 16, 2011
  1. FLUID-4197: Removed historical use of compound fluid.fail argument - …

    …more readability on platforms without JSON, and change of policy re exceptions since we no longer expect to catch
    amb26 committed May 16, 2011
  2. Merge remote branch 'colin/FLUID-3886'

    * colin/FLUID-3886:
      FLUID-4237: Linting and tidy of Uploader.
      FLUID-3886: Fixed bug in Uploader 1.2->1.4 options compatibility by working around limitations in ModelTransformation.js with an excessively verbose rule set. Added unsupported API for monkey patching Uploader options for non-IoC convenience.
      FLUID-3886: Tweaked version of Mike's fixes to support a standard API for fileTypes across both Flash and HTML5. Notable changes from Mike's version:
      FLUID-3886: Moved MIME type compatibility work into FlashUploaderSupport.js
      FLUID-3886:  Code reviewed and refactored.   Unit tests added.
      FLUID-3886:  Add the backwards compatibility files to the repository
      FLUID-3886: Initial backwards compatibility work
      FLUID-3886:  Fix broken unit test
      FLUID-3886:  Add in a missing comma from the fileTypes list :P
      FLUID-3886: Reset fileTypes default to accept all files.
      FLUID-3886:  Fix SWFUpload file_type format.  Fixed unit tests to reflect format change.
      FLUID-3886: Expanded default MIME type coverage
      FLUID-3886: Refactored unit tests
      FLUID-3886:  File type inclusion for file dialog
    colinbdclark committed May 16, 2011
  3. FLUID-3886: Fixed bug in Uploader 1.2->1.4 options compatibility by w…

    …orking around limitations in ModelTransformation.js with an excessively verbose rule set. Added unsupported API for monkey patching Uploader options for non-IoC convenience.
    colinbdclark committed May 16, 2011
  4. Merge remote branch 'upstream/master' into FLUID-3886

    * upstream/master:
      FLUID-4236: Adjusted test case from JURA to show use of "mergeAllOptions" to arbitrate between decorator contributed-options and demands block-contributed options
      FLUID-4113: Reverted all uses of attr("disabled") to the form which is now recommended by jQuery 1.6.1. It appears that there was a momentary appearance of a backwards incompatible API for jQuery 1.6.0 which required the use of jQuery.prop() and since we have started moving forward on this, we may as well move forwards to the recommended form of $.prop("disabled", true/false) consistently rather than having a mismatch of incompatible styles - as well as the syntax of $.prop("disabled", "disabled") not being one of the forms blessed in the recent jQuery blog posting "Upgrading from 1.5.2 to 1.6.1". Also restored the test case in ImageReorderer so that it makes at least *some* check of the selection listener - just because we can't rely on multiplicity, doesn't mean we should test it is > 0. All test cases verified running at least on one platform, FF 3.6, awaiting full testing on Monday.
      FLUID-4113: Taken out the count test within "testFocusBlur".  Not important to test how many events are fired, as long as the test make sure the event was fired and blurred.
      jkkremer-FLUID-4113: Use prop() for HTML5 browseButton instead of attr()
      jkkremer-FLUID-4113:  Use prop() to set Uploader browseButton state
      FLUID-4113: Replaced jquery library to 1.6.1.  Replaced mockjax.js to 1.4 to address the change of ajax API introduced in jquery 1.5, which causes cache test to fail.
      FLUID-4233: Test case and fix for demands block corruption issue - make sure to copy argument material from the demands block which is forwarded to the oncoming expandComponentOptions
      FLUID-4197: Experimental use of Function.prototype.bind to work around hosted object issue for console.debug reported by mlam. This may also be necessary on IE9 - requires testing
      jkkremer-FLUID-4113: Fixed 3rd party jQuery tests
      jkkremer-FLUID-4113: upgraded to jQuery 1.6.1
      jkkremer-FLUID-4113:  Fixed inline edit tests for jQuery 1.6
      FLUID-4113: Replaced tooltip plugin with another snapshot from jQuery ui 1.9.  jquery/jquery-ui@1fd3419#ui/jquery.ui.tooltip.js.
      FLUID-4113: Replaced jquery.js to 1.6 stabled. http://blog.jquery.com/2011/05/03/jquery-16-released/
      jkkremer-FLUID-4113: Fixed broken Inline Edit tests by using fluid.value in the standardAccessor() function
      FLUID-4113: Related to http://bugs.jquery.com/ticket/5241, all special meta chars need to be escaped. Use "fluid.jById" instead.
      FLUID-4113: Replaced jquery 1.5.1 library with 1.5.2.
      FLUID-4113: jQuery .val() Tests
      FLUID-4113: Resolved bug dealing with px/pt issue
      FLUID-4113: Updated jQuery from 1.5.1rc1 to 1.5.1
      FLUID-4113: Updated jQuery to 1.5.1rc1
    colinbdclark committed May 16, 2011
  5. FLUID-3886: Tweaked version of Mike's fixes to support a standard API…

    … for fileTypes across both Flash and HTML5. Notable changes from Mike's version:
    
     * Simplified MimeTypesRegistry (consisting now of extension key and MIME type values)
     * Support for options backwards compatibility 1.3->1.4
     * Multiple rules now supported in ModelTransformations.js
     * Failing tests for 1.2->1.4 showing inability to support "pass-through" transformation rules.
    colinbdclark committed May 16, 2011
Commits on May 14, 2011
  1. FLUID-4236: Adjusted test case from JURA to show use of "mergeAllOpti…

    …ons" to arbitrate between decorator contributed-options and demands block-contributed options
    amb26 committed May 14, 2011
Commits on May 13, 2011
  1. FLUID-4113: Reverted all uses of attr("disabled") to the form which i…

    …s now recommended by jQuery 1.6.1. It appears that there was a momentary appearance of a backwards incompatible API for jQuery 1.6.0 which required the use of jQuery.prop() and since we have started moving forward on this, we may as well move forwards to the recommended form of $.prop("disabled", true/false) consistently rather than having a mismatch of incompatible styles - as well as the syntax of $.prop("disabled", "disabled") not being one of the forms blessed in the recent jQuery blog posting "Upgrading from 1.5.2 to 1.6.1". Also restored the test case in ImageReorderer so that it makes at least *some* check of the selection listener - just because we can't rely on multiplicity, doesn't mean we should test it is > 0. All test cases verified running at least on one platform, FF 3.6, awaiting full testing on Monday.
    amb26 committed May 13, 2011
  2. FLUID-4113: Taken out the count test within "testFocusBlur". Not impo…

    …rtant to test how many events are fired, as long as the test make sure the event was fired and blurred.
    harriswong committed May 13, 2011
  3. FLUID-4113: Replaced jquery library to 1.6.1. Replaced mockjax.js to …

    …1.4 to address the change of ajax API introduced in jquery 1.5, which causes cache test to fail.
    harriswong committed May 13, 2011
  4. FLUID-4233: Test case and fix for demands block corruption issue - ma…

    …ke sure to copy argument material from the demands block which is forwarded to the oncoming expandComponentOptions
    amb26 committed May 13, 2011
  5. FLUID-4197: Experimental use of Function.prototype.bind to work aroun…

    …d hosted object issue for console.debug reported by mlam. This may also be necessary on IE9 - requires testing
    amb26 committed May 13, 2011
Commits on May 12, 2011
  1. Merge remote branch 'upstream/master' into FLUID-3886

    * upstream/master: (148 commits)
      FLUID-4206: Adjusted theme updates
      FLUID-4206: Removed unneed jquery.ui.core.css file
      FLUID-4206: Updated the demo theme.
      FLUID-4207: Added missing FluidIoC.js dependency to UIEnhancer test case
      FLUID-4207: Corrected permissions of all files to 644
      FLUID-4197, FLUID-4151, FLUID-4187: Removed json2.js as a core dependency of the framework, in favour of using the "enhanced API" for console.log wherever it is supported (on all browsers other than IE). Implemented "notrycatch" system as found in qunit applied framework-wide via new wrapping function fluid.tryCatch. On this basis, implemented "activity tracing system" throughout the IoC system, allowing a traceback of framework intentions in the case a fluid.fail is received. Corrected implementation of UploaderCompatibilityTests to use a mocked context tag rather than the browser's live one. General delinting and tidying. Corrected a bug in listener sorting that would cause a non-deteministic failure on browsers without a stable sort (Chrome, and possibly IE8) where listener order was expected to be honoured where no priority was supplied.
      FLUID-4206: Updated themes regarding jQuery UI 1.8.12.  These updates are generated from http://jqueryui.com/themeroller, including coal, hc, hci, mist, slate.
      FLUID-4232: Fixing paths to chili
      FLUID-4206: Replaced tags in release notes and read me from 1.8.11 to 1.8.12.
      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-4150: Note for absolute positioned elements
      FLUID-4222: Linked json2.js to all Uploader unit tests, causing them to pass again in IE6.
      FLUID-4150: changed tabs to be used as a decorator
      FLUID-4214: Added DataBinding.js to manual-tests
      FLUID-4213: Comment tweak
      FLUID-4150: renamed the demo's layout selector
      FLUID-4150: alignment label, now rendered.
      FLUID-4150: Converted the demo to use the renderer
      FLUID-4163: Used Mike's mock FormData object in Uploader's integration tests so that we don't need to stub out any major implementations.
      FLUID-4163: Tweaks and refactoring to Mike's HTML5 Uploader tests to expand their coverage and reduce redundancy.
      ...
    
    Conflicts:
    	src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
    	src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
    	src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
    	src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
    	src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
    colinbdclark committed May 12, 2011
  2. Merge branch 'FLUID-4206'

    * FLUID-4206:
      FLUID-4206: Adjusted theme updates
      FLUID-4206: Removed unneed jquery.ui.core.css file
      FLUID-4206: Updated the demo theme.
      FLUID-4206: Updated themes regarding jQuery UI 1.8.12.  These updates are generated from http://jqueryui.com/themeroller, including coal, hc, hci, mist, slate.
      FLUID-4206: Replaced tags in release notes and read me from 1.8.11 to 1.8.12.
      FLUID-4206: replaces 1.8.11 jQuery UI to 1.8.12.
    jobara committed May 12, 2011
  3. FLUID-4206: Adjusted theme updates

    The theme updates had been missing the jquery ui widget stylings. I've fixed this up for all of the themes. I also updated the jquery.ui.theme.css file, which had been missed
    jobara committed May 12, 2011
  4. FLUID-4206: Removed unneed jquery.ui.core.css file

    The jquery.ui.core.css file was in the demos/lib directory. It is unneeded because the demo-theme handles the necessary styling. Rather than update it, I just removed it. I also fixed up the imports in the linearize.html file that had been calling it. And moved the import of the demo theme to the correct spot in the file.
    jobara committed May 12, 2011
  5. FLUID-4206: Updated the demo theme.

    Updated the jQuery UI theme used in the demos to jQuery UI 1.8.12. I didn't update the images since they were the same. This had been missed in the previous commmit to update the jQuery UI themes.
    jobara committed May 12, 2011
  6. 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
      ...
    amb26 committed May 12, 2011
  7. FLUID-4197, FLUID-4151, FLUID-4187: Removed json2.js as a core depend…

    …ency of the framework, in favour of using the "enhanced API" for console.log wherever it is supported (on all browsers other than IE). Implemented "notrycatch" system as found in qunit applied framework-wide via new wrapping function fluid.tryCatch. On this basis, implemented "activity tracing system" throughout the IoC system, allowing a traceback of framework intentions in the case a fluid.fail is received. Corrected implementation of UploaderCompatibilityTests to use a mocked context tag rather than the browser's live one. General delinting and tidying. Corrected a bug in listener sorting that would cause a non-deteministic failure on browsers without a stable sort (Chrome, and possibly IE8) where listener order was expected to be honoured where no priority was supplied.
    amb26 committed May 12, 2011
Commits on May 11, 2011
  1. FLUID-4206: Updated themes regarding jQuery UI 1.8.12. These updates …

    …are generated from http://jqueryui.com/themeroller, including coal, hc, hci, mist, slate.
    harriswong committed May 11, 2011