@@ -773,15 +773,15 @@ function dtRendererService(DTLoadingTemplate) {
773
773
}
774
774
775
775
function postRender ( options , result ) {
776
- plugins . forEach ( function ( plugin ) {
776
+ angular . forEach ( plugins , function ( plugin ) {
777
777
if ( angular . isFunction ( plugin . postRender ) ) {
778
778
plugin . postRender ( options , result ) ;
779
779
}
780
780
} ) ;
781
781
}
782
782
783
783
function preRender ( options ) {
784
- plugins . forEach ( function ( plugin ) {
784
+ angular . forEach ( plugins , function ( plugin ) {
785
785
if ( angular . isFunction ( plugin . preRender ) ) {
786
786
plugin . preRender ( options ) ;
787
787
}
@@ -1231,7 +1231,7 @@ function dtPropertyUtil($q) {
1231
1231
} else {
1232
1232
resolvedObj = angular . extend ( resolvedObj , obj ) ;
1233
1233
for ( var prop in resolvedObj ) {
1234
- if ( resolvedObj . hasOwnProperty ( prop ) && excludedProp . indexOf ( prop ) === - 1 ) {
1234
+ if ( resolvedObj . hasOwnProperty ( prop ) && $ . inArray ( prop , excludedProp ) === - 1 ) {
1235
1235
if ( angular . isArray ( resolvedObj [ prop ] ) ) {
1236
1236
promises . push ( resolveArrayPromises ( resolvedObj [ prop ] ) ) ;
1237
1237
} else {
@@ -1242,7 +1242,7 @@ function dtPropertyUtil($q) {
1242
1242
$q . all ( promises ) . then ( function ( result ) {
1243
1243
var index = 0 ;
1244
1244
for ( var prop in resolvedObj ) {
1245
- if ( resolvedObj . hasOwnProperty ( prop ) && excludedProp . indexOf ( prop ) === - 1 ) {
1245
+ if ( resolvedObj . hasOwnProperty ( prop ) && $ . inArray ( prop , excludedProp ) === - 1 ) {
1246
1246
resolvedObj [ prop ] = result [ index ++ ] ;
1247
1247
}
1248
1248
}
@@ -1264,15 +1264,15 @@ function dtPropertyUtil($q) {
1264
1264
if ( ! angular . isArray ( array ) ) {
1265
1265
defer . resolve ( array ) ;
1266
1266
} else {
1267
- array . forEach ( function ( item ) {
1267
+ angular . forEach ( array , function ( item ) {
1268
1268
if ( angular . isObject ( item ) ) {
1269
1269
promises . push ( resolveObjectPromises ( item ) ) ;
1270
1270
} else {
1271
1271
promises . push ( $q . when ( item ) ) ;
1272
1272
}
1273
1273
} ) ;
1274
1274
$q . all ( promises ) . then ( function ( result ) {
1275
- result . forEach ( function ( item ) {
1275
+ angular . forEach ( result , function ( item ) {
1276
1276
resolveArray . push ( item ) ;
1277
1277
} ) ;
1278
1278
defer . resolve ( resolveArray ) ;
0 commit comments