From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 22 May 2015 23:57:36 +0000 (+0200)
Subject: WoltLab/WCF/ObjectMap now uses a WeakMap instead of Map
X-Git-Tag: 3.0.0_Beta_1~2338
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=28e96dc2ad2998411d646fc32a76936a7d805f54;p=GitHub%2FWoltLab%2FWCF.git

WoltLab/WCF/ObjectMap now uses a WeakMap instead of Map
---

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/ObjectMap.js b/wcfsetup/install/files/js/WoltLab/WCF/ObjectMap.js
index 08ec433aa3..da52706299 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/ObjectMap.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/ObjectMap.js
@@ -1,5 +1,5 @@
 /**
- * Simple `object` to `object` map using a native Map on supported browsers, otherwise a set of two arrays.
+ * Simple `object` to `object` map using a native WeakMap on supported browsers, otherwise a set of two arrays.
  * 
  * If you're looking for a dictionary with string keys, please see `WoltLab/WCF/Dictionary`.
  * 
@@ -11,109 +11,90 @@
 define([], function() {
 	"use strict";
 	
-	var _hasMap = window.hasOwnProperty('Map');
+	var _hasMap = window.hasOwnProperty('WeakMap') && typeof window.WeakMap === 'function';
 	
 	/**
 	 * @constructor
 	 */
 	function ObjectMap() {
-		this._map = (_hasMap) ? new Map() : { key: [], value: [] };
+		this._map = (_hasMap) ? new WeakMap() : { key: [], value: [] };
 	};
 	ObjectMap.prototype = {
-			/**
-			 * Sets a new key with given value, will overwrite an existing key.
-			 * 
-			 * @param	{object}	key	key
-			 * @param	{object}	value	value
-			 */
-			set: function(key, value) {
-				if (typeof key !== 'object' || key === null) {
-					throw new TypeError("Only objects can be used as key");
-				}
-				
-				if (typeof value !== 'object' || value === null) {
-					throw new TypeError("Only objects can be used as value");
-				}
-				
-				if (_hasMap) {
-					this._map.set(key, value);
-				}
-				else {
-					this._map.key.push(key);
-					this._map.value.push(value);
-				}
-			},
-			
-			/**
-			 * Removes a key from the map.
-			 * 
-			 * @param	{object}	key	key
-			 */
-			'delete': function(key) {
-				if (_hasMap) {
-					this._map['delete'](_key);
-				}
-				else {
-					var index = this._map.key.indexOf(key);
-					this._map.key.splice(index);
-					this._map.value.splice(index);
-				}
-			},
-			
-			/**
-			 * Returns true if dictionary contains a value for given key.
-			 * 
-			 * @param	{object}	key	key
-			 * @return	{boolean}	true if key exists
-			 */
-			has: function(key) {
-				if (_hasMap) {
-					return this._map.has(key);
-				}
-				else {
-					return (this._map.key.indexOf(key) !== -1);
-				}
-			},
+		/**
+		 * Sets a new key with given value, will overwrite an existing key.
+		 * 
+		 * @param	{object}	key	key
+		 * @param	{object}	value	value
+		 */
+		set: function(key, value) {
+			if (typeof key !== 'object' || key === null) {
+				throw new TypeError("Only objects can be used as key");
+			}
 			
-			/**
-			 * Retrieves a value by key, returns undefined if there is no match.
-			 * 
-			 * @param	{object}	key	key
-			 * @return	{*}
-			 */
-			get: function(key) {
-				if (_hasMap) {
-					return this._map.get(key);
-				}
-				else {
-					var index = this._map.key.indexOf(key);
-					if (index !== -1) {
-						return this._map.value[index];
-					}
-					
-					return undefined;
-				}
-			},
+			if (typeof value !== 'object' || value === null) {
+				throw new TypeError("Only objects can be used as value");
+			}
 			
-			/**
-			 * Iterates over the object map, callback function should expect the
-			 * value as first parameter and the key second.
-			 * 
-			 * @param	{function<object, object>}	callback	callback for each iteration
-			 */
-			forEach: function(callback) {
-				if (typeof callback !== "function") {
-					throw new TypeError("forEach() expects a callback as first parameter.");
+			if (_hasMap) {
+				this._map.set(key, value);
+			}
+			else {
+				this._map.key.push(key);
+				this._map.value.push(value);
+			}
+		},
+		
+		/**
+		 * Removes a key from the map.
+		 * 
+		 * @param	{object}	key	key
+		 */
+		'delete': function(key) {
+			if (_hasMap) {
+				this._map['delete'](_key);
+			}
+			else {
+				var index = this._map.key.indexOf(key);
+				this._map.key.splice(index);
+				this._map.value.splice(index);
+			}
+		},
+		
+		/**
+		 * Returns true if dictionary contains a value for given key.
+		 * 
+		 * @param	{object}	key	key
+		 * @return	{boolean}	true if key exists
+		 */
+		has: function(key) {
+			if (_hasMap) {
+				return this._map.has(key);
+			}
+			else {
+				return (this._map.key.indexOf(key) !== -1);
+			}
+		},
+		
+		/**
+		 * Retrieves a value by key, returns undefined if there is no match.
+		 * 
+		 * @param	{object}	key	key
+		 * @return	{*}
+		 */
+		get: function(key) {
+			if (_hasMap) {
+				return this._map.get(key);
+			}
+			else {
+				var index = this._map.key.indexOf(key);
+				if (index !== -1) {
+					return this._map.value[index];
 				}
 				
-				if (_hasMap) {
-					this._map.forEach(callback);
-				}
-				else {
-					for (var i = 0, length = this._map.keys.length; i < length; i++) {
-						callback(this._map.value[i], this._map.key[i]);
-					}
-				}
+				return undefined;
 			}
+		}
 	};
+	
+	return ObjectMap;
 });