From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: 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 --- pkgs/webapps/etherpad-lite/default.nix | 63 - pkgs/webapps/etherpad-lite/etherpad-lite.json | 15 - pkgs/webapps/etherpad-lite/libreoffice_patch.diff | 12 - .../ep_aa_file_menu_toolbar/node-packages.json | 1 - .../ep_aa_file_menu_toolbar/node-packages.nix | 26 - .../modules/ep_adminpads/node-packages.json | 1 - .../modules/ep_adminpads/node-packages.nix | 27 - .../modules/ep_align/node-packages.json | 1 - .../modules/ep_align/node-packages.nix | 26 - .../modules/ep_bookmark/node-packages.json | 1 - .../modules/ep_bookmark/node-packages.nix | 26 - .../modules/ep_clear_formatting/node-packages.json | 1 - .../modules/ep_clear_formatting/node-packages.nix | 25 - .../modules/ep_colors/node-packages.json | 1 - .../modules/ep_colors/node-packages.nix | 25 - .../modules/ep_comments_page/node-packages.json | 1 - .../modules/ep_comments_page/node-packages.nix | 342 --- .../ep_copy_paste_select_all/node-packages.json | 1 - .../ep_copy_paste_select_all/node-packages.nix | 26 - .../modules/ep_cursortrace/node-packages.json | 1 - .../modules/ep_cursortrace/node-packages.nix | 26 - .../ep_delete_empty_pads/node-packages.json | 1 - .../modules/ep_delete_empty_pads/node-packages.nix | 26 - .../etherpad-lite/modules/ep_embedmedia/fix.patch | 85 - .../modules/ep_embedmedia/node-packages.json | 1 - .../modules/ep_embedmedia/node-packages.nix | 29 - .../modules/ep_font_family/node-packages.json | 1 - .../modules/ep_font_family/node-packages.nix | 27 - .../modules/ep_font_size/node-packages.json | 1 - .../modules/ep_font_size/node-packages.nix | 27 - .../modules/ep_headings2/node-packages.json | 1 - .../modules/ep_headings2/node-packages.nix | 26 - .../etherpad-lite/modules/ep_immae_buttons/ep.json | 13 - .../modules/ep_immae_buttons/hooks.js | 6 - .../modules/ep_immae_buttons/node-packages.nix | 22 - .../modules/ep_immae_buttons/package.json | 10 - .../modules/ep_immae_buttons/static/js/main.js | 67 - .../ep_immae_buttons/templates/editbarButtons.ejs | 12 - .../modules/ep_ldapauth/node-packages.json | 1 - .../modules/ep_ldapauth/node-packages.nix | 392 --- .../etherpad-lite/modules/ep_line_height/fix.patch | 30 - .../modules/ep_line_height/node-packages.json | 1 - .../modules/ep_line_height/node-packages.nix | 28 - .../modules/ep_markdown/node-packages.json | 1 - .../modules/ep_markdown/node-packages.nix | 300 -- .../etherpad-lite/modules/ep_mypads/fix_ldap.patch | 59 - .../modules/ep_mypads/node-packages.json | 1 - .../modules/ep_mypads/node-packages.nix | 2156 -------------- .../modules/ep_page_view/node-packages.json | 1 - .../modules/ep_page_view/node-packages.nix | 26 - .../modules/ep_previewimages/node-packages.json | 1 - .../modules/ep_previewimages/node-packages.nix | 26 - .../modules/ep_private_pad/node-packages.json | 1 - .../modules/ep_private_pad/node-packages.nix | 2056 -------------- .../modules/ep_ruler/node-packages.json | 1 - .../modules/ep_ruler/node-packages.nix | 27 - .../modules/ep_scrollto/node-packages.json | 1 - .../modules/ep_scrollto/node-packages.nix | 29 - .../modules/ep_set_title_on_pad/node-packages.json | 1 - .../modules/ep_set_title_on_pad/node-packages.nix | 26 - .../ep_subscript_and_superscript/font.patch | 22 - .../node-packages.json | 1 - .../ep_subscript_and_superscript/node-packages.nix | 28 - .../modules/ep_timesliderdiff/node-packages.json | 1 - .../modules/ep_timesliderdiff/node-packages.nix | 26 - pkgs/webapps/etherpad-lite/node-packages.nix | 2934 -------------------- 66 files changed, 9180 deletions(-) delete mode 100644 pkgs/webapps/etherpad-lite/default.nix delete mode 100644 pkgs/webapps/etherpad-lite/etherpad-lite.json delete mode 100644 pkgs/webapps/etherpad-lite/libreoffice_patch.diff delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_family/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_family/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_size/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_size/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_headings2/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_headings2/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/ep.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/hooks.js delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/package.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/static/js/main.js delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/templates/editbarButtons.ejs delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ldapauth/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ldapauth/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_markdown/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_markdown/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/fix_ldap.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_page_view/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_page_view/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_previewimages/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_previewimages/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_private_pad/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_private_pad/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ruler/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ruler/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_scrollto/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_scrollto/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_set_title_on_pad/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_set_title_on_pad/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/font.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_timesliderdiff/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_timesliderdiff/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/node-packages.nix (limited to 'pkgs/webapps/etherpad-lite') diff --git a/pkgs/webapps/etherpad-lite/default.nix b/pkgs/webapps/etherpad-lite/default.nix deleted file mode 100644 index 4327384..0000000 --- a/pkgs/webapps/etherpad-lite/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ varDir ? "/var/lib/etherpad-lite" # if you override this change the StateDirectory in service file too! -, stdenv, callPackage, mylibs, lib }: -let - nodeEnv = callPackage mylibs.nodeEnv {}; - moduleNames = [ - "ep_aa_file_menu_toolbar" "ep_adminpads" "ep_align" "ep_bookmark" - "ep_clear_formatting" "ep_colors" "ep_comments_page" - "ep_copy_paste_select_all" "ep_cursortrace" "ep_delete_empty_pads" - "ep_embedmedia" "ep_font_family" "ep_font_size" "ep_headings2" - "ep_immae_buttons" "ep_ldapauth" "ep_line_height" "ep_markdown" - "ep_mypads" "ep_page_view" "ep_previewimages" "ep_ruler" - "ep_scrollto" "ep_set_title_on_pad" "ep_subscript_and_superscript" - "ep_timesliderdiff" - ]; - # nix files are built using node2nix -i node-packages.json - allModules = lib.attrsets.genAttrs moduleNames - (name: (callPackage (./modules + "/${name}/node-packages.nix") { inherit nodeEnv; }).${name}); - toPassthru = pkg: { - inherit varDir allModules; - withModules = withModules pkg; - }; - withModules = pkg: toModules: - let - modules = toModules allModules; - toInstallModule = n: '' - cp -a ${n}/lib/node_modules/${n.packageName} $out/node_modules - if [ ! -f $out/node_modules/${n.packageName}/.ep_initialized ]; then - chmod u+w $out/node_modules/${n.packageName}/ - ln -s ${varDir}/ep_initialized/${n.packageName} $out/node_modules/${n.packageName}/.ep_initialized - fi - ''; - newEtherpad = pkg.overrideAttrs(old: { - installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallModule modules); - passthru = toPassthru newEtherpad; - }); - in newEtherpad; - # built using node2nix -l package-lock.json - # and changing "./." to "src" - node-environment = (callPackage ./node-packages.nix { - inherit nodeEnv; - src = stdenv.mkDerivation (mylibs.fetchedGithub ./etherpad-lite.json // rec { - patches = [ ./libreoffice_patch.diff ]; - buildPhase = '' - touch src/.ep_initialized - ''; - installPhase = '' - cp -a src/ $out - ''; - }); - }).package; - package = stdenv.mkDerivation rec { - name = (mylibs.fetchedGithub ./etherpad-lite.json).name; - src = node-environment; - installPhase = '' - mkdir -p $out - mkdir $out/node_modules - cp -a lib/node_modules/ep_etherpad-lite $out/src - chmod u+w $out/src/static/js/ - ln -s ../src $out/node_modules/ep_etherpad-lite - ''; - passthru = toPassthru package; - }; -in package diff --git a/pkgs/webapps/etherpad-lite/etherpad-lite.json b/pkgs/webapps/etherpad-lite/etherpad-lite.json deleted file mode 100644 index 0d68df1..0000000 --- a/pkgs/webapps/etherpad-lite/etherpad-lite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "1.8.3", - "meta": { - "name": "etherpad-lite", - "url": "https://github.com/ether/etherpad-lite", - "branch": "refs/tags/1.8.3" - }, - "github": { - "owner": "ether", - "repo": "etherpad-lite", - "rev": "62101147a0c3495dc80daa87ab53a3366321a205", - "sha256": "1d726qldw3bil4x7j39aqk7m71kyjvxklai5238rrd5v82z28c1y", - "fetchSubmodules": true - } -} diff --git a/pkgs/webapps/etherpad-lite/libreoffice_patch.diff b/pkgs/webapps/etherpad-lite/libreoffice_patch.diff deleted file mode 100644 index 86fac15..0000000 --- a/pkgs/webapps/etherpad-lite/libreoffice_patch.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/node/utils/LibreOffice.js b/src/node/utils/LibreOffice.js -index 267f7a0c..10518577 100644 ---- a/src/node/utils/LibreOffice.js -+++ b/src/node/utils/LibreOffice.js -@@ -78,6 +78,7 @@ function doConvertTask(task, callback) { - '--invisible', - '--nologo', - '--nolockcheck', -+ '-env:UserInstallation=file:///tmp/', - '--writer', - '--convert-to', task.type, - task.srcFile, diff --git a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json deleted file mode 100644 index 9b0f681..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_aa_file_menu_toolbar" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix deleted file mode 100644 index 8a2fb1b..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_aa_file_menu_toolbar = nodeEnv.buildNodePackage { - name = "ep_aa_file_menu_toolbar"; - packageName = "ep_aa_file_menu_toolbar"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_aa_file_menu_toolbar/-/ep_aa_file_menu_toolbar-0.1.6.tgz"; - sha1 = "aaa374d9429c9b2382311fab69e0ff819b53b7b0"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "File / Menu style toolbar"; - homepage = https://github.com/JohnMcLear/ep_file_menu_toolbar; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json deleted file mode 100644 index 7643607..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_adminpads" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix deleted file mode 100644 index 2f62257..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix +++ /dev/null @@ -1,27 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_adminpads = nodeEnv.buildNodePackage { - name = "ep_adminpads"; - packageName = "ep_adminpads"; - version = "0.0.12"; - src = fetchurl { - url = "https://github.com/spcsser/ep_adminpads/archive/master.tar.gz"; - sha1 = "49ypihbwxmd97g813aq2rjwh7pq1y08a"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Gives the ability to list and administrate all pads on admin page"; - homepage = "https://github.com/spcsser/ep_adminpads#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json deleted file mode 100644 index 9405dd2..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_align" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix deleted file mode 100644 index 1a57a9c..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_align = nodeEnv.buildNodePackage { - name = "ep_align"; - packageName = "ep_align"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_align/-/ep_align-0.2.0.tgz"; - sha512 = "bMrwsieCfz3LkxuIXiNu7UKkUQ7b+ceI09XRd1cCMskDwuJow3N3hB4/gecqfF+v4lS0qmDEa7bJvSTrhHiXBQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Add Left/Center/Right/Justify to lines of text in a pad"; - homepage = "https://github.com/johnmclear/ep_align#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json deleted file mode 100644 index 80745ca..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_bookmark" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix deleted file mode 100644 index 3975044..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_bookmark = nodeEnv.buildNodePackage { - name = "ep_bookmark"; - packageName = "ep_bookmark"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_bookmark/-/ep_bookmark-1.2.0.tgz"; - sha512 = "sHTXIKui1l+PxeBtzlwSvRg8TZ8w9PE5aaxTg5b/siwNmprXeoiL6ZUiOTGmp18yLXs1ltJ2BzSqJX57pjGVWg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Etherpad plugin for users to save a list of bookmarks of their visited pads locally in the browser's local storage"; - homepage = "https://github.com/Gared/ep_bookmark#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json deleted file mode 100644 index 07c0662..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_clear_formatting" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix deleted file mode 100644 index adb22f1..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_clear_formatting = nodeEnv.buildNodePackage { - name = "ep_clear_formatting"; - packageName = "ep_clear_formatting"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_clear_formatting/-/ep_clear_formatting-0.0.2.tgz"; - sha1 = "b16970b9c6be01246d23cb5a81777aa220d06fc4"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Clear formatting on a selection, this plugin requires the file menu"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json deleted file mode 100644 index b513f5c..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_colors" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix deleted file mode 100644 index f2f8201..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_colors = nodeEnv.buildNodePackage { - name = "ep_colors"; - packageName = "ep_colors"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_colors/-/ep_colors-0.0.3.tgz"; - sha1 = "aa95e1b12e009ed6b05d0ccb188ca4829e799780"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "add colors to the etherpad"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json deleted file mode 100644 index ae32884..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -["ep_comments_page"] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix deleted file mode 100644 index 8d7c85a..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix +++ /dev/null @@ -1,342 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "arraybuffer.slice-0.0.7" = { - name = "arraybuffer.slice"; - packageName = "arraybuffer.slice"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; - sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; - }; - }; - "async-limiter-1.0.1" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; - }; - }; - "backo2-1.0.2" = { - name = "backo2"; - packageName = "backo2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - }; - "better-assert-1.0.2" = { - name = "better-assert"; - packageName = "better-assert"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - }; - "blob-0.0.5" = { - name = "blob"; - packageName = "blob"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"; - sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; - }; - }; - "callsite-1.0.0" = { - name = "callsite"; - packageName = "callsite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "component-inherit-0.0.3" = { - name = "component-inherit"; - packageName = "component-inherit"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-4.1.1" = { - name = "debug"; - packageName = "debug"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; - "engine.io-client-3.4.1" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz"; - sha512 = "RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw=="; - }; - }; - "engine.io-parser-2.2.0" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz"; - sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w=="; - }; - }; - "formidable-1.2.2" = { - name = "formidable"; - packageName = "formidable"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"; - sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="; - }; - }; - "has-binary2-1.0.3" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"; - sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; - }; - }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "parseuri-0.0.5" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; - }; - }; - "socket.io-client-2.3.0" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz"; - sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA=="; - }; - }; - "socket.io-parser-3.3.0" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz"; - sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; - }; - }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; - }; - }; - "ws-6.1.4" = { - name = "ws"; - packageName = "ws"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz"; - sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; - }; - }; - "xmlhttprequest-ssl-1.5.5" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; - sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; - }; - }; - "yeast-0.1.2" = { - name = "yeast"; - packageName = "yeast"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; - }; - }; - }; -in -{ - ep_comments_page = nodeEnv.buildNodePackage { - name = "ep_comments_page"; - packageName = "ep_comments_page"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_comments_page/-/ep_comments_page-0.1.0.tgz"; - sha512 = "aHUfyR3HZ677wgL1hJEeaa1yIabW3PjaFXHhWnlEXdIDXL3WmgkGQ4Y1ccHp057EmquCwNb595HADQO+QUK/lw=="; - }; - dependencies = [ - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.1" - sources."backo2-1.0.2" - sources."base64-arraybuffer-0.1.5" - sources."better-assert-1.0.2" - sources."blob-0.0.5" - sources."callsite-1.0.0" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."debug-4.1.1" - sources."engine.io-client-3.4.1" - sources."engine.io-parser-2.2.0" - sources."formidable-1.2.2" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."isarray-2.0.1" - sources."ms-2.1.2" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."socket.io-client-2.3.0" - (sources."socket.io-parser-3.3.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."to-array-0.1.4" - sources."ws-6.1.4" - sources."xmlhttprequest-ssl-1.5.5" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Adds comments on sidebar and link it to the text. Support for Page View, requires ep_page_view"; - homepage = "https://github.com/ether/ep_comments#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json deleted file mode 100644 index f6da8df..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_copy_paste_select_all" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix deleted file mode 100644 index 504bee2..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_copy_paste_select_all = nodeEnv.buildNodePackage { - name = "ep_copy_paste_select_all"; - packageName = "ep_copy_paste_select_all"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_copy_paste_select_all/-/ep_copy_paste_select_all-0.0.4.tgz"; - sha1 = "41b89ece9da8e549a7ca4b11cdfa0a27344f21c8"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Add support to do Copy, Paste, Select All and Find and Replace, this plugin requires the file menu"; - homepage = https://github.com/ether/ep_copy_paste_select_all; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json deleted file mode 100644 index b409581..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_cursortrace" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix deleted file mode 100644 index d8c1480..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_cursortrace = nodeEnv.buildNodePackage { - name = "ep_cursortrace"; - packageName = "ep_cursortrace"; - version = "2.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_cursortrace/-/ep_cursortrace-2.0.15.tgz"; - sha1 = "fa374f2d4be2708af998fbb407633c55d9031326"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Show cursor/caret movements of other users in real time"; - homepage = https://github.com/redhog/ep_cursortrace; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json deleted file mode 100644 index 8688afc..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_delete_empty_pads" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix deleted file mode 100644 index 8f3e9c0..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_delete_empty_pads = nodeEnv.buildNodePackage { - name = "ep_delete_empty_pads"; - packageName = "ep_delete_empty_pads"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_delete_empty_pads/-/ep_delete_empty_pads-0.0.6.tgz"; - sha512 = "ZpVKhWYUBAz5jWXT4Ldjraa5oAmOmOiSaNUSVOdVEG7DLeoNaTrjSQx0KZl4EjF1Qp/oUQwX69ryjY0assmdrw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Delete pads which were never edited"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch b/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch deleted file mode 100644 index 162f1b0..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/ep.json b/ep.json -index 083d484..6803475 100644 ---- a/ep.json -+++ b/ep.json -@@ -5,6 +5,7 @@ - "hooks": { - "eejsBlock_editbarMenuLeft": "ep_embedmedia/hooks:eejsBlock_editbarMenuLeft", - "eejsBlock_scripts": "ep_embedmedia/hooks:eejsBlock_scripts", -+ "eejsBlock_timesliderBody": "ep_embedmedia/hooks:eejsBlock_scripts", - "eejsBlock_styles": "ep_embedmedia/hooks:eejsBlock_styles", - "eejsBlock_body": "ep_embedmedia/hooks:eejsBlock_body" - }, -diff --git a/static/css/main.css b/static/css/main.css -index 72a460f..3b66d8e 100644 ---- a/static/css/main.css -+++ b/static/css/main.css -@@ -6,10 +6,18 @@ - z-index:999999; - } - -+#embedMediaSrc { -+ max-width: 100%; -+} -+ - .embedMediaButton { - padding:10px; - } - -+#doEmbedMedia{ -+ color:blue; -+} -+ - #cancelEmbedMedia{ - color:red; - } -@@ -19,6 +27,6 @@ - } - - .buttonicon-embed-media:before{ -- content:"\e80b"; -+ content:"\e83b"; - top: 2px !important; - } -diff --git a/static/js/main.js b/static/js/main.js -index 8c94767..19415d5 100644 ---- a/static/js/main.js -+++ b/static/js/main.js -@@ -10,22 +10,25 @@ $(document).ready(function () { - } else { - module.slideDown("fast"); - } -+ module.toggleClass("popup-show"); - }); - - $("#doEmbedMedia").click(function () { - var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor; - - $("#embedMediaModal").slideUp("fast"); -+ $("#embedMediaModal").removeClass("popup-show"); - - return padeditor.ace.callWithAce(function (ace) { -- rep = ace.ace_getRep(); -+ var rep = ace.ace_getRep(); - ace.ace_replaceRange(rep.selStart, rep.selEnd, "E"); - ace.ace_performSelectionChange([rep.selStart[0],rep.selStart[1]-1], rep.selStart, false); -- ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]); -+ ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]); - }, "embedMedia"); - }); - - $("#cancelEmbedMedia").click(function () { - $("#embedMediaModal").slideUp("fast"); -+ $("#embedMediaModal").removeClass("popup-show"); - }); - }); -diff --git a/templates/modals.ejs b/templates/modals.ejs -index 9340698..8915a3b 100644 ---- a/templates/modals.ejs -+++ b/templates/modals.ejs -@@ -1,4 +1,4 @@ --