Skip to content

Fixed calls for validCallback/invalidCallback #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hueitan merged 3 commits into from
May 12, 2016
Merged

Fixed calls for validCallback/invalidCallback #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c4700d
Fixed calls for validCallback/invalidCallback
dmitry-dedukhin May 11, 2016
4679067
Fixed calls for validCallback/invalidCallback: tests & build
dmitry-dedukhin May 11, 2016
c502641
Fix build
dmitry-dedukhin May 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"quotmark": "single",
"node": true,
"globals": {
"angular": false,
"angular": true,
"document": false,
"jasmine": false,
"module": false,
Expand Down
9 changes: 6 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'}
]
Expand All @@ -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
Expand Down Expand Up @@ -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']);
};
61 changes: 61 additions & 0 deletions bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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']);

/***/ }
/******/ ]);
16 changes: 7 additions & 9 deletions dist/angular-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -419,7 +417,7 @@
}

ctrl.$setValidity(ctrl.$name, true);
if (validCallback) validCallback({
validCallback(scope, {
message: messageToShow
});
if ($validationProvider.validCallback) $validationProvider.validCallback(element);
Expand All @@ -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;
Expand All @@ -457,7 +455,7 @@
}

ctrl.$setValidity(ctrl.$name, false);
if (invalidCallback) invalidCallback({
invalidCallback(scope, {
message: messageToShow
});
if ($validationProvider.invalidCallback) $validationProvider.invalidCallback(element);
Expand Down
Loading