paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dict: Replace items method with @@iterator method.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-02-03 00:04:48 -08:00
committed by Tim Abbott
parent 9e1343ff8a
commit fac2c71776
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/dict.js
View File

@@ -26,7 +26,7 @@ run_test('basic', () => {
assert.deepEqual([...d.keys()], ['foo', 'bar']); assert.deepEqual([...d.keys()], ['foo', 'bar']);
assert.deepEqual([...d.values()], ['baz', 'qux']); assert.deepEqual([...d.values()], ['baz', 'qux']);
assert.deepEqual(d.items(), [['foo', 'baz'], ['bar', 'qux']]); assert.deepEqual([...d], [['foo', 'baz'], ['bar', 'qux']]);
d.delete('bar'); d.delete('bar');
assert.equal(d.has('bar'), false); assert.equal(d.has('bar'), false);
@@ -83,12 +83,12 @@ run_test('restricted_keys', () => {
run_test('construction', () => { run_test('construction', () => {
const d1 = new Dict(); const d1 = new Dict();
assert.deepEqual(d1.items(), []); assert.deepEqual([...d1], []);
const d2 = new Dict(); const d2 = new Dict();
d2.set('foo', 'bar'); d2.set('foo', 'bar');
d2.set('baz', 'qux'); d2.set('baz', 'qux');
assert.deepEqual(d2.items(), [['foo', 'bar'], ['baz', 'qux']]); assert.deepEqual([...d2], [['foo', 'bar'], ['baz', 'qux']]);
}); });
run_test('each', () => { run_test('each', () => {

2
frontend_tests/node_tests/fold_dict.js
View File

@@ -26,7 +26,7 @@ run_test('basic', () => {
assert.deepEqual([...d.keys()], ['foo', 'bar']); assert.deepEqual([...d.keys()], ['foo', 'bar']);
assert.deepEqual([...d.values()], ['baz', 'qux']); assert.deepEqual([...d.values()], ['baz', 'qux']);
assert.deepEqual(d.items(), [['foo', 'baz'], ['bar', 'qux']]); assert.deepEqual([...d], [['foo', 'baz'], ['bar', 'qux']]);
d.delete('bar'); d.delete('bar');
assert.equal(d.has('bar'), false); assert.equal(d.has('bar'), false);

4
static/js/dict.ts
View File

@@ -26,8 +26,8 @@ export class Dict<V> {
return this._items.values(); return this._items.values();
} }
items(): [string, V][] { [Symbol.iterator](): Iterator<[string, V]> {
return [...this._items]; return this._items.entries();
} }
get size(): number { get size(): number {

6
static/js/fold_dict.ts
View File

@@ -50,8 +50,10 @@ export class FoldDict<V> {
} }
} }
items(): [string, V][] { *[Symbol.iterator](): Iterator<[string, V]> {
return [...this._items.values()].map(({k, v}) => [k, v]); for (const {k, v} of this._items.values()) {
yield [k, v];
}
} }
get size(): number { get size(): number {

3
static/js/reactions.js
View File

@@ -417,8 +417,7 @@ exports.get_message_reactions = function (message) {
} }
collapsed_reaction.user_ids.push(user_id); collapsed_reaction.user_ids.push(user_id);
}); });
const reactions = message_reactions.items().map(function (item) { const reactions = Array.from(message_reactions.values(), reaction => {
const reaction = item[1];
reaction.local_id = reaction.local_id; reaction.local_id = reaction.local_id;
reaction.reaction_type = reaction.reaction_type; reaction.reaction_type = reaction.reaction_type;
reaction.emoji_name = reaction.emoji_name; reaction.emoji_name = reaction.emoji_name;