make sure global uuid variable does not cause any collisions

transloadit · Dec 19, 2013 · ebb1ddf · ebb1ddf
1 parent 9e27bb5
commit ebb1ddf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/dep/uuid.js b/js/dep/uuid.js
@@ -240,6 +240,6 @@
       return uuid;
     };
 
-    _global.uuid = uuid;
+    _global.transloadit_uuid = uuid;
   }
 }).call(this);
diff --git a/js/lib/jquery.transloadit2.js b/js/lib/jquery.transloadit2.js
@@ -267,7 +267,7 @@
     this.uploads             = [];
     this.results             = {};
 
-    this.assemblyId = uuid.v1().replace(/\-/g, '');
+    this.assemblyId = transloadit_uuid.v1().replace(/\-/g, '');
 
     this.$fileClones = $().not(document);
     this.$files.each(function() {