Ticket #7421: hash.2.diff

File hash.2.diff, 2.5 kB (added by Tobie, 2 years ago)
and a version with browser sniffing

src/hash.js

old	new
5	5	Object.extend(Hash, {
6	6	toQueryString: function(obj) {
7	7	var parts = [];
8
9		this.prototype._each.call(obj, function(pair) {
	8
	9	this.prototype._each.call(obj, function(pair) {
10	10	if (!pair.key) return;
11
	11
12	12	if (pair.value && pair.value.constructor == Array) {
13	13	var values = pair.value.compact();
14	14	if (values.length < 2) pair.value = values.reduce();
15	15	else {
16		key = encodeURIComponent(pair.key);
	16	key = encodeURIComponent(pair.key);
17	17	values.each(function(value) {
18		value = value != undefined ? ~~encodeURIComponent(value)~~ : '';
	18	value = value != undefined ? value : '';
19	19	parts.push(key + '=' + encodeURIComponent(value));
20	20	});
21	21	return;
…	…
23	23	}
24	24	if (pair.value == undefined) pair[1] = '';
25	25	parts.push(pair.map(encodeURIComponent).join('='));
26		});
27
	26	});
	27
28	28	return parts.join('&');
29	29	}
30	30	});
…	…
32	32	Object.extend(Hash.prototype, Enumerable);
33	33	Object.extend(Hash.prototype, {
34	34	_each: function(iterator) {
	35	if (navigator.userAgent.include(' AppleWebKit/')
	36	&& parseInt(navigator.userAgent.match(/ AppleWebKit\/(\d+)/)[1]) < 420)
	37	var cache = [];
35	38	for (var key in this) {
36	39	var value = this[key];
37	40	if (value && value == Hash.prototype[key]) continue;
38
	41	if (cache) {
	42	if(cache.include(key)) continue;
	43	cache.push(key);
	44	}
39	45	var pair = [key, value];
40	46	pair.key = key;
41	47	pair.value = value;

old	new
104	104	assertEqual("color=", $H(Fixtures.multiple_all_nil).toQueryString())
105	105	assertEqual("color=", $H(Fixtures.multiple_empty).toQueryString())
106	106
107		assertEqual("_each=E&map=M&keys=K&values=V&collect=C&inject=I", Hash.toQueryString(Fixtures.dangerous))
	107	assertEnumEqual($w("_each=E map=M keys=K values=V collect=C inject=I").sort(),
	108	Hash.toQueryString(Fixtures.dangerous).split('&').sort());
	109	assertEnumEqual($w('_each=E map=M keys=K values=V collect=C inject=I').sort(),
	110	$H(Fixtures.dangerous).toQueryString().split('&').sort());
108	111	}},
109	112
110	113	testInspect: function(){ with(this) {