Updates to flow.js (#2433)

OpenMage · Aug 25, 2022 · 5aece6d · 5aece6d
1 parent 71998f5
commit 5aece6d
Show file tree

Hide file tree

Showing 9 changed files with 1,683 additions and 456 deletions.
diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php
@@ -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);

diff --git a/app/code/core/Mage/Uploader/Model/Config/Uploader.php b/app/code/core/Mage/Uploader/Model/Config/Uploader.php
@@ -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)

diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml
@@ -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>

diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
@@ -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"