merge

1 files changed, 25 insertions, 10 deletions

diff --git a/public/assets/javascripts/rectangles/util/uid.js b/public/assets/javascripts/rectangles/util/uid.js
index ca22fb3..0c0b176 100644
--- a/public/assets/javascripts/rectangles/util/uid.js
+++ b/public/assets/javascripts/rectangles/util/uid.js
@@ -1,14 +1,29 @@
+(function(){
 
-var UidGenerator = function(list){
-	var id = 0
-	return function(s){
-		s = s || ""
-		var ss
-		while (1) {
-			ss = s + (id++)
-			if (! (ss in list)) {
-				return ss
+	var UidGenerator = function(list){
+		var id = 0
+		var generator = function(s){
+			s = s || ""
+			var ss
+			while (1) {
+				ss = s + (id++)
+				if (! (ss in list)) {
+					return ss
+				}
 			}
 		}
+		generator.setList = function(newList){
+			list = newList
+		}
+		return generator
+	}
+
+	if ('window' in this) {
+		window.UidGenerator = UidGenerator
 	}
-}
\ No newline at end of file
+	else {
+		module.exports = UidGenerator
+	}
+	
+})()
+