ep_comments_page 11.0.32 → 11.0.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Adds comments on sidebar and link it to the text.  For no-skin use ep_page_view.",
   "name": "ep_comments_page",
-  "version": "11.0.32",
+  "version": "11.0.34",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"

package/static/js/index.js

@@ -54,10 +54,16 @@ const EpComments = function (context) {
   // This probably needs some work for instances running on root or not on /p/
   const loc = document.location;
   const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port;
+
+  // Derive the socket.io path from the Etherpad base URL so that it works
+  // behind a reverse proxy with a path prefix (e.g. /etherpad/api/{group}/).
+  const pad = require('ep_etherpad-lite/static/js/pad');
+  const basePath = pad.baseURL || new URL('..', loc.href).pathname;
   const url = `${loc.protocol}//${loc.hostname}:${port}/comment`;
 
   this.padId = clientVars.padId;
   this.socket = io.connect(url, {
+    path: `${basePath}socket.io`,
     query: `padId=${this.padId}`,
   });
 
@@ -241,16 +247,22 @@ EpComments.prototype.init = async function () {
   // Listen for include suggested change toggle
   this.container.parent().on('change', '.suggestion-checkbox', function () {
     const parentComment = $(this).closest('.comment-container');
-    const parentSuggest = $(this).closest('.comment-reply');
+    const parentSuggest = $(this).closest('.comment-reply, .new-comment-popup');
 
     if ($(this).is(':checked')) {
       const commentId = parentComment.data('commentid');
       const padOuter = $('iframe[name="ace_outer"]').contents();
       const padInner = padOuter.find('iframe[name="ace_inner"]');
 
-      const currentString = padInner.contents().find(`.${commentId}`).html();
+      const currentString = padInner.contents().find(`.${commentId}`).text();
 
       parentSuggest.find('.from-value').html(currentString);
+      // Update l10n args so the translated label shows the actual selected text
+      const fromLabel = parentSuggest.find('.suggestion-create .from-label')[0];
+      if (fromLabel) {
+        fromLabel.dataset.l10nArgs = JSON.stringify({changeFrom: currentString || ''});
+        html10n.translateElement(html10n.translations, fromLabel);
+      }
       parentSuggest.find('.suggestion').show();
     } else {
       parentSuggest.find('.suggestion').hide();
@@ -283,6 +295,12 @@ EpComments.prototype.init = async function () {
     // Write the new pad contents
     padCommentSpan.html(newString);
 
+    // Force ace to pick up the DOM change so it is committed to the
+    // changeset and propagated to other users.
+    self.ace.callWithAce((ace) => {
+      ace.ace_fastIncorp();
+    }, 'acceptOrRevertSuggestion', true);
+
     if (isRevert) {
       // Tell all users this change was reverted
       self._send('revertChange', data);