@@ -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
}
@@ -1237,7 +1237,7 @@ function dtPropertyUtil($q) {
1237
1237
} else {
1238
1238
resolvedObj = angular . extend ( resolvedObj , obj ) ;
1239
1239
for ( var prop in resolvedObj ) {
1240
- if ( resolvedObj . hasOwnProperty ( prop ) && excludedProp . indexOf ( prop ) === - 1 ) {
1240
+ if ( resolvedObj . hasOwnProperty ( prop ) && $ . inArray ( prop , excludedProp ) === - 1 ) {
1241
1241
if ( angular . isArray ( resolvedObj [ prop ] ) ) {
1242
1242
promises . push ( resolveArrayPromises ( resolvedObj [ prop ] ) ) ;
1243
1243
} else {
@@ -1248,7 +1248,7 @@ function dtPropertyUtil($q) {
1248
1248
$q . all ( promises ) . then ( function ( result ) {
1249
1249
var index = 0 ;
1250
1250
for ( var prop in resolvedObj ) {
1251
- if ( resolvedObj . hasOwnProperty ( prop ) && excludedProp . indexOf ( prop ) === - 1 ) {
1251
+ if ( resolvedObj . hasOwnProperty ( prop ) && $ . inArray ( prop , excludedProp ) === - 1 ) {
1252
1252
resolvedObj [ prop ] = result [ index ++ ] ;
1253
1253
}
1254
1254
}
@@ -1270,15 +1270,15 @@ function dtPropertyUtil($q) {
1270
1270
if ( ! angular . isArray ( array ) ) {
1271
1271
defer . resolve ( array ) ;
1272
1272
} else {
1273
- array . forEach ( function ( item ) {
1273
+ angular . forEach ( array , function ( item ) {
1274
1274
if ( angular . isObject ( item ) ) {
1275
1275
promises . push ( resolveObjectPromises ( item ) ) ;
1276
1276
} else {
1277
1277
promises . push ( $q . when ( item ) ) ;
1278
1278
}
1279
1279
} ) ;
1280
1280
$q . all ( promises ) . then ( function ( result ) {
1281
- result . forEach ( function ( item ) {
1281
+ angular . forEach ( result , function ( item ) {
1282
1282
resolveArray . push ( item ) ;
1283
1283
} ) ;
1284
1284
defer . resolve ( resolveArray ) ;
0 commit comments