Skip to content

Commit 0a9d5d3

Browse files
mchapmanmchapman
committed
chore(depends) All dependencies are explicit versions. Working with Angular 1.3. Some warnings on install.
1 parent eec5f25 commit 0a9d5d3

File tree

9 files changed

+68
-368
lines changed

9 files changed

+68
-368
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ build.xml
1212
.tmp
1313
generated
1414
bower_components
15-
working_bower_components_20141119
1615
node_modules
1716
.idea
1817
typings
@@ -23,6 +22,7 @@ server/**/*.js
2322
server/**/*.map
2423

2524
test_out/*
25+
PhantomJS_1.9.8_(Linux_0.0.0)/test_out/unit.xml
2626

2727
lib-cov
2828
*.seed

‎Gruntfile.js

Lines changed: 0 additions & 293 deletions
This file was deleted.

‎bower.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"dist/forms-angular.js"
1919
],
2020
"dependencies": {
21-
"angular": "~1.3.0",
22-
"angular-sanitize": "~1.3.0",
23-
"angular-messages": "~1.3.0",
21+
"angular": "1.3.x",
22+
"angular-sanitize": "1.3.x",
23+
"angular-messages": "1.3.x",
2424
"angular-ui-bootstrap-bower": "^0.8 || ^0.13",
25-
"underscore": "1.8.2",
26-
"ngInfiniteScroll": "^1.2",
27-
"angular-elastic": "~2"
25+
"underscore": "1.8.3",
26+
"ngInfiniteScroll": "1.2.1",
27+
"angular-elastic": "2.5.1"
2828
},
2929
"devDependencies": {
30-
"angular-mocks": "~1.3",
30+
"angular-mocks": "1.3.x",
3131
"bootstrap-3-1-1": "git://github.com/twbs/bootstrap.git#v3.1.1",
3232
"bootstrap-2-3-2": "git://github.com/twbs/bootstrap.git#v2.3.2"
3333
},

‎dist/forms-angular.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2498,7 +2498,12 @@ var fng;
24982498
value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + fieldInfo.helpInline + '</span>';
24992499
}
25002500
// If we have chosen
2501-
value += '<div ng-if="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block" ng-messages="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$error" ng-messages-include="error-messages.html"></div>';
2501+
value += '<div ng-if="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block">' +
2502+
' <div ng-messages="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$error">' +
2503+
' <div ng-messages-include="error-messages.html">' +
2504+
' </div>' +
2505+
' </div>' +
2506+
'</div>';
25022507
if (fieldInfo.help) {
25032508
value += '<span class="help-block">' + fieldInfo.help + '</span>';
25042509
}

‎dist/forms-angular.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/forms-angular.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)