ep_author_hover 0.3.55 → 1.0.2

package/.github/workflows/codeql.yml

@@ -6,36 +6,11 @@ on:
   pull_request:
     branches: [ "main" ]
   schedule:
-    - cron: "46 0 * * 6"
+    - cron: "48 0 * * 2"
+
 
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ javascript ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: ether/ether-pipelines/.github/workflows/codeql-plugins.yml@main
+        secrets: inherit
 
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{ matrix.language }}"

package/.github/workflows/test-and-release.yml

@@ -0,0 +1,7 @@
+name: Node.js Package
+on: [push]
+
+jobs:
+  backend:
+    uses: ether/ether-pipelines/.github/workflows/test-and-release-plugins.yml@main
+    secrets: inherit

package/locales/id.json

@@ -0,0 +1,10 @@
+{
+	"@metadata": {
+		"authors": [
+			"Atriwidada"
+		]
+	},
+	"ep_author_hover.me": "Saya",
+	"ep_author_hover.unknow_author": "Penulis Tidak Diketahui",
+	"ep_author_hover.showHoverLabel": "Tampilkan Penulis saat Mengapung"
+}

package/locales/kaa.json

@@ -0,0 +1,10 @@
+{
+	"@metadata": {
+		"authors": [
+			"Inabat Allanova"
+		]
+	},
+	"ep_author_hover.me": "Ózim",
+	"ep_author_hover.unknow_author": "Belgisiz avtor",
+	"ep_author_hover.showHoverLabel": "Avtordı Hoverde kórsetiw"
+}

package/locales/lt.json

@@ -0,0 +1,10 @@
+{
+	"@metadata": {
+		"authors": [
+			"Nokeoo"
+		]
+	},
+	"ep_author_hover.me": "Aš",
+	"ep_author_hover.unknow_author": "Nežinomas autorius",
+	"ep_author_hover.showHoverLabel": "Rodyti autorių užvedus pelę"
+}

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "ep_author_hover",
   "description": "Adds author names to span titles (shows on hover), works as authors change their name.  Hover includes author color and fast switching between author spans.  Hat tip to Martyn York for the initial work on this.",
-  "version": "0.3.55",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:JohnMcLear/ep_author_hover.git"
@@ -16,18 +16,15 @@
     "url": "https://etherpad.org/"
   },
   "devDependencies": {
-    "eslint": "^8.11.0",
-    "eslint-config-etherpad": "^3.0.9",
-    "typescript": "^4.6.2"
+    "eslint": "^8.57.0",
+    "eslint-config-etherpad": "^3.0.22",
+    "typescript": "^5.4.2"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   },
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."
-  },
-  "engines": {
-    "node": ">=12.17.0"
-  },
-  "peerDependencies": {
-    "ep_etherpad-lite": ">=1.8.6"
   }
-}
+}

package/static/js/index.js

@@ -1,20 +1,19 @@
 'use strict';
 
 const padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
