manual merge

www/common/sframe-protocol.js

@@ -17,6 +17,9 @@ define({
     // When either the outside or inside registers a query handler, this is sent.
     'EV_REGISTER_HANDLER': true,
 
+    // When an iframe is ready to receive messages
+    'EV_RPC_READY': true,
+
     // Realtime events called from the outside.
     // When someone joins the pad, argument is a string with their netflux id.
     'EV_RT_JOIN': true,
@@ -40,7 +43,13 @@ define({
     // This changes the pad title in drive ONLY, the pad title needs to be changed inside of the
     // iframe and synchronized with the other users. This will not trigger a EV_METADATA_UPDATE
     // because the metadata contained in EV_METADATA_UPDATE does not contain the pad title.
+    // It also sets the page (tab) title to the selected title, unles it is overridden by
+    // the EV_SET_TAB_TITLE event.
     'Q_SET_PAD_TITLE_IN_DRIVE': true,
+    // Set the page title (tab title) to the selected value which will override the pad title.
+    // The new title value can contain {title}, which will be replaced by the pad title when it
+    // is set or modified.
+    'EV_SET_TAB_TITLE': true,
 
     // Update the user's display-name which will be shown to contacts and people in the same pads.
     'Q_SETTINGS_SET_DISPLAY_NAME': true,
@@ -104,12 +113,20 @@ define({
 
     // Template picked, replace the content of the pad
     'Q_TEMPLATE_USE': true,
+    // Check if we have template(s) for the selected pad type
+    'Q_TEMPLATE_EXIST': true,
 
     // File upload queries and events
     'Q_UPLOAD_FILE': true,
     'EV_FILE_UPLOAD_STATE': true,
     'Q_CANCEL_PENDING_FILE_UPLOAD': true,
 
+<<<<<<< HEAD
     // Make the browser window navigate to a given URL, if no URL is passed then it will reload.
     'EV_GOTO_URL': true,
+=======
+    // Present mode URL
+    'Q_PRESENT_URL_GET_VALUE': true,
+    'EV_PRESENT_URL_SET_VALUE': true,
+>>>>>>> 9271b0c1a860abaf765e9fe6e9948eff4487dc52
 });