Skip to content

Commit d81ab6e

Browse files
committed
WIP
1 parent a9dbf2c commit d81ab6e

File tree

9 files changed

+228
-196
lines changed

9 files changed

+228
-196
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ package-lock.json
1919

2020
website/node_modules
2121
website/app/bower_components
22+
website/failed_tests
23+
website/test/e2e/failed_tests

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"angular-elastic": "2.5.1",
4747
"angular-messages": "1.7.8",
4848
"angular-sanitize": "1.7.8",
49+
"angular-animate": "1.7.8",
4950
"angular-ui-bootstrap": "1.3.2 || 2.5.6",
5051
"angular-ui-grid": "^4.8.1",
5152
"async": "3.1.0",

src/client/index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ declare module fng {
282282
modelName: string;
283283
formName: string;
284284
alertTitle: any;
285+
errorVisible: boolean;
285286
errorMessage: any;
286287
errorHideTimer: number;
287288
save: any;
@@ -337,6 +338,7 @@ declare module fng {
337338
getListData: any;
338339
dismissError: () => void;
339340
stickError: () => void;
341+
clearTimeout: () => void;
340342
handleHttpError: (response: any) => void;
341343
dropConversionWatcher: () => void;
342344
}

src/client/js/controllers/base.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module fng.controllers {
1818
allowLocationChange: true // Set when the data arrives..
1919
};
2020

21+
$scope.errorVisible = false;
2122
angular.extend($scope, routingService.parsePathFunc()($location.$$path));
2223

2324
// Load context menu. For /person/client/:id/edit we need

src/client/js/forms-angular.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ module fng {
2929
export var formsAngular = angular.module('formsAngular', [
3030
'ngSanitize',
3131
'ngMessages',
32+
'ngAnimate',
3233
'ui.bootstrap',
3334
'infinite-scroll',
3435
'monospaced.elastic'

src/client/js/services/record-handler.ts

Lines changed: 210 additions & 195 deletions
Large diffs are not rendered by default.

src/client/less/forms-angular-bs-common.less

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,18 @@ button#saveButton[disabled]:hover + #why-disabled.showwhy {
212212
}
213213

214214
#display-error {
215-
transition: opacity .5s ease-in-out;
216215
position: fixed;
217216
top: 60px;
218217
width: 100%;
218+
z-index: 109;
219+
}
220+
221+
#display-error.ng-hide {
222+
opacity: 0;
223+
}
224+
#display-error.ng-hide-add,
225+
#display-error.ng-hide-remove {
226+
transition: all linear 0.5s;
219227
}
220228

221229
input[type="checkbox"].ng-invalid::after {

website/app/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<script src="angular-route/angular-route.js"></script>
6767
<script src="angular-sanitize/angular-sanitize.js"></script>
6868
<script src="angular-messages/angular-messages.js"></script>
69+
<script src="angular-animate/angular-animate.js"></script>
6970
<script src="angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>
7071
<script src="ng-infinite-scroll/build/ng-infinite-scroll.js"></script>
7172
<script src="lodash/lodash.js"></script>

website/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"angular-elastic": "2.5.1",
1616
"angular-messages": "1.7.8",
1717
"angular-route": "1.7.8",
18+
"angular-animate": "1.7.8",
1819
"angular-sanitize": "1.7.8",
1920
"angular-ui-bootstrap": "1.3.2 || 2.5.6",
2021
"angular-ui-grid": "^4.8.1",

0 commit comments

Comments
 (0)