+import html10n from 'ep_etherpad-lite/static/js/vendors/html10n'
 
 let timer = 0;
 
 const showAuthor = {
-  enable: (context) => {
-    context.ace.callWithAce((ace) => {
-      const doc = ace.ace_getDocument();
-      $(doc).find('#innerdocbody').mousemove(exports.showAuthor.hover.bind(ace));
-    }, 'showAuthor', true);
+  enable: () => {
+    $('iframe[name="ace_outer"]').contents().find('iframe')
+      .contents().find('#innerdocbody').on('mousemove',exports.showAuthor.hover);
   },
   disable: (context) => {
     context.ace.callWithAce((ace) => {
       const doc = ace.ace_getDocument();
-      $(doc).find('#innerdocbody').mousemove(null.bind(ace));
+      $(doc).find('#innerdocbody').on('mousemove',null.bind(ace));
     }, 'showAuthor', true);
   },
   hover: (span) => {
@@ -34,7 +33,7 @@ const showAuthor = {
       if (!authorId) { return; } // Default text isn't shown
       showAuthor.destroy(); // Destroy existing
       const authorNameAndColor =
-      showAuthor.authorNameAndColorFromAuthorId(authorId); // Get the authorName And Color
+        showAuthor.authorNameAndColorFromAuthorId(authorId); // Get the authorName And Color
       showAuthor.draw(span, authorNameAndColor.name, authorNameAndColor.color);
     }
   },
@@ -57,7 +56,7 @@ const showAuthor = {
     const myAuthorId = pad.myUserInfo.userId.substring(0, 14);
     if (myAuthorId === authorId) {
       return {
-        name: window._('ep_author_hover.me'),
+        name: html10n.get('ep_author_hover.me'),
         color: '#fff',
       };
     }
@@ -68,7 +67,7 @@ const showAuthor = {
       if (authorId === $(this).data('authorid').substring(0, 14)) {
         $(this).find('.usertdname').each(function () {
           authorObj.name = $(this).text();
-          if (authorObj.name === '') authorObj.name = window._('ep_author_hover.unknow_author');
+          if (authorObj.name === '') authorObj.name = html10n.get('ep_author_hover.unknow_author');
         });
         $(this).find('.usertdswatch > div').each(function () {
           authorObj.color = $(this).css('background-color');
@@ -83,12 +82,12 @@ const showAuthor = {
       authorObj = clientVars.collab_client_vars.historicalAuthorData[fullAuthorId];
     }
 
-    return authorObj || {name: window._('ep_author_hover.unknow_author'), color: '#fff'};
+    return authorObj || {name: html10n.get('ep_author_hover.unknow_author'), color: '#fff'};
   },
   draw: (target, authorName, authorColor) => {
     if (!authorName) {
       const warning =
-      'No authorName, I have no idea why!  Help me debug this by providing steps to replicate!';
+        'No authorName, I have no idea why!  Help me debug this by providing steps to replicate!';
       console.warn(warning);
       return;
     }
@@ -144,11 +143,7 @@ exports.postAceInit = (hookName, context) => {
     $('#options-author-hover').attr('checked', 'checked');
   }
 
-  if ($('#options-author-hover').is(':checked')) {
-    clientVars.plugins.plugins.ep_author_hover.enabled = true;
-  } else {
-    clientVars.plugins.plugins.ep_author_hover.enabled = false;
-  }
+  clientVars.plugins.plugins.ep_author_hover.enabled = !!$('#options-author-hover').is(':checked');
 
   /* on click */
   $('#options-author-hover').on('click', () => {

package/.github/workflows/backend-tests.yml

@@ -1,77 +0,0 @@
-name: "Backend tests"
-
-# any branch is useful for testing before a PR is submitted
-on: [push, pull_request]
-
-jobs:
-  withplugins:
-    # run on pushes to any branch
-    # run on PRs from external forks
-    if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: with Plugins
-    runs-on: ubuntu-latest
-
-    steps:
-      -
-        name: Install libreoffice
-        run: |
-          sudo add-apt-repository -y ppa:libreoffice/ppa
-          sudo apt update
-          sudo apt install -y --no-install-recommends libreoffice libreoffice-pdfimport
-      -
-        name: Install etherpad core
-        uses: actions/checkout@v3
-        with:
-          repository: ether/etherpad-lite
-      -
-        name: Checkout plugin repository
-        uses: actions/checkout@v3
-        with:
-          path: ./node_modules/__tmp
-      -
-        name: Determine plugin name
-        id: plugin_name
-        run: |
-          cd ./node_modules/__tmp
-          npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-      -
-        name: Rename plugin directory
-        run: |
-          mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            src/package-lock.json
-            src/bin/doc/package-lock.json
-            node_modules/${{ steps.plugin_name.outputs.plugin_name }}/package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
-      -
-        name: Install plugin dependencies
-        run: |
-          cd ./node_modules/"${PLUGIN_NAME}"
-          npm ci
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, otherwise npm will try to hoist common
-      # dependencies by removing them from src/node_modules and installing them
-      # in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
-      # to be buggy, because it sometimes removes dependencies from
-      # src/node_modules but fails to add them to the top-level node_modules.
-      # Even if npm correctly hoists the dependencies, the hoisting seems to
-      # confuse tools such as `npm outdated`, `npm update`, and some ESLint
-      # rules.
-      -
-        name: Install Etherpad core dependencies
-        run: src/bin/installDeps.sh
-      -
-        name: Run the backend tests
-        run: cd src && npm test

package/.github/workflows/frontend-tests.yml

@@ -1,101 +0,0 @@
-# Publicly credit Sauce Labs because they generously support open source
-# projects.
-name: "frontend tests powered by Sauce Labs"
-
-on: [push]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-    steps:
-      -
-        name: Generate Sauce Labs strings
-        id: sauce_strings
-        run: |
-          printf %s\\n '::set-output name=name::${{github.event.repository.name}} ${{ github.workflow }} - ${{ github.job }}'
-          printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
-      -
-        name: Check out Etherpad core
-        uses: actions/checkout@v3
-        with:
-          repository: ether/etherpad-lite
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            src/package-lock.json
-            src/bin/doc/package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
-      -
-        name: Check out the plugin
-        uses: actions/checkout@v3
-        with:
-          path: ./node_modules/__tmp
-      -
-        name: export GIT_HASH to env
-        id: environment
-        run: |
-          cd ./node_modules/__tmp
-          echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
-      -
-        name: Determine plugin name
-        id: plugin_name
-        run: |
-          cd ./node_modules/__tmp
-          npx -c 'printf %s\\n "::set-output name=plugin_name::${npm_package_name}"'
-      -
-        name: Rename plugin directory
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-        run: |
-          mv ./node_modules/__tmp ./node_modules/"${PLUGIN_NAME}"
-      -
-        name: Install plugin dependencies
-        env:
-          PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
-        run: |
-          cd ./node_modules/"${PLUGIN_NAME}"
-          npm ci
-      # Etherpad core dependencies must be installed after installing the
-      # plugin's dependencies, otherwise npm will try to hoist common
-      # dependencies by removing them from src/node_modules and installing them
-      # in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
-      # to be buggy, because it sometimes removes dependencies from
-      # src/node_modules but fails to add them to the top-level node_modules.
-      # Even if npm correctly hoists the dependencies, the hoisting seems to
-      # confuse tools such as `npm outdated`, `npm update`, and some ESLint
-      # rules.
-      -
-        name: Install Etherpad core dependencies
-        run: src/bin/installDeps.sh
-      -
-        name: Create settings.json
-        run: cp settings.json.template settings.json
-      -
-        name: Disable import/export rate limiting
-        run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
-      -
-        name: Remove standard frontend test files
-        run: rm -rf src/tests/frontend/specs
-      -
-        uses: saucelabs/sauce-connect-action@v2.1.1
-        with:
-          username: ${{ secrets.SAUCE_USERNAME }}
-          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-          tunnelIdentifier: ${{ steps.sauce_strings.outputs.tunnel_id }}
-      -
-        name: Run the frontend tests
-        shell: bash
-        env:
-          SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-          SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-          SAUCE_NAME: ${{ steps.sauce_strings.outputs.name }}
-          TRAVIS_JOB_NUMBER: ${{ steps.sauce_strings.outputs.tunnel_id }}
-          GIT_HASH: ${{ steps.environment.outputs.sha_short }}
-        run: |
-          src/tests/frontend/travis/runner.sh

package/.github/workflows/npmpublish.yml

@@ -1,126 +0,0 @@
-# This workflow will run tests using node and then publish a package to the npm registry when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      # Clone ether/etherpad-lite to ../etherpad-lite so that ep_etherpad-lite
-      # can be "installed" in this plugin's node_modules. The checkout v2 action
-      # doesn't support cloning outside of $GITHUB_WORKSPACE (see
-      # https://github.com/actions/checkout/issues/197), so the repo is first
-      # cloned to etherpad-lite then moved to ../etherpad-lite. To avoid
-      # conflicts with this plugin's clone, etherpad-lite must be cloned and
-      # moved out before this plugin's repo is cloned to $GITHUB_WORKSPACE.
-      -
-        uses: actions/checkout@v3
-        with:
-          repository: ether/etherpad-lite
-          path: etherpad-lite
-      -
-        run: mv etherpad-lite ..
-      # etherpad-lite has been moved outside of $GITHUB_WORKSPACE, so it is now
-      # safe to clone this plugin's repo to $GITHUB_WORKSPACE.
-      -
-        uses: actions/checkout@v3
-      # This is necessary for actions/setup-node because '..' can't be used in
-      # cache-dependency-path.
-      -
-        name: Create ep_etherpad-lite symlink
-        run: |
-          mkdir -p node_modules
-          ln -s ../../etherpad-lite/src node_modules/ep_etherpad-lite
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            node_modules/ep_etherpad-lite/package-lock.json
-            node_modules/ep_etherpad-lite/bin/doc/package-lock.json
-            package-lock.json
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
-      # All of ep_etherpad-lite's devDependencies are installed because the
-      # plugin might do `require('ep_etherpad-lite/node_modules/${devDep}')`.
-      # Eventually it would be nice to create an ESLint plugin that prohibits
-      # Etherpad plugins from piggybacking off of ep_etherpad-lite's
-      # devDependencies. If we had that, we could change this line to only
-      # install production dependencies.
-      -
-        run: cd ../etherpad-lite/src && npm ci
-      -
-        run: npm ci
-      # This runs some sanity checks and creates a symlink at
-      # node_modules/ep_etherpad-lite that points to ../../etherpad-lite/src.
-      # This step must be done after `npm ci` installs the plugin's dependencies
-      # because npm "helpfully" cleans up such symlinks. :( Installing
-      # ep_etherpad-lite in the plugin's node_modules prevents lint errors and
-      # unit test failures if the plugin does `require('ep_etherpad-lite/foo')`.
-      -
-        run: npm install --no-save ep_etherpad-lite@file:../etherpad-lite/src
-      -
-        run: npm test
-      -
-        run: npm run lint
-
-  publish-npm:
-    if: github.event_name == 'push'
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-          cache: 'npm'
-      - run: npm install npm@6.14.18 -g
-        name: Install legacy npm for correct dependency resolution
-      -
-        name: Bump version (patch)
-        run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0) || exit 1
-          NEW_COMMITS=$(git rev-list --count "${LATEST_TAG}"..) || exit 1
-          [ "${NEW_COMMITS}" -gt 0 ] || exit 0
-          git config user.name 'github-actions[bot]'
-          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          npm ci
-          npm version patch
-          git push --follow-tags
-      # This is required if the package has a prepare script that uses something
-      # in dependencies or devDependencies.
-      -
-        run: npm ci
-      # `npm publish` must come after `git push` otherwise there is a race
-      # condition: If two PRs are merged back-to-back then master/main will be
-      # updated with the commits from the second PR before the first PR's
-      # workflow has a chance to push the commit generated by `npm version
-      # patch`. This causes the first PR's `git push` step to fail after the
-      # package has already been published, which in turn will cause all future
-      # workflow runs to fail because they will all attempt to use the same
-      # already-used version number. By running `npm publish` after `git push`,
-      # back-to-back merges will cause the first merge's workflow to fail but
-      # the second's will succeed.
-      -
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-      -
-        name: Add package to etherpad organization
-        run: npm access grant read-write etherpad:developers
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}