[Commits] [fluid-project/infusion] a1b483: Merge branch 'FLUID-4113'

noreply at github.com noreply at github.com
Tue May 17 12:28:26 UTC 2011

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

Commit: a1b483114135907b9b78dacffb2c68734d6a8d8e
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-17 (Tue, 17 May 2011)

Changed paths:
  M src/webapp/components/inlineEdit/js/InlineEdit.js
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/components/uploader/js/HTML5UploaderSupport.js
  M src/webapp/components/uploader/js/Uploader.js
  M src/webapp/demos/fss/linearize/js/linearize.js
  M src/webapp/demos/progress/js/progress.js
  M src/webapp/framework/core/js/FluidDocument.js
  M src/webapp/framework/core/js/FluidRequests.js
  M src/webapp/lib/jquery/core/js/jquery.js
  M src/webapp/lib/jquery/plugins/tooltip/js/jquery.ui.tooltip.js
  A src/webapp/tests/3rd-party-tests/jQuery/html/jQuery-test.html
  A src/webapp/tests/3rd-party-tests/jQuery/js/jQueryTests.js
  M src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTestConstants.js
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
  M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
  M src/webapp/tests/lib/mockjax/js/jquery.mockjax.js

Log Message:
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.  https://github.com/jquery/jquery-ui/commit/1fd34199efa9ddc35276b415cad8e7e37a6cc856#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

Commit: b8ba2fe68ec8aa630287dbd57efd5022cd09f906
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-17 (Tue, 17 May 2011)

Changed paths:
  M src/webapp/tests/framework-tests/renderer/html/RendererUtilities-test.html
  M src/webapp/tests/framework-tests/renderer/js/RendererUtilitiesTests.js

Log Message:
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

Commit: b1dff44549364139e4e8722eefa7085752daa90d
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-17 (Tue, 17 May 2011)

Changed paths:
  M src/webapp/components/uploader/html/Uploader.html
  M src/webapp/components/uploader/js/FileQueueView.js
  M src/webapp/components/uploader/js/FlashUploaderSupport.js
  M src/webapp/components/uploader/js/HTML5UploaderSupport.js
  A src/webapp/components/uploader/js/MimeTypeExtensions.js
  M src/webapp/components/uploader/js/Uploader.js
  M src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.2.js
  A src/webapp/components/uploader/js/UploaderCompatibility-Infusion1.3.js
  M src/webapp/components/uploader/uploaderDependencies.json
  M src/webapp/demos/uploader/html/uploader.html
  M src/webapp/framework/core/js/ModelTransformations.js
  M src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
  M src/webapp/tests/component-tests/uploader/html/UploaderCompatibility-test.html
  M src/webapp/tests/component-tests/uploader/js/FileQueueTests.js
  M src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
  M src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js
  M src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
  M src/webapp/tests/component-tests/uploader/js/UploaderCompatibilityTests.js
  M src/webapp/tests/framework-tests/core/js/ModelTransformationsTests.js

Log Message:
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

Commit: 6d002a45b36b8278dbc69d07acea58e3aca9ae18
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-17 (Tue, 17 May 2011)

Changed paths:
  M src/webapp/framework/core/js/Fluid.js

Log Message:
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

Commit: 74091d9b3456904b08129f67dcfa59b8912abc85
Author: Justin Obara <obarajustin at gmail.com>
Date:   2011-05-17 (Tue, 17 May 2011)

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

Log Message:
Merge branch 'FLUID-4160'

* FLUID-4160:
  FLUID-4160: Add non-API comments to FluidIoC.js

Compare: https://github.com/fluid-project/infusion/compare/a1b4831^...74091d9

More information about the Commits mailing list