Changeset 19502
- Timestamp:
- 06/24/09 15:28:07 (4 years ago)
- Files:
-
- plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php (modified) (2 diffs)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/css/swfupload.css (modified) (1 diff)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js (modified) (2 diffs)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Core Changelog.txt (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Documentation (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Documentation/index.html (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/ExternalCall.as (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/FileItem.as (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/SWFUpload v2.as3proj (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/SWFUpload.as (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/deploy.bat (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/Flash/swfupload.swf (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins/SWFObject License.txt (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins/swfupload.cookies.js (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins/swfupload.queue.js (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins/swfupload.speed.js (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/plugins/swfupload.swfobject.js (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/swfupload license.txt (added)
- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/vendor/swfupload/swfupload.js (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php
r19236 r19502 71 71 $this->addOption('swfupload_file_queue_limit', 0); 72 72 73 $this->addOption('swfupload_flash_url', '/sfWidgetFormInputSWFUploadPlugin/js/vendor/swfupload/Flash/swfupload.swf');73 $this->addOption('swfupload_flash_url', public_path('/sfWidgetFormInputSWFUploadPlugin/js/vendor/swfupload/Flash/swfupload.swf')); 74 74 75 75 $this->addOption('swfupload_css_path', '/sfWidgetFormInputSWFUploadPlugin/css/swfupload.css'); … … 79 79 $this->addOption('swfupload_button_image_url', null); 80 80 81 $this->addOption('swfupload_button_width', 1 );82 $this->addOption('swfupload_button_height', 1 );81 $this->addOption('swfupload_button_width', 100); 82 $this->addOption('swfupload_button_height', 18); 83 83 $this->addOption('swfupload_button_text', ''); 84 84 $this->addOption('swfupload_button_text_style', ''); plugins/sfWidgetFormInputSWFUploadPlugin/web/css/swfupload.css
r19226 r19502 22 22 top: 0; 23 23 left: 0; 24 z-index: 0;24 z-index: 1000; 25 25 outline: 0; 26 display: block; 26 27 } 27 28 plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js
r19236 r19502 645 645 //this.getView().disableBrowseButton(); 646 646 //this.setIsInProgress(true); 647 this._prev_bytes_complete=0; 647 648 }, this); 648 649 swfu_widget.addObserver(swfu_widget.handlers, 'upload_progress', function(event) 649 650 { 650 this._bytesLoaded += event.total_bytes - event.bytes_complete; 651 this._bytesLoaded += event.bytes_complete - this._prev_bytes_complete; 652 this._prev_bytes_complete = event.bytes_complete; 651 653 this.getProgressBar().setBytesLoaded(this._bytesLoaded); 652 654 }, this); … … 905 907 906 908 var self = this; 907 window.setTimeout(function() { 909 window.setTimeout(function() 910 { 908 911 flash_object.style.height = self._html.browseFilesLink.offsetHeight + "px"; 909 912 flash_object.style.width = self._html.browseFilesLink.offsetWidth + "px"; 910 913 flash_object.style.left = self._html.browseFilesLink.offsetLeft + "px"; 911 914 flash_object.style.top = self._html.browseFilesLink.offsetTop + "px"; 915 flash_object.setAttribute('height', self._html.browseFilesLink.offsetHeight); 916 flash_object.setAttribute('width', self._html.browseFilesLink.offsetWidth); 917 self.getController().getSWFUpload().setButtonDimensions(self._html.browseFilesLink.offsetWidth, self._html.browseFilesLink.offsetHeight); 912 918 },0); 913 919