From f45d85f615f39335f527b7d7b2b80457cda113df Mon Sep 17 00:00:00 2001
From: Alex <lex-romanow@yandex.ru>
Date: Tue, 2 Jun 2020 00:12:42 +0300
Subject: [PATCH] editor: fix the wrong URL when we use etherpad without /p/ in
 the URL (#4070)

---
 src/static/js/pad_editbar.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 9f1dd6af..b06a2d36 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -293,18 +293,20 @@ var padeditbar = (function()
     },
     setEmbedLinks: function()
     {
+      var padUrl = window.location.href.split("?")[0];
+
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/"));
-        var readonlyLink = basePath + "/p/" + clientVars.readOnlyId;
+        var urlParts = padUrl.split("/");
+        urlParts.pop();
+        var readonlyLink = urlParts.join("/") + "/" + clientVars.readOnlyId;
         $('#embedinput').val('<iframe name="embed_readonly" src="' + readonlyLink + '?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false" width="100%" height="600" frameborder="0"></iframe>');
         $('#linkinput').val(readonlyLink);
       }
       else
       {
-        var padurl = window.location.href.split("?")[0];
-        $('#embedinput').val('<iframe name="embed_readwrite" src="' + padurl + '?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false" width="100%" height="600" frameborder="0"></iframe>');
-        $('#linkinput').val(padurl);
+        $('#embedinput').val('<iframe name="embed_readwrite" src="' + padUrl + '?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false" width="100%" height="600" frameborder="0"></iframe>');
+        $('#linkinput').val(padUrl);
       }
     },
     checkAllIconsAreDisplayedInToolbar: function()