[Commits] [fluid-project/infusion] b9f006: Merge branch 'master' into jkkremer-FLUID-4113

noreply at github.com noreply at github.com
Fri May 13 23:29:48 UTC 2011


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

Commit: b9f006c50eba2bcc42282747121300f7af8037bf
    https://github.com/fluid-project/infusion/commit/b9f006c50eba2bcc42282747121300f7af8037bf
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/framework/core/js/FluidIoC.js
  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 'master' into jkkremer-FLUID-4113


Commit: 5608d57ef529866963055cc36cf1b5c92a1cf460
    https://github.com/fluid-project/infusion/commit/5608d57ef529866963055cc36cf1b5c92a1cf460
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/lib/jquery/core/js/jquery.js
  M src/webapp/tests/lib/mockjax/js/jquery.mockjax.js

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


Commit: f3cab5de0287dd59c0c6abe15adcc143ad134961
    https://github.com/fluid-project/infusion/commit/f3cab5de0287dd59c0c6abe15adcc143ad134961
Author: mlam <mlam at ocad.ca>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/components/uploader/js/Uploader.js

Log Message:
-----------
jkkremer-FLUID-4113:  Use prop() to set Uploader browseButton state


Commit: 4af148510034bc9e7ca72b16eb3d81835274bc5f
    https://github.com/fluid-project/infusion/commit/4af148510034bc9e7ca72b16eb3d81835274bc5f
Author: mlam <mlam at ocad.ca>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/components/uploader/js/HTML5UploaderSupport.js

Log Message:
-----------
jkkremer-FLUID-4113: Use prop() for HTML5 browseButton instead of attr()


Commit: 57fad3bab73ca7d441749072c09c6a66673bd257
    https://github.com/fluid-project/infusion/commit/57fad3bab73ca7d441749072c09c6a66673bd257
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js

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


Commit: 9049a734c03dda09e77aa1648f727812bafc49d8
    https://github.com/fluid-project/infusion/commit/9049a734c03dda09e77aa1648f727812bafc49d8
Author: Harris Wong <harris.wong at gmail.com>
Date:   2011-05-13 (Fri, 13 May 2011)

Changed paths:
  M src/webapp/components/uploader/js/HTML5UploaderSupport.js

Log Message:
-----------
Merge remote-tracking branch 'origin/jkkremer-FLUID-4113' into jkkremer-FLUID-4113


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

Changed paths:
  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/tests/component-tests/reorderer/js/ImageReordererTests.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

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


Compare: https://github.com/fluid-project/infusion/compare/275f559...8c90d8c



More information about the Commits mailing list