Skip to content

Commit a7cb015

Browse files
mbostockmbostock
committed
Object.defineProperty is now required.
Since d3.map and d3.set now rely on Object.create(null), we also now rely on Object.defineProperty to create non-enumerable properties.
1 parent d9f6288 commit a7cb015

File tree

5 files changed

+93
-158
lines changed

5 files changed

+93
-158
lines changed

‎d3.js‎

Lines changed: 44 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,13 @@
223223
return k;
224224
}
225225
function d3_class(ctor, properties) {
226-
try {
227-
for (var key in properties) {
228-
Object.defineProperty(ctor.prototype, key, {
229-
value: properties[key],
230-
enumerable: false
231-
});
232-
}
233-
} catch (e) {
234-
ctor.prototype = properties;
226+
for (var key in properties) {
227+
Object.defineProperty(ctor.prototype, key, {
228+
value: properties[key],
229+
enumerable: false
230+
});
235231
}
236232
}
237-
function d3_identity(d) {
238-
return d;
239-
}
240233
d3.map = function(object) {
241234
var map = new d3_Map();
242235
if (object instanceof d3_Map) object.forEach(function(key, value) {
@@ -247,31 +240,42 @@
247240
function d3_Map() {
248241
this._ = Object.create(null);
249242
}
250-
var d3_map_proto = "__proto__", d3_map_zero = "\x00", d3_map_prototype = {
243+
var d3_map_proto = "__proto__", d3_map_zero = "\x00";
244+
d3_class(d3_Map, {
251245
has: d3_map_has,
252-
get: d3_map_get,
253-
set: d3_map_set,
246+
get: function(key) {
247+
return this._[d3_map_escape(key)];
248+
},
249+
set: function(key, value) {
250+
return this._[d3_map_escape(key)] = value;
251+
},
254252
remove: d3_map_remove,
255253
keys: d3_map_keys,
256-
values: d3_map_values,
257-
entries: d3_map_entries,
254+
values: function() {
255+
var values = [];
256+
for (var key in this._) values.push(this._[key]);
257+
return values;
258+
},
259+
entries: function() {
260+
var entries = [];
261+
for (var key in this._) entries.push({
262+
key: d3_map_unescape(key),
263+
value: this._[key]
264+
});
265+
return entries;
266+
},
258267
size: d3_map_size,
259268
empty: d3_map_empty,
260-
forEach: d3_map_forEach
261-
};
262-
d3_class(d3_Map, d3_map_prototype);
269+
forEach: function(f) {
270+
for (var key in this._) f.call(this, d3_map_unescape(key), this._[key]);
271+
}
272+
});
263273
function d3_map_escape(key) {
264274
return (key += "") === d3_map_proto || key[0] === d3_map_zero ? d3_map_zero + key : key;
265275
}
266276
function d3_map_unescape(key) {
267277
return (key += "")[0] === d3_map_zero ? key.slice(1) : key;
268278
}
269-
function d3_map_get(key) {
270-
return this._[d3_map_escape(key)];
271-
}
272-
function d3_map_set(key, value) {
273-
return this._[d3_map_escape(key)] = value;
274-
}
275279
function d3_map_has(key) {
276280
return d3_map_escape(key) in this._;
277281
}
@@ -280,49 +284,18 @@
280284
}
281285
function d3_map_keys() {
282286
var keys = [];
283-
for (var key in this._) {
284-
keys.push(d3_map_unescape(key));
285-
}
287+
for (var key in this._) keys.push(d3_map_unescape(key));
286288
return keys;
287289
}
288-
function d3_map_values() {
289-
var entries = [];
290-
for (var key in this._) {
291-
entries.push({
292-
key: d3_map_unescape(key),
293-
value: this._[key]
294-
});
295-
}
296-
return entries;
297-
}
298-
function d3_map_entries() {
299-
var entries = [];
300-
for (var key in this._) {
301-
entries.push({
302-
key: key,
303-
value: this._[key]
304-
});
305-
}
306-
return entries;
307-
}
308290
function d3_map_size() {
309291
var size = 0;
310-
for (var key in this._) {
311-
++size;
312-
}
292+
for (var key in this._) ++size;
313293
return size;
314294
}
315295
function d3_map_empty() {
316-
for (var key in this._) {
317-
return false;
318-
}
296+
for (var key in this._) return false;
319297
return true;
320298
}
321-
function d3_map_forEach(f) {
322-
for (var key in this._) {
323-
f.call(this, d3_map_unescape(key), this._[key]);
324-
}
325-
}
326299
d3.nest = function() {
327300
var nest = {}, keys = [], sortKeys = [], sortValues, rollup;
328301
function map(mapType, array, depth) {
@@ -394,25 +367,20 @@
394367
function d3_Set() {
395368
this._ = Object.create(null);
396369
}
397-
var d3_set_prototype = {
370+
d3_class(d3_Set, {
398371
has: d3_map_has,
399-
add: d3_set_add,
372+
add: function(key) {
373+
this._[d3_map_escape(key)] = true;
374+
return key;
375+
},
400376
remove: d3_map_remove,
401377
values: d3_map_keys,
402378
size: d3_map_size,
403379
empty: d3_map_empty,
404-
forEach: d3_set_forEach
405-
};
406-
d3_class(d3_Set, d3_set_prototype);
407-
function d3_set_add(key) {
408-
this._[d3_map_escape(key)] = true;
409-
return key;
410-
}
411-
function d3_set_forEach(f) {
412-
for (var key in this._) {
413-
f.call(this, d3_map_unescape(key));
380+
forEach: function(f) {
381+
for (var key in this._) f.call(this, d3_map_unescape(key));
414382
}
415-
}
383+
});
416384
d3.behavior = {};
417385
d3.rebind = function(target, source) {
418386
var i = 1, n = arguments.length, method;
@@ -1857,6 +1825,9 @@
18571825
};
18581826
}
18591827
d3.functor = d3_functor;
1828+
function d3_identity(d) {
1829+
return d;
1830+
}
18601831
d3.xhr = d3_xhrType(d3_identity);
18611832
function d3_xhrType(response) {
18621833
return function(url, mimeType, callback) {

‎d3.min.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/arrays/map.js‎

Lines changed: 31 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import "../core/class";
2-
import "../core/identity";
32

43
d3.map = function(object) {
54
var map = new d3_Map;
@@ -13,21 +12,34 @@ function d3_Map() {
1312
}
1413

1514
var d3_map_proto = "__proto__",
16-
d3_map_zero = "\0",
17-
d3_map_prototype = {
18-
has: d3_map_has,
19-
get: d3_map_get,
20-
set: d3_map_set,
21-
remove: d3_map_remove,
22-
keys: d3_map_keys,
23-
values: d3_map_values,
24-
entries: d3_map_entries,
25-
size: d3_map_size,
26-
empty: d3_map_empty,
27-
forEach: d3_map_forEach
28-
};
29-
30-
d3_class(d3_Map, d3_map_prototype);
15+
d3_map_zero = "\0";
16+
17+
d3_class(d3_Map, {
18+
has: d3_map_has,
19+
get: function(key) {
20+
return this._[d3_map_escape(key)];
21+
},
22+
set: function(key, value) {
23+
return this._[d3_map_escape(key)] = value;
24+
},
25+
remove: d3_map_remove,
26+
keys: d3_map_keys,
27+
values: function() {
28+
var values = [];
29+
for (var key in this._) values.push(this._[key]);
30+
return values;
31+
},
32+
entries: function() {
33+
var entries = [];
34+
for (var key in this._) entries.push({key: d3_map_unescape(key), value: this._[key]});
35+
return entries;
36+
},
37+
size: d3_map_size,
38+
empty: d3_map_empty,
39+
forEach: function(f) {
40+
for (var key in this._) f.call(this, d3_map_unescape(key), this._[key]);
41+
}
42+
});
3143

3244
function d3_map_escape(key) {
3345
return (key += "") === d3_map_proto || key[0] === d3_map_zero ? d3_map_zero + key : key;
@@ -37,14 +49,6 @@ function d3_map_unescape(key) {
3749
return (key += "")[0] === d3_map_zero ? key.slice(1) : key;
3850
}
3951

40-
function d3_map_get(key) {
41-
return this._[d3_map_escape(key)];
42-
}
43-
44-
function d3_map_set(key, value) {
45-
return this._[d3_map_escape(key)] = value;
46-
}
47-
4852
function d3_map_has(key) {
4953
return d3_map_escape(key) in this._;
5054
}
@@ -55,45 +59,17 @@ function d3_map_remove(key) {
5559

5660
function d3_map_keys() {
5761
var keys = [];
58-
for (var key in this._) {
59-
keys.push(d3_map_unescape(key));
60-
}
62+
for (var key in this._) keys.push(d3_map_unescape(key));
6163
return keys;
6264
}
6365

64-
function d3_map_values() {
65-
var entries = [];
66-
for (var key in this._) {
67-
entries.push({key: d3_map_unescape(key), value: this._[key]});
68-
}
69-
return entries;
70-
}
71-
72-
function d3_map_entries() {
73-
var entries = [];
74-
for (var key in this._) {
75-
entries.push({key: key, value: this._[key]});
76-
}
77-
return entries;
78-
}
79-
8066
function d3_map_size() {
8167
var size = 0;
82-
for (var key in this._) {
83-
++size;
84-
}
68+
for (var key in this._) ++size;
8569
return size;
8670
}
8771

8872
function d3_map_empty() {
89-
for (var key in this._) {
90-
return false;
91-
}
73+
for (var key in this._) return false;
9274
return true;
9375
}
94-
95-
function d3_map_forEach(f) {
96-
for (var key in this._) {
97-
f.call(this, d3_map_unescape(key), this._[key]);
98-
}
99-
}

‎src/arrays/set.js‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,17 @@ function d3_Set() {
1111
this._ = Object.create(null);
1212
}
1313

14-
var d3_set_prototype = {
14+
d3_class(d3_Set, {
1515
has: d3_map_has,
16-
add: d3_set_add,
16+
add: function(key) {
17+
this._[d3_map_escape(key)] = true;
18+
return key;
19+
},
1720
remove: d3_map_remove,
1821
values: d3_map_keys,
1922
size: d3_map_size,
2023
empty: d3_map_empty,
21-
forEach: d3_set_forEach
22-
};
23-
24-
d3_class(d3_Set, d3_set_prototype);
25-
26-
function d3_set_add(key) {
27-
this._[d3_map_escape(key)] = true;
28-
return key;
29-
}
30-
31-
function d3_set_forEach(f) {
32-
for (var key in this._) {
33-
f.call(this, d3_map_unescape(key));
24+
forEach: function(f) {
25+
for (var key in this._) f.call(this, d3_map_unescape(key));
3426
}
35-
}
27+
});

‎src/core/class.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
function d3_class(ctor, properties) {
2-
try {
3-
for (var key in properties) {
4-
Object.defineProperty(ctor.prototype, key, {
5-
value: properties[key],
6-
enumerable: false
7-
});
8-
}
9-
} catch (e) {
10-
ctor.prototype = properties;
2+
for (var key in properties) {
3+
Object.defineProperty(ctor.prototype, key, {
4+
value: properties[key],
5+
enumerable: false
6+
});
117
}
128
}

0 commit comments

Comments
 (0)