[Commits] svn commit: 10355

[www-data]

------------------------------------------------------------------------
r10355 | colin | 2010-12-08 18:39:35 -0500 (Wed, 08 Dec 2010) | 3 lines
Changed paths:
   M /fluid/infusion/trunk
   M /fluid/infusion/trunk/src/webapp/components/uploader/css/Uploader.css
   M /fluid/infusion/trunk/src/webapp/components/uploader/html/Uploader.html
   M /fluid/infusion/trunk/src/webapp/components/uploader/js/DemoUploadManager.js
   M /fluid/infusion/trunk/src/webapp/components/uploader/js/FileQueueView.js
   A /fluid/infusion/trunk/src/webapp/components/uploader/js/Flash9UploaderSupport.js (from /incubator/uploader/FLUID-3722/src/webapp/components/uploader/js/Flash9UploaderSupport.js:10352)
   M /fluid/infusion/trunk/src/webapp/components/uploader/js/FlashUploaderSupport.js
   A /fluid/infusion/trunk/src/webapp/components/uploader/js/HTML5UploaderSupport.js (from /incubator/uploader/FLUID-3722/src/webapp/components/uploader/js/HTML5UploaderSupport.js:10273)
   M /fluid/infusion/trunk/src/webapp/components/uploader/js/Uploader.js
   M /fluid/infusion/trunk/src/webapp/demos/portal/js/demoAssets.js
   M /fluid/infusion/trunk/src/webapp/demos/uploader/html/uploader.html
   M /fluid/infusion/trunk/src/webapp/demos/uploader/js/uploader.js
   M /fluid/infusion/trunk/src/webapp/framework/core/js/ProgressiveEnhancement.js
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/html/DemoUploadManager-test.html
   A /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html (from /incubator/uploader/FLUID-3722/src/webapp/tests/component-tests/uploader/html/HTML5UploaderSupport-test.html:10352)
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/html/SWFUploadManager-test.html
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/html/Scroller-test.html
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/html/Uploader-test.html
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/DemoUploadManagerTests.js
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/FileQueueTests.js
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/FileQueueViewTests.js
   A /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js (from /incubator/uploader/FLUID-3722/src/webapp/tests/component-tests/uploader/js/HTML5UploaderSupportTests.js:10352)
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/SWFUploadManagerTests.js
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/ScrollerTests.js
   M /fluid/infusion/trunk/src/webapp/tests/component-tests/uploader/js/UploaderTests.js

FLUID-3722, FLUID-3718: Merging the new HTML 5 version of Uploader with trunk from the FLUID-3722 branch. Hurray!


------------------------------------------------------------------------