merging javascript branch

1 files changed, 30 insertions, 0 deletions

diff --git a/js/src/Ice/UUID.js b/js/src/Ice/UUID.js
new file mode 100644
index 00000000000..11928fcb1da
--- /dev/null
+++ b/js/src/Ice/UUID.js
@@ -0,0 +1,30 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+(function(global){
+    var Ice = global.Ice || {};
+
+    var UUID = {};
+
+    UUID.generateUUID = function()
+    {
+        var d = new Date().getTime();
+        var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c == 'x' ? r : (r & 0x7 | 0x8)).toString(16);
+        });
+        return uuid;
+    };
+
+    Ice.UUID = UUID;
+    Ice.generateUUID = UUID.generateUUID;
+
+    global.Ice = Ice;
+}(typeof (global) === "undefined" ? window : global));