Skip to content

Flow.js updates #2433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fballiano merged 3 commits into from
Aug 25, 2022
Merged

Flow.js updates #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cc750f
Update flow.js, remove fusty-flow.js, fix upload_max_filesize=0 bug, …
justinbeaty Aug 16, 2022
2c19b33
move config changes to app/code/core/Mage/Uploader/Model/Config/Uploa…
justinbeaty Aug 19, 2022
7a5ead1
int not bool
justinbeaty Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/core/Mage/Catalog/Helper/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ public function validateUploadFile($filePath)
}

if ($imageInfo[0] > $maxDimension || $imageInfo[1] > $maxDimension) {
Mage::throwException($this->__('Disalollowed file format.'));
Mage::throwException($this->__('Disallowed file format.'));
}

$_processor = new Varien_Image($filePath);
Expand Down
11 changes: 10 additions & 1 deletion app/code/core/Mage/Uploader/Model/Config/Uploader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,23 @@ class Mage_Uploader_Model_Config_Uploader extends Mage_Uploader_Model_Config_Abs
*/
protected function _construct()
{
// Fix error where setting post_max_size or upload_max_filesize to 0
// causes the flow.js to make infinite chunks and crash the browser
$maxSize = $this->_getHelper()->getDataMaxSizeInBytes();

if ($maxSize === 0) {
$maxSize = PHP_INT_MAX;
}

$this
->setChunkSize($this->_getHelper()->getDataMaxSizeInBytes())
->setChunkSize($maxSize)
->setWithCredentials(false)
->setForceChunkSize(false)
->setQuery(array(
'form_key' => Mage::getSingleton('core/session')->getFormKey()
))
->setMethod(self::UPLOAD_TYPE)
->setSimultaneousUploads(1)
->setAllowDuplicateUploads(true)
->setPrioritizeFirstAndLastChunk(false)
->setTestChunks(self::TEST_CHUNKS)
Expand Down
2 changes: 0 additions & 2 deletions app/design/adminhtml/default/default/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ Layout for editor element
<action method="addJs"><script>mage/adminhtml/variables.js</script></action>
<action method="addJs"><script>mage/adminhtml/wysiwyg/widget.js</script></action>
<action method="addJs"><name>lib/uploader/flow.min.js</name></action>
<action method="addJs"><name>lib/uploader/fusty-flow.js</name></action>
<action method="addJs"><name>lib/uploader/fusty-flow-factory.js</name></action>
<action method="addJs"><name>mage/adminhtml/uploader/instance.js</name></action>
<action method="addJs"><script>mage/adminhtml/browser.js</script></action>
<action method="addJs"><script>prototype/window.js</script></action>
Expand Down
2 changes: 1 addition & 1 deletion app/locale/en_US/Mage_Catalog.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"Details","Details"
"Disabled","Disabled"
"Disallowed file type.","Disallowed file type."
"Disalollowed file format.","Disalollowed file format."
"Disallowed file format.","Disallowed file format."
"Display Actual Price","Display Actual Price"
"Display Page Control","Display Page Control"
"Display Price Interval as One Price","Display Price Interval as One Price"
Expand Down
Loading