From 12e4c738c9c5461b7586bd375e5f9e659d3ee7d0 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Thu, 30 Jul 2015 15:20:08 +0200
Subject: [PATCH] fix(collection): MapIterator.next() is not supported (Safari)

Fixes #3015
Closes #3389
---
 modules/angular2/src/facade/collection.ts | 24 +++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/angular2/src/facade/collection.ts b/modules/angular2/src/facade/collection.ts
index 448bab07b8..feea9a14a1 100644
--- a/modules/angular2/src/facade/collection.ts
+++ b/modules/angular2/src/facade/collection.ts
@@ -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 {
   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 clearValues(m: Map<any, any>) { _clearValues(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 values<V>(m: Map<any, V>): List<V> { return (<any>Array).from(m.values()); }
+  static keys<K>(m: Map<K, any>): List<K> { return _arrayFromMap(m, false); }
+  static values<V>(m: Map<any, V>): List<V> { return _arrayFromMap(m, true); }
 }
 
 /**