The name of shared Etherpad document is now generated and advertised by Jicofo user.

index.html

@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=84"></script>
+    <script src="libs/app.bundle.js?v=85"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=7"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">

modules/UI/UI.js

@@ -441,7 +441,7 @@ function onMucJoined(jid, info) {
 
 function initEtherpad(name) {
     Etherpad.init(name);
-};
+}
 
 function onMucMemberLeft(jid) {
     console.log('left.muc', jid);
@@ -497,11 +497,7 @@ function onModeratorStatusChanged(isModerator) {
     // Recording visible if
     // there are at least 2(+ 1 focus) participants
     //Object.keys(connection.emuc.members).length >= 3);
-
+}
-    if (isModerator && config.etherpad_base) {
-        Etherpad.init();
-    }
-};
 
 function onPasswordRequired(callback) {
     // password is required

modules/UI/etherpad/Etherpad.js

@@ -26,13 +26,6 @@ function resize() {
     }
 }
 
-/**
- * Shares the Etherpad name with other participants.
- */
-function shareEtherpad() {
-    APP.xmpp.addToPresence("etherpad", etherpadName);
-}
-
 /**
  * Creates the Etherpad button and adds it to the toolbar.
  */
@@ -115,18 +108,11 @@ var Etherpad = {
      */
     init: function (name) {
 
-        if (config.etherpad_base && !etherpadName) {
+        if (config.etherpad_base && !etherpadName && name) {
 
             domain = config.etherpad_base;
 
-            if (!name) {
+            etherpadName = name;
-                // In case we're the focus we generate the name.
-                etherpadName = Math.random().toString(36).substring(7) +
-                                '_' + (new Date().getTime()).toString();
-                shareEtherpad();
-            }
-            else
-                etherpadName = name;
 
             enableEtherpadButton();
 

modules/xmpp/strophe.emuc.js

@@ -112,7 +112,7 @@ module.exports = function(XMPP, eventEmitter) {
             // Parse etherpad tag.
             var etherpad = $(pres).find('>etherpad');
             if (etherpad.length) {
-                if (config.etherpad_base && !Moderator.isModerator()) {
+                if (config.etherpad_base) {
                     eventEmitter.emit(XMPPEvents.ETHERPAD, etherpad.text());
                 }
             }
@@ -500,11 +500,6 @@ module.exports = function(XMPP, eventEmitter) {
                     .c('current').t(this.presMap['prezicurrent']).up().up();
             }
 
-            if (this.presMap['etherpadns']) {
-                pres.c('etherpad', {xmlns: this.presMap['etherpadns']})
-                    .t(this.presMap['etherpadname']).up();
-            }
-
             if (this.presMap['medians']) {
                 pres.c('media', {xmlns: this.presMap['medians']});
                 var sourceNumber = 0;
@@ -574,10 +569,6 @@ module.exports = function(XMPP, eventEmitter) {
         getPrezi: function (roomjid) {
             return this.preziMap[roomjid];
         },
-        addEtherpadToPresence: function (etherpadName) {
-            this.presMap['etherpadns'] = 'http://jitsi.org/jitmeet/etherpad';
-            this.presMap['etherpadname'] = etherpadName;
-        },
         addAudioInfoToPresence: function (isMuted) {
             this.presMap['audions'] = 'http://jitsi.org/jitmeet/audio';
             this.presMap['audiomuted'] = isMuted.toString();

modules/xmpp/xmpp.js

@@ -485,9 +485,6 @@ var XMPP = {
             case "displayName":
                 connection.emuc.addDisplayNameToPresence(value);
                 break;
-            case "etherpad":
-                connection.emuc.addEtherpadToPresence(value);
-                break;
             case "prezi":
                 connection.emuc.addPreziToPresence(value, 0);
                 break;