libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

tests: Embed test fix (#4020)

Browse source 
* quick fix for iframe code wihch someone broke

* Also fix cookie test
This commit is contained in:
John McLear 2020-05-27 16:54:20 +01:00 committed by GitHub
parent 66a43646a7
commit bcdb331c79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/pad_userlist.js
View file

@ -732,7 +732,7 @@ var paduserlist = (function()
}
else
{
$("#myusernameedit").addClass("editempty").val(_("pad.userlist.entername"));
$("#myusernameedit").attr("placeholder", html10n.get("pad.userlist.entername"));
}
if (colorPickerOpen)
{

4
tests/frontend/specs/embed_value.js
View file

@ -19,8 +19,8 @@ describe("embed links", function(){
var width = $embediFrame.attr("width");
var height = $embediFrame.attr("height");
var name = $embediFrame.attr("name");
expect(width).to.be('600');
expect(height).to.be('400');
expect(width).to.be('100%');
expect(height).to.be('600');
expect(name).to.be(readonly ? "embed_readonly" : "embed_readwrite");
//parse the url