Skip to content

Commit

Permalink
Merge branch 'master' into KB-49186
Browse files Browse the repository at this point in the history
  • Loading branch information
usantos-at-wiris authored Jan 7, 2025
2 parents 82205b4 + 84c482a commit 83de6a8
Show file tree
Hide file tree
Showing 36 changed files with 21,914 additions and 22,035 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# WIRIS INTEGRATIONS TEAM
* @carla-at-wiris @jgonzalez-at-wiris @usantos-at-wiris @xjiang-at-wiris @ncornaglia-at-wiris
13 changes: 0 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

32 changes: 32 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
## Description

> Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. Include, if necessary, a description of the proposed solution and the reasoning behind it.
- **Related Kanbanize Card:** [Link to KB-X](https://wiris.kanbanize.com/ctrl_board/2/cards/X/details/)
- **Related GitHub Issue:** Closes #X (_Associated GitHub issue, if any_)

## Type of Change

> Please delete options that are not relevant.
- [ ] Feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Chore (non-breaking change that doesn't add any functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Documentation update (changes to documentation only)
- [ ] Refactoring (non-breaking change that improves the code structure)

## Checklist

- [ ] My code follows the style guidelines of this project ( Run `yarn lint` to check)
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation (if applicable)
- [ ] My changes generate no new warnings or errors
- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
- [ ] New and existing unit tests pass locally with my changes

## How should be tested? (Manual or Automated Tests)

> Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce,also list any relevant details for your test configuration.
- **Manual tests:** I have tested this changes manually.
2 changes: 1 addition & 1 deletion .github/workflows/jsdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
# 06. Upload the jsdoc site to github artifacts
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: mathtype-html-integration-devkit-docs
path: |
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"files.autoSave": "afterDelay", // Autosave files after a delay
"editor.formatOnSave": true, // Format code when saving ( <Ctrl> + S)
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
"source.fixAll.eslint": "explicit" // Fix all ESLint errors on save
},

//! File settings
Expand Down
13 changes: 12 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,18 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

Last release of this project was 26th of June 2024.
Last release of this project was 4nd of October 2024.

### 8.11.1 2024-10-04

- feat: Added missing Dutch translation keys. #KB-49694
- fix(ck5): Take in account image format when rendering and save image into model. #KB-50469

### 8.11.0 2024-09-02

- fix: Superscript getting casted to subscript. #KB-50069
- fix(ck5): Wrong caret position when multiple editor instances. #KB-48969
- chore(ck5): Update dependencies fro v43 compatibility. KB-49655

### 8.10.0 2024-06-26

Expand Down
2 changes: 1 addition & 1 deletion demos/html/ckeditor4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@wiris/mathtype-ckeditor4": "*",
"@wiris/mathtype-html-integration-devkit": "*",
"ckeditor4": "4.22.1"
"ckeditor4": "^4.22.1"
},
"devDependencies": {
"@babel/core": "^7.24.4",
Expand Down
1 change: 1 addition & 0 deletions demos/html/ckeditor5/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ window.editor = null;

// Create the CKEditor 5.
ClassicEditor.create(document.querySelector("#editor"), {
licenseKey: 'GPL',
plugins: [Essentials, Paragraph, Bold, Italic, MathType, Alignment, SourceEditing],
toolbar: [
"bold",
Expand Down
1 change: 1 addition & 0 deletions demos/vue/ckeditor5/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const content = Generic.editorContentMathML;
const toolbar = ["bold", "italic", "link", "undo", "redo", "MathType", "ChemType", "sourceEditing"];
const plugins = [Essentials, Bold, Italic, Link, Paragraph, MathType, SourceEditing];
const editorConfig = {
licenseKey: 'GPL',
iframe: true,
charCounterCount: false,
plugins,
Expand Down
20 changes: 10 additions & 10 deletions docs/demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ This is managed by the `deploy-staging.yml` workflow.
Conversely, when a branch is deleted, the corresponding deployed demos get removed as well.
This is managed by the `dismantle-staging.yml` workflow.

For example, if you push a commit to the branch `stable`, then https://integrations.wiris.kitchen/stable/html/generic/ will contain the HTML demo for the generic editor with the latest changes you pushed.
For example, if you push a commit to the branch `master`, then https://integrations.wiris.kitchen/master/html/generic/ will contain the HTML demo for the generic editor with the latest changes you pushed.

The URL format for each demo is as follows: `https://integrations.wiris.kitchen/<BRANCH>/<FRAMEWORK>/<EDITOR>/`.

The following table contains all our demos, together with links to the corresponding deployment for the branch `stable`:
The following table contains all our demos, together with links to the corresponding deployment for the branch `master`:

| FRAMEWORK | Editor and Version | EDITOR | Deployment URL for `stable` |
| FRAMEWORK | Editor and Version | EDITOR | Deployment URL for `master` |
| --------- | ------------------- | ---------------------------------------------------- | ------------------------------------------------------------ |
| html | CKEditor V4 | [ckeditor4](../../demos/html/ckeditor4) | https://integrations.wiris.kitchen/stable/html/ckeditor4/ |
| html | CKEditor V5 | [ckeditor5](../../demos/html/ckeditor5) | https://integrations.wiris.kitchen/stable/html/ckeditor5/ |
| html | Froala | [froala](../../demos/html/froala) | https://integrations.wiris.kitchen/stable/html/froala/ |
| html | Generic integration | [generic](../../demos/html/generic) | https://integrations.wiris.kitchen/stable/html/generic/ |
| html | TinyMCE V5 | [tinymce5](../../demos/html/tinymce5) | https://integrations.wiris.kitchen/stable/html/tinymce5/ |
| html | TinyMCE V6 | [tinymce6](../../demos/html/tinymce6) | https://integrations.wiris.kitchen/stable/html/tinymce6/ |
| vue | CKEditor V5 | [ckeditor5](../../demos/vue/ckeditor5/README.md) | https://integrations.wiris.kitchen/stable/vue/ckeditor5/ |
| html | CKEditor V4 | [ckeditor4](../../demos/html/ckeditor4) | https://integrations.wiris.kitchen/master/html/ckeditor4/ |
| html | CKEditor V5 | [ckeditor5](../../demos/html/ckeditor5) | https://integrations.wiris.kitchen/master/html/ckeditor5/ |
| html | Froala | [froala](../../demos/html/froala) | https://integrations.wiris.kitchen/master/html/froala/ |
| html | Generic integration | [generic](../../demos/html/generic) | https://integrations.wiris.kitchen/master/html/generic/ |
| html | TinyMCE V5 | [tinymce5](../../demos/html/tinymce5) | https://integrations.wiris.kitchen/master/html/tinymce5/ |
| html | TinyMCE V6 | [tinymce6](../../demos/html/tinymce6) | https://integrations.wiris.kitchen/master/html/tinymce6/ |
| vue | CKEditor V5 | [ckeditor5](../../demos/vue/ckeditor5/README.md) | https://integrations.wiris.kitchen/master/vue/ckeditor5/ |

## Running a demo using the local source code

Expand Down
4 changes: 3 additions & 1 deletion docs/development/cicd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ This job uses JSDoc library to generate a static site as an artifact called `mat

### Run Cypress tests with npm packages

**[Deprecated]**

Builds the packages using the source code available at npmjs and runs all available Cypress tests.

- **On schedule**: every Monday at 1AM. It sends the test data to [Cypress Dashboard][cypress-dashboard]. It can be run on any branch.

- **On demand**: a manual trigger that allows the user to send data to [Cypress Dashboard][cypress-dashboard], optionally. It only runs on `stable` branch.
- **On demand**: a manual trigger that allows the user to send data to [Cypress Dashboard][cypress-dashboard], optionally.

## Actions secrets

Expand Down
6 changes: 3 additions & 3 deletions packages/ckeditor4/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wiris/mathtype-ckeditor4",
"version": "8.10.0",
"version": "8.11.1",
"description": "MathType Web for CKEditor4 editor",
"keywords": [
"chem",
Expand All @@ -17,7 +17,7 @@
"mathtype",
"wiris"
],
"repository": "https://github.com/wiris/html-integrations/tree/stable/packages/mathtype-ckeditor4",
"repository": "https://github.com/wiris/html-integrations/tree/master/packages/ckeditor4",
"homepage": "https://www.wiris.com/?utm_source=npmjs&utm_medium=referral",
"bugs": {
"email": "[email protected]"
Expand All @@ -32,7 +32,7 @@
"prepack": "yarn && npm run build"
},
"dependencies": {
"@wiris/mathtype-html-integration-devkit": "1.17.3"
"@wiris/mathtype-html-integration-devkit": "1.17.5"
},
"devDependencies": {
"@babel/core": "^7.24.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor4/plugin.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import StringManager from "@wiris/mathtype-html-integration-devkit/src/stringman
import packageInfo from "./package.json";

/**
* This property contains all Froala Integration instances.
* This property contains all CKEditor4 Integration instances.
* @type {Object}
*/
export const instances = {};
/**
* This property contains the current Froala integration instance,
* This property contains the current CKEditor4 integration instance,
* which is the instance of the active editor.
* @class
* @type {IntegrationModel}
Expand Down
Loading

0 comments on commit 83de6a8

Please sign in to comment.