Skip to content

Commit dcaad36

Browse files
committed
v0.6.1 fix for underscore override
1 parent 392e4ac commit dcaad36

File tree

8 files changed

+72
-67
lines changed

8 files changed

+72
-67
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ngReactGrid - v0.5.0
1+
ngReactGrid - v0.6.1
22
===========
33

44
ngReactGrid is an Angular directive that can be used to render an enhanced HTML table or grid of data very fast using React as the rendering engine.

build/js/ngReactGrid-0.5.0.min.js

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
11
/**
2-
* @license ngReactGrid v0.5.0
2+
* @license ngReactGrid v0.6.1
33
* (c) 2010-2014 Jose Garcia - http://josebalius.github.io/ngReactGrid/
44
* License: MIT
55
*/
6-
var _ = {
7-
nativeForEach: Array.prototype.forEach,
8-
each: function(obj, iterator, context) {
9-
if (obj == null) return obj;
10-
if (this.nativeForEach && obj.forEach === this.nativeForEach) {
11-
obj.forEach(iterator, context);
12-
} else if (obj.length === +obj.length) {
13-
for (var i = 0, length = obj.length; i < length; i++) {
14-
if (iterator.call(context, obj[i], i, obj) === breaker) return;
15-
}
16-
} else {
17-
var keys = _.keys(obj);
18-
for (var i = 0, length = keys.length; i < length; i++) {
19-
if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
20-
}
21-
}
22-
return obj;
23-
},
24-
slice: Array.prototype.slice,
25-
extend: function(obj) {
26-
this.each(this.slice.call(arguments, 1), function(source) {
27-
if (source) {
28-
for (var prop in source) {
29-
obj[prop] = source[prop];
6+
if (typeof _ === 'undefined') {
7+
var _ = {
8+
nativeForEach: Array.prototype.forEach,
9+
each: function (obj, iterator, context) {
10+
if (obj == null) return obj;
11+
if (this.nativeForEach && obj.forEach === this.nativeForEach) {
12+
obj.forEach(iterator, context);
13+
} else if (obj.length === +obj.length) {
14+
for (var i = 0, length = obj.length; i < length; i++) {
15+
if (iterator.call(context, obj[i], i, obj) === breaker) return;
16+
}
17+
} else {
18+
var keys = _.keys(obj);
19+
for (var i = 0, length = keys.length; i < length; i++) {
20+
if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
3021
}
3122
}
32-
});
33-
return obj;
34-
}
35-
};
23+
return obj;
24+
},
25+
slice: Array.prototype.slice,
26+
extend: function (obj) {
27+
this.each(this.slice.call(arguments, 1), function (source) {
28+
if (source) {
29+
for (var prop in source) {
30+
obj[prop] = source[prop];
31+
}
32+
}
33+
});
34+
return obj;
35+
}
36+
};
37+
}
38+
3639
/**
3740
* @module ngReactGrid
3841
*/

0 commit comments

Comments
 (0)