Merge pull request #925 from jitsi/invite-to-share-dialog

Invite to share dialog

conference.js

@@ -1349,15 +1349,6 @@ export default {
                 && APP.UI.notifyInitiallyMuted();
         });
 
-        APP.UI.addListener(UIEvents.USER_INVITED, (roomUrl) => {
-            APP.UI.inviteParticipants(
-                roomUrl,
-                APP.conference.roomName,
-                roomLocker.password,
-                APP.settings.getDisplayName()
-            );
-        });
-
         room.on(
             ConferenceEvents.AVAILABLE_DEVICES_CHANGED, function (id, devices) {
                 APP.UI.updateDevicesAvailability(id, devices);

css/_jquery-impromptu.scss

@@ -9,7 +9,8 @@
 }
 div.jqi{ 
 	width: 400px;
-	position: absolute; 
+	position: absolute;
+    color: #3a3a3a;
 	background-color: #ffffff; 
 	font-size: 11px; 
 	text-align: left; 

lang/main.json

@@ -185,6 +185,7 @@
         "connectError": "Oops! Something went wrong and we couldn't connect to the conference.",
         "connectErrorWithMsg": "Oops! Something went wrong and we couldn't connect to the conference: __msg__",
         "connecting": "Connecting",
+        "copy": "Copy",
         "error": "Error",
         "detectext": "Error when trying to detect desktopsharing extension.",
         "failtoinstall": "Failed to install desktop sharing extension",
@@ -230,7 +231,6 @@
         "passwordCheck": "Are you sure you would like to remove your password?",
         "Remove": "Remove",
         "passwordMsg": "Set a password to lock your room",
-        "Invite": "Invite",
         "shareLink": "Copy and share this link",
         "settings1": "Configure your conference",
         "settings2": "Participants join muted",

modules/UI/UI.js

@@ -1065,50 +1065,6 @@ UI.updateDTMFSupport = function (isDTMFSupported) {
     //Toolbar.showDialPadButton(dtmfSupport);
 };
 
-/**
- * Invite participants to conference.
- * @param {string} roomUrl
- * @param {string} conferenceName
- * @param {string} key
- * @param {string} nick
- */
-UI.inviteParticipants = function (roomUrl, conferenceName, key, nick) {
-    let keyText = "";
-    if (key) {
-        keyText = APP.translation.translateString(
-            "email.sharedKey", {sharedKey: key}
-        );
-    }
-
-    let and = APP.translation.translateString("email.and");
-    let supportedBrowsers = `Chromium, Google Chrome, Firefox ${and} Opera`;
-
-    let subject = APP.translation.translateString(
-        "email.subject", {appName:interfaceConfig.APP_NAME, conferenceName}
-    );
-
-    let body = APP.translation.translateString(
-        "email.body", {
-            appName:interfaceConfig.APP_NAME,
-            sharedKeyText: keyText,
-            roomUrl,
-            supportedBrowsers
-        }
-    );
-
-    body = body.replace(/\n/g, "%0D%0A");
-
-    if (nick) {
-        body += "%0D%0A%0D%0A" + UIUtil.escapeHtml(nick);
-    }
-
-    if (interfaceConfig.INVITATION_POWERED_BY) {
-        body += "%0D%0A%0D%0A--%0D%0Apowered by jitsi.org";
-    }
-
-    window.open(`mailto:?subject=${subject}&body=${body}`, '_blank');
-};
-
 /**
  * Show user feedback dialog if its required or just show "thank you" dialog.
  * @returns {Promise} when dialog is closed.

modules/UI/toolbars/Toolbar.js

@@ -20,36 +20,46 @@ function openLinkDialog () {
         inviteAttributes = "value=\"" + encodeURI(roomUrl) + "\"";
     }
 
+    let inviteLinkId = "inviteLinkRef";
+    let focusInviteLink = function() {
+        $('#' + inviteLinkId).focus();
+        $('#' + inviteLinkId).select();
+    };
+
     let title = APP.translation.generateTranslationHTML("dialog.shareLink");
     APP.UI.messageHandler.openTwoButtonDialog(
-        null, null, null,
-        '<h2>' + title + '</h2>'
-        + '<input id="inviteLinkRef" type="text" '
-        + inviteAttributes + ' onclick="this.select();" readonly>',
-        false, "dialog.Invite",
+        null, title, null,
+        '<input id="' + inviteLinkId + '" type="text" '
+            + inviteAttributes + ' readonly/>',
+        false, "dialog.copy",
         function (e, v) {
             if (v && roomUrl) {
                 JitsiMeetJS.analytics.sendEvent('toolbar.invite.button');
-                emitter.emit(UIEvents.USER_INVITED, roomUrl);
+
+                focusInviteLink();
+
+                document.execCommand('copy');
             }
             else {
                 JitsiMeetJS.analytics.sendEvent('toolbar.invite.cancel');
             }
         },
         function (event) {
-            if (roomUrl) {
-                document.getElementById('inviteLinkRef').select();
-            } else {
+            if (!roomUrl) {
                 if (event && event.target) {
                     $(event.target).find('button[value=true]')
                         .prop('disabled', true);
                 }
             }
+            else {
+                focusInviteLink();
+            }
         },
         function (e, v, m, f) {
             if(!v && !m && !f)
                 JitsiMeetJS.analytics.sendEvent('toolbar.invite.close');
-        }
+        },
+        'Copy' // Focus Copy button.
     );
 }
 

service/UI/UIEvents.js

@@ -29,7 +29,6 @@ export default {
      */
     UPDATE_SHARED_VIDEO: "UI.update_shared_video",
     ROOM_LOCK_CLICKED: "UI.room_lock_clicked",
-    USER_INVITED: "UI.user_invited",
     USER_KICKED: "UI.user_kicked",
     REMOTE_AUDIO_MUTED: "UI.remote_audio_muted",
     FULLSCREEN_TOGGLE: "UI.fullscreen_toggle",