ep_font_size 0.4.100 → 0.4.102

package/.github/workflows/automerge.yml

@@ -0,0 +1,30 @@
+name: Dependabot Automerge
+permissions:
+  contents: write
+  pull-requests: write
+on:
+  workflow_run:
+    workflows:
+      - Node.js Package
+    types:
+      - completed
+
+jobs:
+  automerge:
+    if: >
+      github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.event == 'push' &&
+      github.event.workflow_run.actor.login == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Automerge
+        uses: "pascalgn/automerge-action@v0.16.4"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_METHOD: squash
+          MERGE_LABELS: ""
+          MERGE_RETRY_SLEEP: "100000"
+

package/.github/workflows/npmpublish.yml

@@ -59,12 +59,20 @@ jobs:
           [ "${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'
-          pnpm i
+          pnpm i --frozen-lockfile
           # `pnpm version patch` bumps package.json, makes a commit, and creates
           # a `v<new-version>` tag. Capture the new tag name from package.json
           # rather than parsing pnpm's output, which has historically varied.
-          pnpm version patch
-          NEW_TAG="v$(node -p "require('./package.json').version")"
+          # Bump the patch component directly with Node. pnpm/action-setup@v6
+          # sometimes installs pnpm 11 pre-releases even when version: 10.x is
+          # requested (pnpm/action-setup#225); those pre-releases either skip
+          # the git commit/tag or reject --no-git-tag-version as unknown.
+          # Doing the bump in Node sidesteps both failure modes.
+          NEW_VERSION=$(node -e "const fs=require('fs');const p=require('./package.json');const v=p.version.split('.');v[2]=String(Number(v[2])+1);p.version=v.join('.');fs.writeFileSync('./package.json',JSON.stringify(p,null,2)+'\n');console.log(p.version);")
+          NEW_TAG="v${NEW_VERSION}"
+          git add package.json
+          git commit -m "${NEW_TAG}"
+          git tag -a "${NEW_TAG}" -m "${NEW_TAG}"
           # CRITICAL: use --atomic so the branch update and the tag update
           # succeed (or fail) as a single transaction on the server. The old
           # `git push --follow-tags` was non-atomic per ref: if a concurrent

package/README.md

@@ -1,4 +1,4 @@
-![Publish Status](https://github.com/ether/ep_font_size/workflows/Node.js%20Package/badge.svg) [![Backend Tests Status](https://github.com/ether/ep_font_size/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/ether/ep_font_size/actions/workflows/test-and-release.yml)
+![Demo](demo.gif) [![Backend Tests Status](https://github.com/ether/ep_font_size/actions/workflows/test-and-release.yml/badge.svg)](https://github.com/ether/ep_font_size/actions/workflows/test-and-release.yml)
 
 [![Travis (.com)](https://api.travis-ci.com/ether/ep_font_size.git.svg?branch=develop)](https://travis-ci.com/github/ether/ep_font_size.git)
 

package/exportHTML.js

@@ -1,20 +1,13 @@
 'use strict';
 
-const eejs = require('ep_etherpad-lite/node/eejs/');
+const {inlineAttributeExport} = require('ep_plugin_helpers/attributes-server');
 
-// Add the props to be supported in export
-exports.exportHtmlAdditionalTagsWithData = async (hookName, pad) => {
-  const ret = [];
-  pad.pool.eachAttrib((k, v) => { if (k === 'font-size') ret.push([k, v]); });
-  return ret;
-};
+const sizeExport = inlineAttributeExport({
+  attr: 'font-size',
+  exportCssFile: 'ep_font_size/static/css/size.css',
+  exportDataAttr: 'data-font-size',
+});
 
-// Include CSS for HTML export
-exports.stylesForExport =
-    async (hookName, padId) => eejs.require('ep_font_size/static/css/size.css');
-
-exports.getLineHTMLForExport = async (hookName, context) => {
-  // Replace data-size="foo" with class="font-size:x".
-  context.lineContent = context.lineContent.replace(
-      /data-font-size=["|']([0-9a-zA-Z]+)["|']/gi, 'class="font-size:$1"');
-};
+exports.exportHtmlAdditionalTagsWithData = sizeExport.exportHtmlAdditionalTagsWithData;
+exports.stylesForExport = sizeExport.stylesForExport;
+exports.getLineHTMLForExport = sizeExport.getLineHTMLForExport;

package/index.js

@@ -1,27 +1,20 @@
 'use strict';
 
-const eejs = require('ep_etherpad-lite/node/eejs/');
 const settingsModule = require('ep_etherpad-lite/node/utils/Settings');
 const settings = settingsModule.default || settingsModule;
+const {template, rawHTML} = require('ep_plugin_helpers');
+const eejs = require('ep_etherpad-lite/node/eejs/');
 const shared = require('./static/js/shared');
 
-exports.eejsBlock_editbarMenuLeft = (hookName, args, cb) => {
-  if (JSON.stringify(settings.toolbar).indexOf('fontSize') > -1) {
-    return cb();
-  }
-  args.content += eejs.require('ep_font_size/templates/editbarButtons.ejs');
-  return cb();
-};
+exports.eejsBlock_editbarMenuLeft = template('ep_font_size/templates/editbarButtons.ejs', {
+  skip: () => settings.toolbar && JSON.stringify(settings.toolbar).indexOf('fontSize') > -1,
+});
 
-exports.eejsBlock_dd_format = (hookName, args, cb) => {
-  args.content += eejs.require('ep_font_size/templates/fileMenu.ejs');
-  return cb();
-};
+exports.eejsBlock_dd_format = template('ep_font_size/templates/fileMenu.ejs');
 
-exports.eejsBlock_timesliderStyles = (hookName, args, cb) => {
-  args.content += `<style>${eejs.require('ep_font_size/static/css/size.css')}</style>`;
-  return cb();
-};
+exports.eejsBlock_timesliderStyles = rawHTML(
+  `<style>${eejs.require('ep_font_size/static/css/size.css')}</style>`
+);
 
 exports.padInitToolbar = (hookName, args, cb) => {
   const toolbar = args.toolbar;

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Apply sizes to fonts",
   "name": "ep_font_size",
-  "version": "0.4.100",
+  "version": "0.4.102",
   "license": "Apache-2.0",
   "author": {
     "name": "John McLear",
@@ -27,9 +27,12 @@
     "type": "individual",
     "url": "https://etherpad.org/"
   },
+  "dependencies": {
+    "ep_plugin_helpers": "^0.2.0"
+  },
   "devDependencies": {
     "eslint": "^8.57.1",
-    "eslint-config-etherpad": "^4.0.4",
+    "eslint-config-etherpad": "^4.0.5",
     "typescript": "^5.9.3"
   },
   "scripts": {

package/static/js/index.js

@@ -1,8 +1,13 @@
 'use strict';
 
+const {inlineAttribute} = require('ep_plugin_helpers/attributes');
 const shared = require('./shared');
 
-// Bind the event handler to the toolbar buttons
+const fontSize = inlineAttribute({attr: 'font-size'});
+
+exports.aceAttribsToClasses = fontSize.aceAttribsToClasses;
+exports.aceCreateDomLine = fontSize.aceCreateDomLine;
+
 exports.postAceInit = (hookName, context) => {
   const hs = $('#font-size, select.size-selection');
   hs.on('change', function () {
@@ -13,42 +18,19 @@ exports.postAceInit = (hookName, context) => {
         ace.ace_doInsertsizes(intValue);
       }, 'insertsize', true);
       hs.val('dummy');
+      context.ace.focus();
     }
   });
   $('.font_size').hover(() => {
     $('.submenu > .size-selection').attr('size', 6);
     $('.submenu > #font-size').attr('size', 6);
   });
-  $('.font-size-icon').click(() => {
+  $('.font-size-icon').on('click', () => {
     $('#font-size').toggle();
   });
 };
 
-exports.aceAttribsToClasses = (hookName, context) => {
-  if (context.key.indexOf('font-size:') !== -1) {
-    const size = /(?:^| )font-size:([A-Za-z0-9]*)/.exec(context.key);
-    return [`font-size:${size[1]}`];
-  }
-  if (context.key === 'font-size') {
-    return [`font-size:${context.value}`];
-  }
-};
-
-exports.aceCreateDomLine = (hookName, context) => {
-  const cls = context.cls;
-  const [, sizesType] = /(?:^| )font-size:([A-Za-z0-9]*)/.exec(cls) || [];
-  if (sizesType == null) return [];
-  const tagIndex = shared.sizes.indexOf(sizesType);
-  if (tagIndex < 0) return [];
-  return [{
-    extraOpenTags: '',
-    extraCloseTags: '',
-    cls,
-  }];
-};
-
 exports.aceInitialized = (hookName, context) => {
-  // Passing a level >= 0 will set a sizes on the selected lines, level < 0 will remove it
   context.editorInfo.ace_doInsertsizes = (level) => {
     const {rep, documentAttributeManager} = context;
     if (!(rep.selStart && rep.selEnd)) return;
@@ -61,7 +43,7 @@ exports.aceInitialized = (hookName, context) => {
 exports.aceEditorCSS = () => ['ep_font_size/static/css/size.css'];
 
 exports.postToolbarInit = (hookName, context) => {
-  context.toolbar.registerCommand('fontSize', (buttonName, toolbar, item) => {
+  context.toolbar.registerCommand('fontSize', () => {
     $('#font-size').toggle();
   });
 };

package/static/js/shared.js

@@ -1,17 +1,16 @@
 'use strict';
 
-// Starts at b, ends just before e, skipping s each time.
-const range = (b, e, s = 1) => [...Array(Math.ceil((e - b) / s)).keys()].map((x) => (x * s) + b);
+const {inlineAttribute} = require('ep_plugin_helpers/attributes');
 
-exports.collectContentPre = (hookName, context) => {
-  const size = /(?:^| )font-size:([A-Za-z0-9]*)/.exec(context.cls);
-  if (size && size[1]) {
-    context.cc.doAttrib(context.state, `font-size:${size[1]}`);
-  }
-};
+const range = (b, e, s = 1) => [...Array(Math.ceil((e - b) / s)).keys()].map((x) => (x * s) + b);
 
-exports.sizes = []
+const sizes = []
     .concat(range(8, 20))
     .concat(range(20, 30, 2))
     .concat(range(30, 50, 5))
     .concat(range(50, 70, 10));
+
+const fontSize = inlineAttribute({attr: 'font-size'});
+
+exports.collectContentPre = fontSize.collectContentPre;
+exports.sizes = sizes;

package/templates/editbarButtons.ejs

@@ -1,6 +1,9 @@
 <li class="separator acl-write"></li>
 <li class="acl-write">
-    <select id="font-size" class="size-selection">
+    <select id="font-size" class="size-selection"
+            aria-label="Font size"
+            data-l10n-id="ep_font_size.size"
+            data-l10n-attr="aria-label">
         <option value="dummy" selected data-l10n-id="ep_font_size.size">Font Size</option>
         <option value="0">8</option>
         <option value="1">9</option>

package/templates/fileMenu.ejs

@@ -1,5 +1,5 @@
 <hr>
-<li><a href="#" data-key="align" class="font_size">Font size</a>
+<li><a href="#" data-key="fontSize" class="font_size" data-l10n-id="ep_font_size.size">Font size</a>
   <ul class="submenu">
     <select id="font-size" class="size-selection">
         <option value="dummy" selected data-l10n-id="ep_font_size.size">Font Size</option>