Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

3 files changed, 59 insertions, 0 deletions

diff --git a/flakes/etherpad-lite/modules/ep_line_height/fix.patch b/flakes/etherpad-lite/modules/ep_line_height/fix.patch
new file mode 100644
index 0000000..ffd65f1
--- /dev/null
+++ b/flakes/etherpad-lite/modules/ep_line_height/fix.patch
@@ -0,0 +1,30 @@
+diff --git a/static/js/index.js b/static/js/index.js
+index 1884571..c0490bf 100644
+--- a/static/js/index.js
++++ b/static/js/index.js
+@@ -23,9 +23,6 @@ var postAceInit = function(hook, context){
+   $('.line-height-menu').hover(function(){
+     $('.submenu > .height-selection').attr('size', 4);
+   });
+-  $('.line-height').click(function(){
+-    $('.line-height-select').toggle();
+-  });
+ };
+ 
+ exports.aceGetFilterStack = function(name, context){
+diff --git a/templates/editbarButtons.ejs b/templates/editbarButtons.ejs
+index 89a8aaa..8af258b 100644
+--- a/templates/editbarButtons.ejs
++++ b/templates/editbarButtons.ejs
+@@ -1,10 +1,5 @@
+ <li class="separator acl-write"></li>
+-<li class="acl-write line-height">
+-  <a title="line height">
+-    <span class="buttonicon" style="background-image:url('../static/plugins/ep_line_height/static/img/icon.png');"></span>
+-  </a>
+-</li>
+-<li class="line-height-select" class="acl-write" style="display:none;">
++<li class="line-height-select" class="acl-write">
+     <select class="height-selection">
+         <option value="dummy" selected data-l10n-id="ep_line_height.height">Line Height</option>
+         <option value="1">1x</option>
diff --git a/flakes/etherpad-lite/modules/ep_line_height/node-packages.json b/flakes/etherpad-lite/modules/ep_line_height/node-packages.json
new file mode 100644
index 0000000..307c2e7
--- /dev/null
+++ b/flakes/etherpad-lite/modules/ep_line_height/node-packages.json
@@ -0,0 +1 @@
+[ "ep_line_height" ]
diff --git a/flakes/etherpad-lite/modules/ep_line_height/node-packages.nix b/flakes/etherpad-lite/modules/ep_line_height/node-packages.nix
new file mode 100644
index 0000000..d5d5c21
--- /dev/null
+++ b/flakes/etherpad-lite/modules/ep_line_height/node-packages.nix
@@ -0,0 +1,28 @@
+# This file has been generated by node2nix 1.8.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {};
+in
+{
+  ep_line_height = nodeEnv.buildNodePackage {
+    name = "ep_line_height";
+    packageName = "ep_line_height";
+    version = "0.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ep_line_height/-/ep_line_height-0.0.4.tgz";
+      sha1 = "8afbb441e6d65db97d2335887f9352b10b5d22d2";
+    };
+    buildInputs = globalBuildInputs;
+    preRebuild = ''
+      patch -p1 < ${./fix.patch}
+    '';
+    meta = {
+      description = "Change the line height";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+}