Skip to content

fix(angular-validation-match): Integration with Babel & Typescript #2517

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
merged 5 commits into from
Mar 12, 2017
Merged

fix(angular-validation-match): Integration with Babel & Typescript #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5d6dae
Fix form field not displaying sequalize error
stherrienaspnet Dec 10, 2016
3c42fdb
fix: Fix form field not displaying sequalize error
stherrienaspnet Dec 16, 2016
8cbe798
Merged branch master into master
stherrienaspnet Feb 1, 2017
955c406
Merge branch 'master' of https://github.com/angular-fullstack/generat…
stherrienaspnet Mar 12, 2017
f283e4c
Fixed match integration for Babel & Typescript
stherrienaspnet Mar 12, 2017
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
3 changes: 2 additions & 1 deletion src/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ export class Generator extends Base {
['ngRoute', 'angular-route'],
['uiBootstrap', 'angular-ui-bootstrap'],
['ngMessages', 'angular-messages'],
['io', 'socket.io-client']
['io', 'socket.io-client'],
['ngValidationMatch', 'angular-validation-match']
];
function replacer(contents) {
modulesToFix.forEach(([moduleName, importName]) => {
Expand Down
8 changes: 5 additions & 3 deletions templates/app/client/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import angular from 'angular';
import ngCookies from 'angular-cookies';
import ngResource from 'angular-resource';
import ngSanitize from 'angular-sanitize';
import ngValidationMatch from 'angular-validation-match';

<%_ if(filters.socketio) { _%>
import 'angular-socket-io';<% } %>
<%_ if(filters.ngroute) { _%>
Expand All @@ -15,6 +15,7 @@ import uiRouter from 'angular-ui-router';<% } %>
import uiBootstrap from 'angular-ui-bootstrap';<% } %>
// import ngMessages from 'angular-messages';
<%_ if(filters.auth) { _%>
import ngValidationMatch from 'angular-validation-match';
<% } %>


Expand All @@ -39,7 +40,6 @@ angular.module('<%= scriptAppName %>', [
ngCookies,
ngResource,
ngSanitize,
'validation.match',
<%_ if(filters.socketio) { %>
'btford.socket-io',<% } %>
<%_ if(filters.ngroute) { %>
Expand All @@ -51,7 +51,9 @@ angular.module('<%= scriptAppName %>', [
<%_ if(filters.auth) { %>
_Auth,
account,
admin,<% } _%>
admin,
'validation.match',
<% } _%>
navbar,
footer,
main,
Expand Down