iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(collection): MapIterator.next() is not supported (Safari) 

Fixes #3015
Closes #3389
This commit is contained in:
Marc Laval 2015-07-30 15:20:08 +02:00
parent 8822460858
commit 12e4c738c9
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/angular2/src/facade/collection.ts
View File

@ -52,6 +52,26 @@ var _clearValues: {(m: Map<any, any>)} = (function() {
}; };
} }
})(); })();
// Safari doesn't implement MapIterator.next(), which is used is Traceur's polyfill of Array.from
// TODO(mlaval): remove the work around once we have a working polyfill of Array.from
var _arrayFromMap: {(m: Map<any, any>, getValues: boolean): List<any>} = (function() {
try {
if ((<any>(new Map()).values()).next) {
return function createArrayFromMap(m: Map<any, any>, getValues: boolean): List<any> {
return getValues ? (<any>Array).from(m.values()) : (<any>Array).from(m.keys());
};
}
} catch (e) {
}
return function createArrayFromMapWithForeach(m: Map<any, any>, getValues: boolean): List<any> {
var res = ListWrapper.createFixedSize(m.size), i = 0;
m.forEach((v, k) => {
ListWrapper.set(res, i, getValues ? v : k);
i++;
});
return res;
};
})();
export class MapWrapper { export class MapWrapper {
static clone<K, V>(m: Map<K, V>): Map<K, V> { return createMapFromMap(m); } static clone<K, V>(m: Map<K, V>): Map<K, V> { return createMapFromMap(m); }
@ -74,8 +94,8 @@ export class MapWrapper {
static delete<K>(m: Map<K, any>, k: K) { m.delete(k); } static delete<K>(m: Map<K, any>, k: K) { m.delete(k); }
static clearValues(m: Map<any, any>) { _clearValues(m); } static clearValues(m: Map<any, any>) { _clearValues(m); }
static iterable<T>(m: T): T { return m; } static iterable<T>(m: T): T { return m; }
static keys<K>(m: Map<K, any>): List<K> { return (<any>Array).from(m.keys()); } static keys<K>(m: Map<K, any>): List<K> { return _arrayFromMap(m, false); }
static values<V>(m: Map<any, V>): List<V> { return (<any>Array).from(m.values()); } static values<V>(m: Map<any, V>): List<V> { return _arrayFromMap(m, true); }
} }
/** /**