From 0946ed4ab22611aaf68b625ac9028a9767f012f7 Mon Sep 17 00:00:00 2001
From: huei90 <huei90@gmail.com>
Date: Thu, 26 Nov 2015 16:45:23 +0800
Subject: [PATCH] FIX provider.setSuccess/ErrorMessage & no-validation-message

no-validation-message has higher priority than provider set success/error message
---
 dist/angular-validation.js     |  16 ++++-
 dist/angular-validation.min.js |   2 +-
 src/validator.directive.js     |  16 ++++-
 test/unit/showMessageSpec.js   | 128 +++++++++++++++++++++++++++++++++
 4 files changed, 157 insertions(+), 5 deletions(-)
 create mode 100644 test/unit/showMessageSpec.js

diff --git a/dist/angular-validation.js b/dist/angular-validation.js
index 792748d..c7ed34f 100644
--- a/dist/angular-validation.js
+++ b/dist/angular-validation.js
@@ -348,7 +348,14 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showSuccessMessage && messageToShow) {
+        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
+      }
 
       ctrl.$setValidity(ctrl.$name, true);
       if (scope.validCallback) scope.validCallback({
@@ -376,8 +383,13 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showErrorMessage && messageToShow) {
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showErrorMessage && messageToShow) {
         messageElem.html($validationProvider.getErrorHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
       }
 
       ctrl.$setValidity(ctrl.$name, false);
diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
index f4ab9b5..119f1a8 100644
--- a/dist/angular-validation.min.js
+++ b/dist/angular-validation.min.js
@@ -1 +1 @@
-(function(){angular.module("validation",["validation.provider","validation.directive"]),angular.module("validation.provider",[]),angular.module("validation.directive",["validation.provider"])}).call(this),function(){function a(){var a,b,c,d,e,f=this,g=function(f){a=f,b=a.get("$rootScope"),c=a.get("$http"),d=a.get("$q"),e=a.get("$timeout")},h={},i={};this.setExpression=function(a){return angular.extend(h,a),f},this.getExpression=function(a){return h[a]},this.setDefaultMsg=function(a){return angular.extend(i,a),f},this.getDefaultMsg=function(a){return i[a]},this.setErrorHTML=function(a){return a.constructor===Function?(f.getErrorHTML=a,f):void 0},this.getErrorHTML=function(a){return'<p class="validation-invalid">'+a+"</p>"},this.setSuccessHTML=function(a){return a.constructor===Function?(f.getSuccessHTML=a,f):void 0},this.getSuccessHTML=function(a){return'<p class="validation-valid">'+a+"</p>"},this.showSuccessMessage=!0,this.showErrorMessage=!0,this.checkValid=function(a){return!(!a||!a.$valid)},this.validate=function(a){var c=d.defer(),g=0;if(void 0===a)return console.error("This is not a regular Form name scope"),c.reject("This is not a regular Form name scope"),c.promise;if(a.validationId)b.$broadcast(a.$name+"submit-"+a.validationId,g++);else if(a.constructor===Array)for(var h in a)b.$broadcast(a[h].$name+"submit-"+a[h].validationId,g++);else for(var i in a)"$"!==i[0]&&a[i].hasOwnProperty("$dirty")&&b.$broadcast(i+"submit-"+a[i].validationId,g++);return c.promise.success=function(a){return c.promise.then(function(b){a(b)}),c.promise},c.promise.error=function(a){return c.promise.then(null,function(b){a(b)}),c.promise},e(function(){f.checkValid(a)?c.resolve("success"):c.reject("error")}),c.promise},this.validCallback=null,this.invalidCallback=null,this.reset=function(a){if(void 0===a)return void console.error("This is not a regular Form name scope");if(a.validationId)b.$broadcast(a.$name+"reset-"+a.validationId);else if(a.constructor===Array)for(var c in a)b.$broadcast(a[c].$name+"reset-"+a[c].validationId);else for(var d in a)"$"!==d[0]&&a[d].hasOwnProperty("$dirty")&&b.$broadcast(d+"reset-"+a[d].validationId)},this.$get=["$injector",function(a){return g(a),{setErrorHTML:this.setErrorHTML,getErrorHTML:this.getErrorHTML,setSuccessHTML:this.setSuccessHTML,getSuccessHTML:this.getSuccessHTML,setExpression:this.setExpression,getExpression:this.getExpression,setDefaultMsg:this.setDefaultMsg,getDefaultMsg:this.getDefaultMsg,showSuccessMessage:this.showSuccessMessage,showErrorMessage:this.showErrorMessage,checkValid:this.checkValid,validate:this.validate,validCallback:this.validCallback,invalidCallback:this.invalidCallback,reset:this.reset}}]}angular.module("validation.provider").provider("$validation",a)}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$timeout"),d=a.get("$parse");return{link:function(a,e,f){var g=d(f.validationReset)(a);c(function(){e.on("click",function(a){a.preventDefault(),b.reset(g)})})}}}angular.module("validation.directive").directive("validationReset",a),a.$inject=["$injector"]}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$timeout"),d=a.get("$parse");return{priority:1,require:"?ngClick",link:function(a,e,f){var g=d(f.validationSubmit)(a);c(function(){e.off("click"),e.on("click",function(c){c.preventDefault(),b.validate(g).success(function(){d(f.ngClick)(a)})})})}}}angular.module("validation.directive").directive("validationSubmit",a),a.$inject=["$injector"]}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$q"),d=a.get("$timeout"),e=function(a,c,d,e,f){var g,h=c||b.getDefaultMsg(d).success;return g=e.messageId?angular.element(document.querySelector("#"+e.messageId)):a.next(),b.showSuccessMessage&&h&&g.html(b.getSuccessHTML(h)),f.$setValidity(f.$name,!0),e.validCallback&&e.validCallback({message:h}),b.validCallback&&b.validCallback(a),!0},f=function(a,c,d,e,f){var g,h=c||b.getDefaultMsg(d).error;return g=e.messageId?angular.element(document.querySelector("#"+e.messageId)):a.next(),b.showErrorMessage&&h&&g.html(b.getErrorHTML(h)),f.$setValidity(f.$name,!1),e.invalidCallback&&e.invalidCallback({message:h}),b.invalidCallback&&b.invalidCallback(a),!1},g={},h=function(a,d,g,i,j,k){var l=j.slice(0),m=l[0].trim(),n=m.indexOf("="),o=-1===n?m:m.substr(0,n),p=-1===n?null:m.substr(n+1),q=l.slice(1),r=o+"SuccessMessage",s=o+"ErrorMessage",t=b.getExpression(o),u={success:function(){return e(d,g[r],o,a,i),q.length?h(a,d,g,i,q,k):!0},error:function(){return f(d,g[s],o,a,i)}};return void 0===t?(console.error('You are using undefined validator "%s"',o),q.length?h(a,d,g,i,q,k):void 0):t.constructor===Function?c.all([b.getExpression(o)(k,a,d,g,p)]).then(function(a){return a&&a.length>0&&a[0]?u.success():u.error()},function(){return u.error()}):t.constructor===RegExp&&void 0!==k&&null!==k&&b.getExpression(o).test(k)?u.success():u.error()},i=function(){return(65536*(1+Math.random())|0).toString(16).substring(1)},j=function(){return i()+i()+i()+i()};return{restrict:"A",require:"ngModel",scope:{model:"=ngModel",initialValidity:"=initialValidity",validCallback:"&",invalidCallback:"&",messageId:"@"},link:function(a,b,c,e){var f,i=function(){},k=c.validator.split(","),l=e.validationId=j();return"boolean"==typeof a.initialValidity&&(f=a.initialValidity),a.messageId||b.after("<span></span>"),e.$setValidity(e.$name,f),a.$on(e.$name+"reset-"+l,function(){i(),d(function(){e.$setViewValue(""),e.$setPristine(),e.$setValidity(e.$name,void 0),e.$render(),a.messageId?angular.element(document.querySelector("#"+a.messageId)).html(""):b.next().html("")})}),a.$on(e.$name+"submit-"+l,function(f,j){var l=e.$viewValue,m=!1;m=h(a,b,c,e,k,l),"submit"===c.validMethod&&(i(),i=a.$watch("model",function(d,f){d=e.$viewValue,d!==f&&((void 0===d||null===d)&&(d=""),m=h(a,b,c,e,k,d))}));var n=function(a){a?delete g[j]:(g[j]=b[0],d(function(){g[Math.min.apply(null,Object.keys(g))].focus()},0))};m.constructor===Object?m.then(n):n(m)}),"blur"===c.validMethod?void b.bind("blur",function(){var d=e.$viewValue;a.$apply(function(){h(a,b,c,e,k,d)})}):void("submit"!==c.validMethod&&"submit-only"!==c.validMethod&&(a.$watch("model",function(d){if(d=e.$viewValue,e.$pristine&&e.$viewValue)e.$setViewValue(e.$viewValue);else if(e.$pristine)return void(a.messageId?angular.element(document.querySelector("#"+a.messageId)).html(""):b.next().html(""));h(a,b,c,e,k,d)}),d(function(){c.$observe("noValidationMessage",function(c){var d;d=a.messageId?angular.element(document.querySelector("#"+a.messageId)):b.next(),"true"===c||c===!0?d.css("display","none"):("false"===c||c===!1)&&d.css("display","block")})})))}}}angular.module("validation.directive").directive("validator",a),a.$inject=["$injector"]}.call(this);
\ No newline at end of file
+(function(){angular.module("validation",["validation.provider","validation.directive"]),angular.module("validation.provider",[]),angular.module("validation.directive",["validation.provider"])}).call(this),function(){function a(){var a,b,c,d,e,f=this,g=function(f){a=f,b=a.get("$rootScope"),c=a.get("$http"),d=a.get("$q"),e=a.get("$timeout")},h={},i={};this.setExpression=function(a){return angular.extend(h,a),f},this.getExpression=function(a){return h[a]},this.setDefaultMsg=function(a){return angular.extend(i,a),f},this.getDefaultMsg=function(a){return i[a]},this.setErrorHTML=function(a){return a.constructor===Function?(f.getErrorHTML=a,f):void 0},this.getErrorHTML=function(a){return'<p class="validation-invalid">'+a+"</p>"},this.setSuccessHTML=function(a){return a.constructor===Function?(f.getSuccessHTML=a,f):void 0},this.getSuccessHTML=function(a){return'<p class="validation-valid">'+a+"</p>"},this.showSuccessMessage=!0,this.showErrorMessage=!0,this.checkValid=function(a){return!(!a||!a.$valid)},this.validate=function(a){var c=d.defer(),g=0;if(void 0===a)return console.error("This is not a regular Form name scope"),c.reject("This is not a regular Form name scope"),c.promise;if(a.validationId)b.$broadcast(a.$name+"submit-"+a.validationId,g++);else if(a.constructor===Array)for(var h in a)b.$broadcast(a[h].$name+"submit-"+a[h].validationId,g++);else for(var i in a)"$"!==i[0]&&a[i].hasOwnProperty("$dirty")&&b.$broadcast(i+"submit-"+a[i].validationId,g++);return c.promise.success=function(a){return c.promise.then(function(b){a(b)}),c.promise},c.promise.error=function(a){return c.promise.then(null,function(b){a(b)}),c.promise},e(function(){f.checkValid(a)?c.resolve("success"):c.reject("error")}),c.promise},this.validCallback=null,this.invalidCallback=null,this.reset=function(a){if(void 0===a)return void console.error("This is not a regular Form name scope");if(a.validationId)b.$broadcast(a.$name+"reset-"+a.validationId);else if(a.constructor===Array)for(var c in a)b.$broadcast(a[c].$name+"reset-"+a[c].validationId);else for(var d in a)"$"!==d[0]&&a[d].hasOwnProperty("$dirty")&&b.$broadcast(d+"reset-"+a[d].validationId)},this.$get=["$injector",function(a){return g(a),{setErrorHTML:this.setErrorHTML,getErrorHTML:this.getErrorHTML,setSuccessHTML:this.setSuccessHTML,getSuccessHTML:this.getSuccessHTML,setExpression:this.setExpression,getExpression:this.getExpression,setDefaultMsg:this.setDefaultMsg,getDefaultMsg:this.getDefaultMsg,showSuccessMessage:this.showSuccessMessage,showErrorMessage:this.showErrorMessage,checkValid:this.checkValid,validate:this.validate,validCallback:this.validCallback,invalidCallback:this.invalidCallback,reset:this.reset}}]}angular.module("validation.provider").provider("$validation",a)}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$timeout"),d=a.get("$parse");return{link:function(a,e,f){var g=d(f.validationReset)(a);c(function(){e.on("click",function(a){a.preventDefault(),b.reset(g)})})}}}angular.module("validation.directive").directive("validationReset",a),a.$inject=["$injector"]}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$timeout"),d=a.get("$parse");return{priority:1,require:"?ngClick",link:function(a,e,f){var g=d(f.validationSubmit)(a);c(function(){e.off("click"),e.on("click",function(c){c.preventDefault(),b.validate(g).success(function(){d(f.ngClick)(a)})})})}}}angular.module("validation.directive").directive("validationSubmit",a),a.$inject=["$injector"]}.call(this),function(){function a(a){var b=a.get("$validation"),c=a.get("$q"),d=a.get("$timeout"),e=function(a,c,d,e,f){var g,h=c||b.getDefaultMsg(d).success;return g=e.messageId?angular.element(document.querySelector("#"+e.messageId)):a.next(),a.attr("no-validation-message")?g.css("display","none"):b.showSuccessMessage&&h?(g.html(b.getSuccessHTML(h)),g.css("display","")):g.css("display","none"),f.$setValidity(f.$name,!0),e.validCallback&&e.validCallback({message:h}),b.validCallback&&b.validCallback(a),!0},f=function(a,c,d,e,f){var g,h=c||b.getDefaultMsg(d).error;return g=e.messageId?angular.element(document.querySelector("#"+e.messageId)):a.next(),a.attr("no-validation-message")?g.css("display","none"):b.showErrorMessage&&h?(g.html(b.getErrorHTML(h)),g.css("display","")):g.css("display","none"),f.$setValidity(f.$name,!1),e.invalidCallback&&e.invalidCallback({message:h}),b.invalidCallback&&b.invalidCallback(a),!1},g={},h=function(a,d,g,i,j,k){var l=j.slice(0),m=l[0].trim(),n=m.indexOf("="),o=-1===n?m:m.substr(0,n),p=-1===n?null:m.substr(n+1),q=l.slice(1),r=o+"SuccessMessage",s=o+"ErrorMessage",t=b.getExpression(o),u={success:function(){return e(d,g[r],o,a,i),q.length?h(a,d,g,i,q,k):!0},error:function(){return f(d,g[s],o,a,i)}};return void 0===t?(console.error('You are using undefined validator "%s"',o),q.length?h(a,d,g,i,q,k):void 0):t.constructor===Function?c.all([b.getExpression(o)(k,a,d,g,p)]).then(function(a){return a&&a.length>0&&a[0]?u.success():u.error()},function(){return u.error()}):t.constructor===RegExp&&void 0!==k&&null!==k&&b.getExpression(o).test(k)?u.success():u.error()},i=function(){return(65536*(1+Math.random())|0).toString(16).substring(1)},j=function(){return i()+i()+i()+i()};return{restrict:"A",require:"ngModel",scope:{model:"=ngModel",initialValidity:"=initialValidity",validCallback:"&",invalidCallback:"&",messageId:"@"},link:function(a,b,c,e){var f,i=function(){},k=c.validator.split(","),l=e.validationId=j();return"boolean"==typeof a.initialValidity&&(f=a.initialValidity),a.messageId||b.after("<span></span>"),e.$setValidity(e.$name,f),a.$on(e.$name+"reset-"+l,function(){i(),d(function(){e.$setViewValue(""),e.$setPristine(),e.$setValidity(e.$name,void 0),e.$render(),a.messageId?angular.element(document.querySelector("#"+a.messageId)).html(""):b.next().html("")})}),a.$on(e.$name+"submit-"+l,function(f,j){var l=e.$viewValue,m=!1;m=h(a,b,c,e,k,l),"submit"===c.validMethod&&(i(),i=a.$watch("model",function(d,f){d=e.$viewValue,d!==f&&((void 0===d||null===d)&&(d=""),m=h(a,b,c,e,k,d))}));var n=function(a){a?delete g[j]:(g[j]=b[0],d(function(){g[Math.min.apply(null,Object.keys(g))].focus()},0))};m.constructor===Object?m.then(n):n(m)}),"blur"===c.validMethod?void b.bind("blur",function(){var d=e.$viewValue;a.$apply(function(){h(a,b,c,e,k,d)})}):void("submit"!==c.validMethod&&"submit-only"!==c.validMethod&&(a.$watch("model",function(d){if(d=e.$viewValue,e.$pristine&&e.$viewValue)e.$setViewValue(e.$viewValue);else if(e.$pristine)return void(a.messageId?angular.element(document.querySelector("#"+a.messageId)).html(""):b.next().html(""));h(a,b,c,e,k,d)}),d(function(){c.$observe("noValidationMessage",function(c){var d;d=a.messageId?angular.element(document.querySelector("#"+a.messageId)):b.next(),"true"===c||c===!0?d.css("display","none"):("false"===c||c===!1)&&d.css("display","block")})})))}}}angular.module("validation.directive").directive("validator",a),a.$inject=["$injector"]}.call(this);
\ No newline at end of file
diff --git a/src/validator.directive.js b/src/validator.directive.js
index 2ef0dfe..05265a8 100644
--- a/src/validator.directive.js
+++ b/src/validator.directive.js
@@ -24,7 +24,14 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showSuccessMessage && messageToShow) messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showSuccessMessage && messageToShow) {
+        messageElem.html($validationProvider.getSuccessHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
+      }
 
       ctrl.$setValidity(ctrl.$name, true);
       if (scope.validCallback) scope.validCallback({
@@ -52,8 +59,13 @@
       if (scope.messageId) messageElem = angular.element(document.querySelector('#' + scope.messageId));
       else messageElem = element.next();
 
-      if ($validationProvider.showErrorMessage && messageToShow) {
+      if (element.attr('no-validation-message')) {
+        messageElem.css('display', 'none');
+      } else if ($validationProvider.showErrorMessage && messageToShow) {
         messageElem.html($validationProvider.getErrorHTML(messageToShow));
+        messageElem.css('display', '');
+      } else {
+        messageElem.css('display', 'none');
       }
 
       ctrl.$setValidity(ctrl.$name, false);
diff --git a/test/unit/showMessageSpec.js b/test/unit/showMessageSpec.js
new file mode 100644
index 0000000..fb12760
--- /dev/null
+++ b/test/unit/showMessageSpec.js
@@ -0,0 +1,128 @@
+'use strict';
+
+/* jasmine specs for provider go here */
+
+describe('provider.showSuccessMessage=false', function() {
+  var $rootScope;
+  var $compile;
+  var $scope;
+  var $timeout;
+  var element;
+  var validationProvider;
+  var myApp;
+
+  beforeEach(function() {
+    myApp = angular.module('myApp', ['validation', 'validation.rule'])
+      .config(function($validationProvider) {
+        validationProvider = $validationProvider;
+        validationProvider.showSuccessMessage = false;
+      });
+    return myApp;
+  });
+
+  beforeEach(module('myApp'));
+
+  beforeEach(inject(function($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+    $scope = $rootScope.$new();
+    $timeout = $injector.get('$timeout');
+
+    element = $compile('<form name="Form"><input type="text" name="required" ng-model="required" validator="required"></form>')($scope);
+  }));
+
+  it('showSuccessMessage', inject(function() {
+    $scope.Form.required.$setViewValue('Required');
+    var display = element.find('span').css('display');
+    expect(display).toBe('none');
+
+    $scope.Form.required.$setViewValue('');
+    display = element.find('span').css('display');
+    expect(display).toBe('');
+  }));
+
+});
+
+describe('provider.showErrorMessage=false', function() {
+  var $rootScope;
+  var $compile;
+  var $scope;
+  var $timeout;
+  var element;
+  var validationProvider;
+  var myApp;
+
+  beforeEach(function() {
+    myApp = angular.module('myApp', ['validation', 'validation.rule'])
+      .config(function($validationProvider) {
+        validationProvider = $validationProvider;
+        validationProvider.showErrorMessage = false;
+      });
+    return myApp;
+  });
+
+  beforeEach(module('myApp'));
+
+  beforeEach(inject(function($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+    $scope = $rootScope.$new();
+    $timeout = $injector.get('$timeout');
+
+    element = $compile('<form name="Form"><input type="text" name="required" ng-model="required" validator="required"></form>')($scope);
+  }));
+
+  it('showErrorMessage', inject(function() {
+    $scope.Form.required.$setViewValue('Required');
+    var display = element.find('span').css('display');
+    expect(display).toBe('');
+
+    $scope.Form.required.$setViewValue('');
+    display = element.find('span').css('display');
+    expect(display).toBe('none');
+  }));
+
+});
+
+// no-validation-message should has higher priority than showErrorMessage/showSuccessMessage
+describe('provider.showErrorMessage=false with no-validation-message', function() {
+  var $rootScope;
+  var $compile;
+  var $scope;
+  var $timeout;
+  var element;
+  var validationProvider;
+  var myApp;
+
+  beforeEach(function() {
+    myApp = angular.module('myApp', ['validation', 'validation.rule'])
+      .config(function($validationProvider) {
+        validationProvider = $validationProvider;
+        validationProvider.showErrorMessage = true;
+        validationProvider.showSuccessMessage = true;
+      });
+    return myApp;
+  });
+
+  beforeEach(module('myApp'));
+
+  beforeEach(inject(function($injector) {
+    $rootScope = $injector.get('$rootScope');
+    $compile = $injector.get('$compile');
+    $scope = $rootScope.$new();
+    $timeout = $injector.get('$timeout');
+
+    element = $compile('<form name="Form"><input type="text" name="required" ng-model="required" validator="required" no-validation-message></form>')($scope);
+  }));
+
+  it('showErrorMessage', inject(function() {
+    $scope.Form.required.$setViewValue('Required');
+    var display = element.find('span').css('display');
+    expect(display).toBe('');
+
+    $scope.Form.required.$setViewValue('');
+    display = element.find('span').css('display');
+    expect(display).toBe('');
+  }));
+
+});