Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 8eb879d

Browse files
committed
Merge branch 'dtychshenko-ie8' into dev
Conflicts: dist/angular-datatables.min.js
2 parents 6b23cd3 + a074914 commit 8eb879d

4 files changed

+13
-13
lines changed

dist/angular-datatables.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,15 +773,15 @@ function dtRendererService(DTLoadingTemplate) {
773773
}
774774

775775
function postRender(options, result) {
776-
plugins.forEach(function(plugin) {
776+
angular.forEach(plugins, function(plugin) {
777777
if (angular.isFunction(plugin.postRender)) {
778778
plugin.postRender(options, result);
779779
}
780780
});
781781
}
782782

783783
function preRender(options) {
784-
plugins.forEach(function(plugin) {
784+
angular.forEach(plugins, function(plugin) {
785785
if (angular.isFunction(plugin.preRender)) {
786786
plugin.preRender(options);
787787
}
@@ -1237,7 +1237,7 @@ function dtPropertyUtil($q) {
12371237
} else {
12381238
resolvedObj = angular.extend(resolvedObj, obj);
12391239
for (var prop in resolvedObj) {
1240-
if (resolvedObj.hasOwnProperty(prop) && excludedProp.indexOf(prop) === -1) {
1240+
if (resolvedObj.hasOwnProperty(prop) && $.inArray(prop, excludedProp) === -1) {
12411241
if (angular.isArray(resolvedObj[prop])) {
12421242
promises.push(resolveArrayPromises(resolvedObj[prop]));
12431243
} else {
@@ -1248,7 +1248,7 @@ function dtPropertyUtil($q) {
12481248
$q.all(promises).then(function(result) {
12491249
var index = 0;
12501250
for (var prop in resolvedObj) {
1251-
if (resolvedObj.hasOwnProperty(prop) && excludedProp.indexOf(prop) === -1) {
1251+
if (resolvedObj.hasOwnProperty(prop) && $.inArray(prop, excludedProp) === -1) {
12521252
resolvedObj[prop] = result[index++];
12531253
}
12541254
}
@@ -1270,15 +1270,15 @@ function dtPropertyUtil($q) {
12701270
if (!angular.isArray(array)) {
12711271
defer.resolve(array);
12721272
} else {
1273-
array.forEach(function(item) {
1273+
angular.forEach(array, function(item) {
12741274
if (angular.isObject(item)) {
12751275
promises.push(resolveObjectPromises(item));
12761276
} else {
12771277
promises.push($q.when(item));
12781278
}
12791279
});
12801280
$q.all(promises).then(function(result) {
1281-
result.forEach(function(item) {
1281+
angular.forEach(result, function(item) {
12821282
resolveArray.push(item);
12831283
});
12841284
defer.resolve(resolveArray);

0 commit comments

Comments
 (0)