merging javascript branch

1 files changed, 23 insertions, 0 deletions

diff --git a/js/src/Ice/SocketOperation.js b/js/src/Ice/SocketOperation.js
new file mode 100644
index 00000000000..6e45a494dcf
--- /dev/null
+++ b/js/src/Ice/SocketOperation.js
@@ -0,0 +1,23 @@
+// **********************************************************************
+//
+// 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 SocketOperation = 
+    {
+        None: 0,
+        Read: 1,
+        Write: 2,
+        Connect: 2 // Same as Write
+    };
+
+    Ice.SocketOperation = SocketOperation;
+    global.Ice = Ice;
+}(typeof (global) === "undefined" ? window : global));