Merge pull request #206 from dmitry-dedukhin/patch-2

Fixed calls for validCallback/invalidCallback

Author: Huei Tan

.jshintrc

@@ -2,7 +2,7 @@
   "quotmark": "single",
   "node": true,
   "globals": {
-    "angular": false,
+    "angular": true,
     "document": false,
     "jasmine": false,
     "module": false,

Gruntfile.js

@@ -16,7 +16,10 @@ module.exports = function(grunt) {
     },
     copy: {
       main: {
-        files: [
+        files: [{
+            src: './bundle.js',
+            dest: 'dist/'
+          }
           // {expand: true, cwd: 'demo', src: ['script.js'], dest: 'dist'} // partials html file
           // {expand: true, cwd: 'app', src: ['*.*'], dest: 'dist/'}
         ]
@@ -39,7 +42,7 @@ module.exports = function(grunt) {
       }
     },
     jsbeautifier: {
-      files: ['*.js', 'src/**/*.js', 'test/unit/*.js', 'demo/*.js'],
+      files: ['src/**/*.js', 'test/unit/*.js', 'demo/*.js'],
       options: {
         js: {
           indent_size: 2
@@ -106,7 +109,7 @@ module.exports = function(grunt) {
   // Register Task
   grunt.registerTask('dev', ['browserSync', 'watch']);
   grunt.registerTask('check', ['jshint', 'jsbeautifier']); // use this before commit
-  grunt.registerTask('build', ['check', 'clean', 'concat', 'uglify']);
+  grunt.registerTask('build', ['check', 'clean', 'concat', 'uglify', 'copy']);
   grunt.registerTask('test', ['build', 'karma']);
   grunt.registerTask('cov', ['coveralls']);
 };

bundle.js

@@ -0,0 +1,61 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = '';
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	module.exports = __webpack_require__(1);
+
+
+/***/ },
+/* 1 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+	angular.module('validation', ['validation.provider', 'validation.directive']);
+	angular.module('validation.provider', []);
+	angular.module('validation.directive', ['validation.provider']);
+
+/***/ }
+/******/ ]);

dist/angular-validation.js

@@ -1,8 +1,6 @@
-(function() {
-  angular.module('validation', ['validation.provider', 'validation.directive']);
-  angular.module('validation.provider', []);
-  angular.module('validation.directive', ['validation.provider']);
-}).call(this);
+angular.module('validation', ['validation.provider', 'validation.directive']);
+angular.module('validation.provider', []);
+angular.module('validation.directive', ['validation.provider']);
 
 (function() {
   angular
@@ -401,7 +399,7 @@
      */
     var validFunc = function(element, validMessage, validation, scope, ctrl, attrs) {
       var messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).success;
-      var validCallback = $parse('success');
+      var validCallback = $parse(attrs.validCallback);
       var messageId = attrs.messageId;
       var validationGroup = attrs.validationGroup;
       var messageElem;
@@ -419,7 +417,7 @@
       }
 
       ctrl.$setValidity(ctrl.$name, true);
-      if (validCallback) validCallback({
+      validCallback(scope, {
         message: messageToShow
       });
       if ($validationProvider.validCallback) $validationProvider.validCallback(element);
@@ -439,7 +437,7 @@
      */
     var invalidFunc = function(element, validMessage, validation, scope, ctrl, attrs) {
       var messageToShow = validMessage || $validationProvider.getDefaultMsg(validation).error;
-      var invalidCallback = $parse('error');
+      var invalidCallback = $parse(attrs.invalidCallback);
       var messageId = attrs.messageId;
       var validationGroup = attrs.validationGroup;
       var messageElem;
@@ -457,7 +455,7 @@
       }
 
       ctrl.$setValidity(ctrl.$name, false);
-      if (invalidCallback) invalidCallback({
+      invalidCallback(scope, {
         message: messageToShow
       });
       if ($validationProvider.invalidCallback) $validationProvider.invalidCallback(element);