Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
niceue committed Aug 28, 2016
2 parents 243a5e4 + eff4c46 commit 922d8db
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 20 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,21 @@ width `<script>` tag:
```html
<script src="path/to/nice-validator/jquery.validator.min.js?local=en"></script>
```
via [webpack](http://webpack.github.io/)
```javascript
require('nice-validator')
require('nice-validator/local/zh-CN')
```

via module loader [Requirejs](http://requirejs.org/):
```javascript
requirejs.config({
paths: {
jquery: 'http://cdn.jsdelivr.net/jquery/1.12.3/jquery.min',
validator: 'path/to/jquery.validator.js?local=en'
validator: 'path/to/nice-validator/local/en'
},
shim: {
validator: ['path/to/nice-validator/jquery.validator.js?css']
}
});

Expand Down
12 changes: 4 additions & 8 deletions dist/jquery.validator.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! nice-validator 1.0.5
/*! nice-validator 1.0.6
* (c) 2012-2016 Jony Zhang <niceue@live.com>, MIT Licensed
* https://github.com/niceue/nice-validator
*/
Expand Down Expand Up @@ -71,6 +71,7 @@
valid: null,
invalid: null,
validation: null,
formClass: 'n-default',
validClass: 'n-valid',
invalidClass: 'n-invalid',
bindClassTo: null
Expand Down Expand Up @@ -103,17 +104,12 @@
msgWrapper: 'span',
msgArrow: '',
msgIcon: '<span class="n-icon"></span>',
msgClass: '',
msgClass: 'n-right',
msgStyle: '',
msgShow: null,
msgHide: null
},
themes = {
'default': {
formClass: 'n-default',
msgClass: 'n-right'
}
};
themes = {};

/** jQuery Plugin
* @param {Object} options
Expand Down

0 comments on commit 922d8db

Please sign in to comment.