diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-04 00:12:46 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-04 00:12:46 +0200 |
commit | 4b0a82cc2f4597a11b9275cf156ae9cceffaf44f (patch) | |
tree | a384ea0b7a610387f9a9cb8b6de4de58e8dd76b0 /pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch | |
parent | e9c91c19475ed679676829bfd716e41009b560c8 (diff) | |
download | Nix-4b0a82cc2f4597a11b9275cf156ae9cceffaf44f.tar.gz Nix-4b0a82cc2f4597a11b9275cf156ae9cceffaf44f.tar.zst Nix-4b0a82cc2f4597a11b9275cf156ae9cceffaf44f.zip |
Fix some etherpad-lite modules and packaging
The upgrade to 1.8.3 broke many modules, which were patched to continue
working correctly.
This commit also reworks the module system, making it similar to
python’s withPackages.
Diffstat (limited to 'pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch')
-rw-r--r-- | pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch b/pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch new file mode 100644 index 0000000..ffd65f1 --- /dev/null +++ b/pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | diff --git a/static/js/index.js b/static/js/index.js | ||
2 | index 1884571..c0490bf 100644 | ||
3 | --- a/static/js/index.js | ||
4 | +++ b/static/js/index.js | ||
5 | @@ -23,9 +23,6 @@ var postAceInit = function(hook, context){ | ||
6 | $('.line-height-menu').hover(function(){ | ||
7 | $('.submenu > .height-selection').attr('size', 4); | ||
8 | }); | ||
9 | - $('.line-height').click(function(){ | ||
10 | - $('.line-height-select').toggle(); | ||
11 | - }); | ||
12 | }; | ||
13 | |||
14 | exports.aceGetFilterStack = function(name, context){ | ||
15 | diff --git a/templates/editbarButtons.ejs b/templates/editbarButtons.ejs | ||
16 | index 89a8aaa..8af258b 100644 | ||
17 | --- a/templates/editbarButtons.ejs | ||
18 | +++ b/templates/editbarButtons.ejs | ||
19 | @@ -1,10 +1,5 @@ | ||
20 | <li class="separator acl-write"></li> | ||
21 | -<li class="acl-write line-height"> | ||
22 | - <a title="line height"> | ||
23 | - <span class="buttonicon" style="background-image:url('../static/plugins/ep_line_height/static/img/icon.png');"></span> | ||
24 | - </a> | ||
25 | -</li> | ||
26 | -<li class="line-height-select" class="acl-write" style="display:none;"> | ||
27 | +<li class="line-height-select" class="acl-write"> | ||
28 | <select class="height-selection"> | ||
29 | <option value="dummy" selected data-l10n-id="ep_line_height.height">Line Height</option> | ||
30 | <option value="1">1x</option> | ||