Skip to content

Commit a4fc4a9

Browse files
committed
Update calculate add-on in demo
1 parent bb6a237 commit a4fc4a9

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

examples/add-on/calculate.js

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,41 @@ angular
2727
.module('schemaForm')
2828
.run(function($templateCache) {
2929
// A template to use
30-
$templateCache.put('calculated-fields.html','<calculate sf-field-model model="model" form="form" />');
30+
$templateCache.put('calculated-fields.html', '<calculate sf-field-model model="model" form="form" />');
3131
})
32-
.directive('calculate', ['$compile', '$http', 'sfBuilder', 'sfSelect', '$interpolate', 'schemaFormDecorators',
32+
.directive('calculate', [ '$compile', '$http', 'sfBuilder', 'sfSelect', '$interpolate', 'schemaFormDecorators',
3333
function($compile, $http, sfBuilder, sfSelect, $interpolate, schemaFormDecoratorsProvider) {
3434
return {
3535
restrict: 'E',
3636
scope: true,
3737
link: {
3838
post: function(scope, element, attrs, ctrl) {
39-
var watchKeys = scope.form.watch,
40-
key, keyFixed, exec,
41-
i;
39+
let watchKeys = scope.form.watch;
40+
let key;
41+
let keyFixed;
42+
let i;
4243

4344
scope.form.format = scope.form.format || 'number';
4445

4546
for (i=0; i < watchKeys.length; i++) {
4647
key = watchKeys[i].split('[]');
47-
keyFixed = key.reduce(function(pv, cv, ci, ta){
48+
keyFixed = key.reduce(function(pv, cv, ci, ta) {
4849
return '' + pv + ((cv[0]=='.')? '['+scope.$i[ci-1]+']'+cv: cv);
4950
});
5051

5152
scope.$watch(keyFixed,
5253
function (val, old) {
53-
var newValue = $interpolate('{{' + scope.form.calculate + '}}', false, null, true)({
54+
let newValue = $interpolate('{{' + scope.form.calculate + '}}', false, null, true)({
5455
model: scope.model,
5556
$i: scope.$i,
5657
$index: scope.$index,
57-
path: scope.path
58+
path: scope.path,
5859
});
5960

6061
if(scope.form.lookup) {
6162
scope.model.calculated = encodeURIComponent(newValue);
62-
var lookup = $interpolate(scope.form.lookup, false, null, true)(scope.model);
63+
let lookup = $interpolate(scope.form.lookup, false, null, true)(scope.model);
64+
6365
$http.get(lookup, { responseType: 'json' })
6466
.success(function(response, status) {
6567
if(response.data) update(response.data);
@@ -73,29 +75,33 @@ angular
7375
update(newValue);
7476
};
7577

78+
/**
79+
* I update the model for the key
80+
*
81+
* @param {[type]} value [description]
82+
*/
7683
function update(value) {
7784
if(scope.form.format == 'number') value = Number(value);
7885
sfSelect(scope.form.key, scope.model, value);
7986
};
8087
});
8188
};
82-
}
83-
}
89+
},
90+
},
8491
};
85-
}
92+
},
8693
])
8794
.config([ 'schemaFormDecoratorsProvider', 'sfBuilderProvider',
8895
function(schemaFormDecoratorsProvider, sfBuilderProvider) {
89-
var sfField = sfBuilderProvider.builders.sfField;
90-
var ngModel = sfBuilderProvider.builders.ngModel;
91-
var ngModelOptions = sfBuilderProvider.builders.ngModelOptions;
92-
var defaults = [ sfField, ngModel ];
96+
let sfField = sfBuilderProvider.builders.sfField;
97+
let ngModel = sfBuilderProvider.builders.ngModel;
98+
let defaults = [ sfField, ngModel ];
9399

94100
schemaFormDecoratorsProvider.defineAddOn(
95101
'bootstrapDecorator',
96102
'calculate',
97103
'calculated-fields.html',
98104
defaults
99105
);
100-
}
106+
},
101107
]);

0 commit comments

Comments
 (0)