Merge pull request #1958 from 6pblcb/yiiActiveForm-beforeSubmit

framework/assets/yii.activeForm.js

@@ -127,6 +127,13 @@
 			var $form = $(this),
 				data = $form.data('yiiActiveForm');
 			if (data.validated) {
+				if (data.settings.beforeSubmit !== undefined) {
+					if (data.settings.beforeSubmit($form) == false) {
+						data.validated = false;
+						data.submitting = false;
+						return false;
+					}
+				}
 				// continue submitting the form since validation passes
 				return true;
 			}
@@ -135,7 +142,6 @@
 				clearTimeout(data.settings.timer);
 			}
 			data.submitting = true;
-			if (!data.settings.beforeSubmit || data.settings.beforeSubmit($form)) {
 			validate($form, function (messages) {
 				var errors = [];
 				$.each(data.attributes, function () {
@@ -166,9 +172,6 @@
 			}, function () {
 				data.submitting = false;
 			});
-			} else {
-				data.submitting = false;
-			}
 			return false;
 		},