Merge pull request #7 from nguyenk/master

allow custom error messages & fix bugs : min / max fileSize were not tested

Author: Marc TEYSSIER

src/Mouf/Html/Widgets/JqueryFileUpload/JqueryFileUploadWidget.php

@@ -42,8 +42,11 @@ class JqueryFileUploadWidget implements HtmlElementInterface {
 	protected $embedFormData;
 
 	protected $acceptFileTypes;
+	protected $acceptFileTypesMessage = "Not an accepted file type";
 	protected $maxFileSize;
+	protected $maxFileSizeMessage = "Filesize is too big";
 	protected $minFileSize;
+	protected $minFileSizeMessage = "Filesize is too small";
 	protected $maxNumberOfFiles;
 	protected $disableValidation;
 
@@ -320,6 +323,16 @@ public function setAcceptFileTypes($acceptFileTypes) {
 		return $this;
 	}
 
+	/**
+	 * The message to display when file doesnt match the $acceptFileTypes.
+	 *
+	 * @param string $acceptFileTypesMessage
+	 */
+	public function setAcceptFileTypesMessage($acceptFileTypesMessage) {
+		$this->acceptFileTypesMessage = $acceptFileTypesMessage;
+		return $this;
+	}
+
 	/**
 	 * The maximum allowed file size in bytes.
 	 * Example: 10000000 // 10 MB
@@ -333,6 +346,16 @@ public function setMaxFileSize($maxFileSize) {
 		$this->maxFileSize = $maxFileSize;
 		return $this;
 	}
+
+    /**
+     * The message to display when file is bigger then $maxFileSize.
+     *
+     * @param string $maxFileSizeMessage
+     */
+    public function setMaxFileSizeMessage($maxFileSizeMessage) {
+        $this->maxFileSizeMessage = $maxFileSizeMessage;
+        return $this;
+    }
 
 	/**
 	 * The minimum allowed file size in bytes.
@@ -348,6 +371,16 @@ public function setMinFileSize($minFileSize) {
 		$this->minFileSize = $minFileSize;
 		return $this;
 	}
+
+    /**
+     * The message to display when file is smaller then $maxFileSize.
+     *
+     * @param string $minFileSizeMessage
+     */
+    public function setMinFileSizeMessage($minFileSizeMessage) {
+        $this->minFileSizeMessage = $minFileSizeMessage;
+        return $this;
+    }
 
 	/**
 	 * This option limits the number of files that are allowed to be uploaded using this widget.

src/templates/Mouf/Html/Widgets/JqueryFileUpload/JqueryFileUploadWidget.php

@@ -42,17 +42,17 @@
         var acceptFileTypes = <?= $acceptFileTypes ?>;
         if((data.originalFiles[0]['type'].length && !acceptFileTypes.test(data.originalFiles[0]['type']))
                 && (data.originalFiles[0]['name'].length && !acceptFileTypes.test(data.originalFiles[0]['name']))) {
-            uploadErrors.push('Not an accepted file type');
+            uploadErrors.push('<?= $acceptFileTypesMessage ?>');
         }
         <?php } ?>
         <?php if ($minFileSize) { ?>
-        if(data.originalFiles[0]['size'].length && data.originalFiles[0]['size'] < <?= $minFileSize ?>) {
-            uploadErrors.push('Filesize is too small');
+        if(data.originalFiles[0]['size'].toString().length && data.originalFiles[0]['size'] < <?= $minFileSize ?>) {
+            uploadErrors.push('<?= $minFileSizeMessage ?>');
         }
         <?php } ?>
         <?php if ($maxFileSize) { ?>
-        if(data.originalFiles[0]['size'].length && data.originalFiles[0]['size'] > <?= $maxFileSize ?>) {
-            uploadErrors.push('Filesize is too big');
+        if(data.originalFiles[0]['size'].toString().length && data.originalFiles[0]['size'] > <?= $maxFileSize ?>) {
+            uploadErrors.push('<?= $maxFileSizeMessage ?>');
         }
         <?php } ?>
         if(uploadErrors.length > 0) {