Skip to content

Commit b7b13e0

Browse files
yrucremyrucrem
committed
Merge branch 'feature/jq3-migration' into jq3-migration-hotfix
2 parents 0103c2f + 60791ef commit b7b13e0

File tree

202 files changed

+62462
-5739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+62462
-5739
lines changed

‎.github/workflows/ci.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Cypress Tests (Dev)
2+
3+
on:
4+
push:
5+
branches: [ jq3, feature/jq3-migration ]
6+
7+
jobs:
8+
cypress-run:
9+
runs-on: ubuntu-22.04
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
containers: [1, 2, 3, 4, 5]
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
18+
- name: Cypress run
19+
uses: cypress-io/github-action@v5
20+
with:
21+
build: npm run demo:build
22+
start: npm run demo:start
23+
record: true
24+
parallel: true
25+
env:
26+
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

‎.github/workflows/cypress-test.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Cypress Tests (PR)
2+
3+
on:
4+
pull_request:
5+
branches: [ jq3 ]
6+
7+
jobs:
8+
cypress-run:
9+
runs-on: ubuntu-22.04
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v3
13+
14+
- name: Cypress run
15+
uses: cypress-io/github-action@v5
16+
with:
17+
build: npm run demo:build
18+
start: npm run demo:start

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ node_modules
1616
src/css/aloha.css
1717
.idea
1818
.vscode
19+
20+
# Javascript
21+
node_modules/

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Aloha Editor jQuery Upgrade](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/ehtsn9&style=flat&logo=cypress)](https://cloud.cypress.io/projects/ehtsn9/runs)
2+
13
# [Aloha Editor - The HTML5 WYSIWYG Editor](http://aloha-editor.org/)
24

35
## New Documentation

‎build/aloha/build-profile-with-common-extra-plugins.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444

4545
// We do include Aloha's patched jquery-ui by default, but the
4646
// user can override it if he is adventurous.
47-
"jqueryui": 'vendor/jquery-ui-1.9.0.custom-aloha',
47+
"jqueryui": 'vendor/jquery-ui-1.13.2',
4848

4949
// For the repository browser
5050
'PubSub': 'vendor/pubsub/js/pubsub-unminified',
5151
'Class': 'vendor/class',
5252
'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser-unminified',
5353
'jstree': 'vendor/jquery.jstree', // Mutates jquery
5454
'jqgrid': 'vendor/jquery.jqgrid', // Mutates jquery
55-
'jquery-layout': 'vendor/jquery.layout-1.3.0-rc29.14', // Mutates jquery
55+
'jquery-layout': 'vendor/jquery.layout', // Mutates jquery
5656
'jqgrid-locale-en': 'vendor/grid.locale.en', // Mutates jqgrid
5757
'jqgrid-locale-de': 'vendor/grid.locale.de', // Mutates jqgrid
5858
'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser-unminified',

‎build/aloha/copy-dependencies.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const fs = require("fs-extra");
2+
3+
const tempPath = "src/lib";
4+
const destinationPath =
5+
"target/build-profile-with-common-extra-plugins/rjs-output/lib";
6+
7+
const dependencies = ["aloha/ecma5shims"];
8+
9+
for (const dependency of dependencies) {
10+
fs.copySync(
11+
`${tempPath}/${dependency}.js`,
12+
`${destinationPath}/${dependency}.js`,
13+
);
14+
}

‎build/changelog/entries/legacy/0.21.3/2669.enhancement

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Added a new block implementation of Aloha Editor blocks, which
55
To use this block type, just wrap your tag content in a <div>
66
with the following attribute:
77

8-
data-aloha-block-type="EmptyBlock"
8+
data-alohaBlockType="EmptyBlock"

‎build/r.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2939,7 +2939,7 @@ define('rhino/file', function () {
29392939
//Java's version of copy file.
29402940
srcChannel = new java.io.FileInputStream(srcFileName).getChannel();
29412941
destChannel = new java.io.FileOutputStream(destFileName).getChannel();
2942-
destChannel.transferFrom(srcChannel, 0, srcChannel.size());
2942+
destChannel.transferFrom(srcChannel, 0, srcChannel.length);
29432943
srcChannel.close();
29442944
destChannel.close();
29452945

‎cypress.config.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const { defineConfig } = require("cypress");
2+
3+
module.exports = defineConfig({
4+
projectId: "ehtsn9",
5+
e2e: {
6+
setupNodeEvents(on, config) {
7+
// implement node event listeners here
8+
},
9+
},
10+
});

‎cypress/e2e/abbr-plugin.cy.js

+116
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
describe("Abbr Plugin", () => {
2+
beforeEach(() => {
3+
cy.visit("http://localhost:8080/demo/modules/abbr.html");
4+
cy.get("#main").click();
5+
});
6+
7+
it("opens Aloha Editor UI when clicked", () => {
8+
cy.get(".aloha-ui.aloha-ui-toolbar.ui-draggable").should("exist");
9+
});
10+
11+
it('creates a "format as abbreviation" button in the Format and an "insert abbreviation" in the Insert tab', () => {
12+
cy.get("#tab-ui-container-1").within(() => {
13+
cy.get("span").contains("format as abbreviation").should("exist");
14+
});
15+
cy.get("#ui-id-2").click();
16+
cy.get("#tab-ui-container-2").within(() => {
17+
cy.get("span").contains("insert abbreviation").should("exist");
18+
});
19+
});
20+
21+
it('"format as abbreviation" should create an "Abbreviation" tab with an input that adds <abbr> tags to selected text', () => {
22+
cy.get("h1").type("{leftarrow}");
23+
cy.get("#tab-ui-container-1").within(() => {
24+
cy.get("span").contains("format as abbreviation").click();
25+
});
26+
cy.get("#aloha-attribute-field-abbrText")
27+
.should("exist")
28+
.type("Testing abbreviation");
29+
cy.get("h1")
30+
.find("abbr")
31+
.should("exist")
32+
.should("contain", "Plugin")
33+
.invoke("attr", "title")
34+
.should("equal", "Testing abbreviation");
35+
});
36+
37+
it('"format as abbreviation" should work with more than one selected word', () => {
38+
cy.get("h1")
39+
.type("{ctrl+a}")
40+
.then(() => {
41+
cy.get("#tab-ui-container-1")
42+
.find("span")
43+
.contains("format as abbreviation")
44+
.click();
45+
});
46+
47+
cy.get("#aloha-attribute-field-abbrText")
48+
.should("exist")
49+
.type("Testing abbreviation");
50+
cy.get("h1")
51+
.find("abbr")
52+
.should("exist")
53+
.should("contain", "Abbr Plugin")
54+
.invoke("attr", "title")
55+
.should("equal", "Testing abbreviation");
56+
});
57+
58+
it('"format as abbreviation" should work with different selected lines', () => {
59+
cy.get("h1").type("{shift+enter}This is a new line");
60+
cy.get("h1")
61+
.type("{ctrl+a}")
62+
.then(() => {
63+
cy.get("#tab-ui-container-1")
64+
.find("span")
65+
.contains("format as abbreviation")
66+
.click();
67+
});
68+
69+
cy.get("#aloha-attribute-field-abbrText")
70+
.should("exist")
71+
.type("Testing abbreviation");
72+
cy.get("h1")
73+
.find("abbr")
74+
.first()
75+
.should("contain", "Abbr Plugin")
76+
.invoke("attr", "title")
77+
.should("equal", "Testing abbreviation");
78+
cy.get("h1")
79+
.find("abbr")
80+
.eq(2)
81+
.should("contain", "This is a new line")
82+
.invoke("attr", "title")
83+
.should("equal", "Testing abbreviation");
84+
});
85+
86+
it('"insert abbreviation" should create an "Abbreviation" tab with an input that adds the text "Abbr" with <abbr> tags', () => {
87+
cy.get("h1").type(" ");
88+
cy.get("#tab-ui-container-1").within(() => {
89+
cy.get("span").contains("format as abbreviation").click();
90+
});
91+
cy.get("#aloha-attribute-field-abbrText")
92+
.should("exist")
93+
.type("Testing abbreviation");
94+
cy.get("h1")
95+
.find("abbr")
96+
.should("exist")
97+
.invoke("attr", "title")
98+
.should("equal", "Testing abbreviation");
99+
});
100+
101+
it('creates a "remove abbreviation" button in both tabs that removes the <abbr> tags', () => {
102+
cy.get("h1").type("{leftarrow}");
103+
cy.get("#tab-ui-container-1").within(() => {
104+
cy.get("span").contains("format as abbreviation").click();
105+
});
106+
cy.get("#aloha-attribute-field-abbrText").type("Testing abbreviation");
107+
cy.get("#tab-ui-container-6").within(() => {
108+
cy.get("span").contains("remove abbreviation").click();
109+
});
110+
cy.get("h1").find("abbr").should("not.exist");
111+
});
112+
113+
it('Verify if the icon exists', () => {
114+
cy.get(".ui-button-icon-primary").should("exist").should('be.visible');
115+
});
116+
});

‎cypress/e2e/align-plugin.cy.js

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
describe("Align Plugin", () => {
2+
beforeEach(() => {
3+
cy.visit("http://localhost:8080/demo/modules/align.html");
4+
cy.get("#main").click();
5+
});
6+
7+
it("opens Aloha Editor UI when clicked", () => {
8+
cy.get(".aloha-ui.aloha-ui-toolbar.ui-draggable").should("exist");
9+
});
10+
11+
it("creates four buttons in the Format tab", () => {
12+
cy.get("#tab-ui-container-1").within(() => {
13+
cy.get("span").contains("Align to the left").should("exist");
14+
cy.get("span").contains("Center").should("exist");
15+
cy.get("span").contains("Align to the right").should("exist");
16+
cy.get("span").contains("Justify").should("exist");
17+
});
18+
});
19+
20+
it('testing "Align to the right"', () => {
21+
cy.get("#tab-ui-container-1").within(() => {
22+
cy.get("span").contains("Align to the right").click();
23+
});
24+
cy.get("h1")
25+
.invoke("attr", "style")
26+
.should("contain", "text-align: right;");
27+
});
28+
29+
it('testing "Center"', () => {
30+
cy.get("#tab-ui-container-1").within(() => {
31+
cy.get("span").contains("Center").click();
32+
});
33+
cy.get("h1")
34+
.invoke("attr", "style")
35+
.should("contain", "text-align: center;");
36+
});
37+
38+
it('testing "Justify"', () => {
39+
cy.get("#tab-ui-container-1").within(() => {
40+
cy.get("span").contains("Justify").click();
41+
});
42+
cy.get("h1")
43+
.invoke("attr", "style")
44+
.should("contain", "text-align: justify;");
45+
});
46+
47+
it('testing "Align to the left"', () => {
48+
cy.get("#tab-ui-container-1").within(() => {
49+
cy.get("span").contains("Align to the right").click();
50+
});
51+
cy.get("#tab-ui-container-1").within(() => {
52+
cy.get("span").contains("Align to the left").click();
53+
});
54+
cy.get("h1").invoke("attr", "style").should("contain", "text-align: left;");
55+
});
56+
57+
it('Verify if the icon exists', () => {
58+
cy.get(".ui-button-icon-primary").should("exist").should('be.visible');
59+
});
60+
});

‎cypress/e2e/autoparagraph-plugin.cy.js

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
describe("Autoparagraph Plugin", () => {
2+
beforeEach(() => {
3+
cy.visit("http://localhost:8080/demo/modules/autoparagraph.html");
4+
});
5+
6+
describe("transforms content not contained in block level elements into paragraphs", () => {
7+
it("with bold and/or italic inbetween", () => {
8+
cy.get("#test1")
9+
.find("p")
10+
.contains("Test with bold and italic inbetween")
11+
.should("exist");
12+
});
13+
it("with a <hr> inbetween", () => {
14+
cy.get("#test2").find("p").contains("Test with a line").should("exist");
15+
cy.get("#test2").find("p").contains("inbetween").should("exist");
16+
});
17+
it("with a <br> inbetween", () => {
18+
cy.get("#test3")
19+
.find("p")
20+
.contains("Test with a space inbetween")
21+
.should("exist");
22+
});
23+
});
24+
it("doesn't do anything if the root DOM element doesn't allow insertions of <p>", () => {
25+
cy.get("h1").first().find("p").should("not.exist");
26+
});
27+
});

‎cypress/e2e/block-plugin.cy.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
describe("Block Plugin", () => {
2+
beforeEach(() => {
3+
cy.visit(
4+
"http://localhost:8080/demo/modules/block.html"
5+
);
6+
7+
});
8+
it("transforms all editables in blocks", () => {
9+
cy.get(".aloha-block").should("have.length", 56)
10+
})
11+
})

‎cypress/e2e/captioned-imagen-plugin.cy.js

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
describe("captioned-image Plugin", () => {
3+
beforeEach(() => {
4+
cy.visit("http://localhost:8080/demo/modules/captioned-image.html");
5+
cy.get("#content").click();
6+
});
7+
8+
it("Opens Aloha Editor UI when clicked", () => {
9+
cy.get(".aloha-ui.aloha-ui-toolbar.ui-draggable").should("exist");
10+
});
11+
12+
it('Verify the existence of the captioned-image', () => {
13+
cy.get(".aloha-captioned-image-block").should("exist").should('be.visible');
14+
});
15+
16+
it('Edit a captioned-image', () => {
17+
cy.get('.caption')
18+
.invoke('text', 'Edited caption.')
19+
.should('have.text', 'Edited caption.');
20+
});
21+
22+
it('verify that the captioned-image tab exists when clicking on the image', () => {
23+
cy.get('.aloha-captioned-image-block').click();
24+
cy.get('.ui-tabs-anchor')
25+
.should('exist')
26+
.should('contain', 'Captioned Image')
27+
});
28+
29+
});
30+
31+
32+
33+

0 commit comments

Comments
 (0)