closes #21; closes #22

formtools · Apr 26, 2019 · 5e38f51 · 5e38f51
1 parent 99f361d
commit 5e38f51
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/code/Hooks.class.php b/code/Hooks.class.php
@@ -33,7 +33,7 @@ public static function includeJs($curr_page, $L)
 			return;
 		}
 		echo <<<END
-<script src="$root_url/modules/field_type_file/scripts/edit_submission.js?v=211"></script>
+<script src="$root_url/modules/field_type_file/scripts/edit_submission.js?v=2.2.3"></script>
 <script>
 if (typeof g.messages == 'undefined') {
 	g.messages = {};
@@ -59,7 +59,7 @@ public static function includeStandaloneJs($L)
 
 		// this includes the necessary JS for the file upload field type
 		echo <<< END
-  <script src="$root_url/modules/field_type_file/scripts/standalone.js?v=211"></script>
+  <script src="$root_url/modules/field_type_file/scripts/standalone.js?v=2.2.3"></script>
   <script>
   if (typeof g.messages == 'undefined')
     g.messages = {};

diff --git a/code/Module.class.php b/code/Module.class.php
@@ -17,8 +17,8 @@ class Module extends FormToolsModule
 	protected $author = "Ben Keen";
 	protected $authorEmail = "ben.keen@gmail.com";
 	protected $authorLink = "https://formtools.org";
-	protected $version = "2.2.2";
-	protected $date = "2019-03-27";
+	protected $version = "2.2.3";
+	protected $date = "2019-04-25";
 	protected $originLanguage = "en_us";
 
 	protected $nav = array(

diff --git a/code/Settings.class.php b/code/Settings.class.php
@@ -128,7 +128,7 @@ class Settings
 			<a href="{\$folder_url}/{\$filename}" 
 				{if \$use_fancybox == "yes"}class="fancybox"{/if}>{\$filename}</a>
 			{if \$num_files == 1 && \$multiple_files == "no"}
-				<input type="button" class="cf_delete_file" value="{\$LANG.phrase_delete_file}" />
+				<input type="button" class="cf_delete_file" value="{\$LANG.word_delete}" />
 			{/if}
 		</li>
 		{/foreach}

diff --git a/scripts/edit_submission.js b/scripts/edit_submission.js
@@ -98,10 +98,11 @@ files_ns.check_required = function () {
 	var errors = [];
 	for (var i = 0; i < rsv_custom_func_errors.length; i++) {
 		if (rsv_custom_func_errors[i].func == "files_ns.check_required") {
-			var field = document.edit_submission_form[rsv_custom_func_errors[i].field];
 			var field_id = rsv_custom_func_errors[i].field_id;
-
-			var has_file = $("#cf_file_" + field_id).hasClass("cf_file_has_items");
+			var id_field = $("#cf_file_" + field_id);
+			var has_file = id_field.hasClass("cf_file_has_items");
+			var is_multiple = id_field.hasClass("cf_file_multiple");
+			var field = document.edit_submission_form[rsv_custom_func_errors[i].field + (is_multiple ? '[]' : '')];
 			if (!has_file && !field.value) {
 				errors.push([field, rsv_custom_func_errors[i].err]);
 			}

diff --git a/scripts/standalone.js b/scripts/standalone.js
@@ -4,13 +4,6 @@
  */
 
 $(function () {
-	// $(".cf_delete_file").each(function () {
-	// 	var field_id = $(this).closest(".cf_file").find(".cf_file_field_id").val();
-	// 	$(this).bind("click", function () {
-	// 		return files_ns.delete_submission_file(field_id, false);
-	// 	});
-	// });
-
 	var supportsMultiFileUpload = 'multiple' in document.createElement('input');
 
 	// in case the user's using a really old browser, disable the multiple option on the file buttons. This allows
@@ -102,11 +95,14 @@ files_ns.confirm_delete_dialog = $("<div id=\"confirm_delete_dialog\"></div>");
  */
 files_ns.check_required = function () {
 	var errors = [];
+
 	for (var i = 0; i < rsv_custom_func_errors.length; i++) {
 		if (rsv_custom_func_errors[i].func == "files_ns.check_required") {
-			var field = document.edit_submission_form[rsv_custom_func_errors[i].field];
 			var field_id = rsv_custom_func_errors[i].field_id;
-			var has_file = $("#cf_file_" + field_id).hasClass("cf_file_has_items");
+			var id_field = $("#cf_file_" + field_id);
+			var has_file = id_field.hasClass("cf_file_has_items");
+			var is_multiple = id_field.hasClass("cf_file_multiple");
+			var field = document.edit_submission_form[rsv_custom_func_errors[i].field + (is_multiple ? '[]' : '')];
 			if (!has_file && !field.value) {
 				errors.push([field, rsv_custom_func_errors[i].err]);
 			}