Merge branch 'staging' into oo2

www/common/sframe-protocol.js

@@ -153,23 +153,15 @@ define({
     // Cache is wiped after each new release
     'EV_CACHE_PUT': true,
 
-    // Contacts
-    'EV_CONTACTS_MESSAGE': true,
-    'EV_CONTACTS_JOIN': true,
-    'EV_CONTACTS_LEAVE': true,
-    'EV_CONTACTS_UPDATE': true,
-    'EV_CONTACTS_FRIEND': true,
-    'EV_CONTACTS_UNFRIEND': true,
-    'Q_CONTACTS_GET_FRIEND_LIST': true,
-    'Q_CONTACTS_GET_MY_INFO': true,
-    'Q_CONTACTS_GET_FRIEND_INFO': true,
-    'Q_CONTACTS_REMOVE_FRIEND': true,
-    'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true,
-    'Q_CONTACTS_GET_STATUS': true,
-    'Q_CONTACTS_GET_MORE_HISTORY': true,
-    'Q_CONTACTS_SEND_MESSAGE': true,
-    'Q_CONTACTS_SET_CHANNEL_HEAD': true,
-    'Q_CONTACTS_CLEAR_OWNED_CHANNEL': true,
+    // Chat
+    'EV_CHAT_EVENT': true,
+    'Q_CHAT_COMMAND': true,
+    'Q_CHAT_OPENPADCHAT': true,
+
+    // Cursor
+    'EV_CURSOR_EVENT': true,
+    'Q_CURSOR_COMMAND': true,
+    'Q_CURSOR_OPENCHANNEL': true,
 
     // Put one or more entries to the localStore which will go in localStorage.
     'EV_LOCALSTORE_PUT': true,
@@ -218,9 +210,13 @@ define({
     // Refresh the drive when the drive has changed ('change' or 'remove' events)
     'EV_DRIVE_CHANGE': true,
     'EV_DRIVE_REMOVE': true,
+    // Set shared folder hash in the address bar
+    'EV_DRIVE_SET_HASH': true,
 
     // Remove an owned pad from the server
     'Q_REMOVE_OWNED_CHANNEL': true,
+    // Clear an owned pad from the server (preserve metadata)
+    'Q_CLEAR_OWNED_CHANNEL': true,
 
     // Notifications about connection and disconnection from the network
     'EV_NETWORK_DISCONNECT': true,
@@ -266,5 +262,10 @@ define({
     'Q_IS_PAD_STORED': true,
 
     // Import mediatag from a pad
-    'Q_IMPORT_MEDIATAG': true
+    'Q_IMPORT_MEDIATAG': true,
+
+    // Ability to get a pad's content from its hash
+    'Q_CRYPTGET': true,
+    'EV_CRYPTGET_DISCONNECT': true,
+
 });