Skip to content

Commit 8b4f6c6

Browse files
authored
Merge pull request #53 from tinymce/feature/INT-3115
INT-3115: Prepare to handover to editor team
2 parents 9dde93c + f59b195 commit 8b4f6c6

File tree

10 files changed

+496
-440
lines changed

10 files changed

+496
-440
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @tinymce/integrations-team
1+
* @tinymce/tinymce-reviewers

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"author": "Tiny Technologies",
2424
"license": "MIT",
2525
"devDependencies": {
26-
"@ephox/agar": "^7.3.1",
26+
"@ephox/agar": "^7.4.1",
2727
"@ephox/bedrock-client": "^13.0.0",
2828
"@ephox/bedrock-server": "^13.3.0",
29-
"@ephox/katamari": "^9.1.3",
30-
"@ephox/sugar": "^9.1.3",
29+
"@ephox/katamari": "^9.1.5",
30+
"@ephox/sugar": "^9.2.1",
3131
"@ephox/swag": "^4.6.0",
3232
"@tinymce/beehive-flow": "^0.19.0",
3333
"@tinymce/eslint-plugin": "^2.2.1",
@@ -41,11 +41,11 @@
4141
"eslint-plugin-prefer-arrow": "^1.2.3",
4242
"esm": "^3.2.25",
4343
"express": "^4.18.2",
44-
"rollup": "^2.79.1",
44+
"rollup": "^3.20.1",
4545
"tinymce": "^6.3.1",
4646
"ts-loader": "^9.4.2",
4747
"ts-node": "^10.9.1",
48-
"typescript": "~4.9.4",
48+
"typescript": "~5.0.2",
4949
"webpack": "^5.75.0"
5050
},
5151
"dependencies": {},

rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const swag = require('@ephox/swag');
22

3-
export default {
3+
module.exports = {
44
input: 'lib/main/ts/Main.js',
55
output: {
66
file: 'dist/tinymce-webcomponent.js',

src/demo/html/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<body>
1010
<h1>TinyMCE Web Component Simple Demo Page</h1>
11-
<tinymce-editor></tinymce-editor>
11+
<tinymce-editor promotion="false"></tinymce-editor>
1212
<script src="../../../node_modules/tinymce/tinymce.js"></script>
1313
<script src="../../../dist/tinymce-webcomponent.js"></script>
1414
</body>

src/demo/html/common-attributes.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ <h1>TinyMCE Web Component Common Attributes Demo Page</h1>
4545
toolbar="undo redo | formatselect | bold italic backcolor |
4646
alignleft aligncenter alignright alignjustify |
4747
bullist numlist outdent indent | removeformat | help"
48-
content_css="//www.tiny.cloud/css/codepen.min.css" >
48+
content_css="//www.tiny.cloud/css/codepen.min.css"
49+
promotion="false" >
4950
&lt;p&gt;This recreates the same settings as the &lt;a href=&quot;https://www.tiny.cloud/docs/demo/basic-example/&quot;&gt;basic example&lt;/a&gt;&lt;p&gt;
5051
</tinymce-editor>
5152
<script src="../../../node_modules/tinymce/tinymce.js"></script>

src/demo/html/content.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<body>
1010
<h1>TinyMCE Web Component Content Demo Page</h1>
11-
<tinymce-editor>
11+
<tinymce-editor promotion="false">
1212
&lt;p style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;color: #bdc3c7;&quot;&gt;&amp;rarr; This is a full-featured editor demo. Please explore! &amp;larr;&lt;/span&gt;&lt;/p&gt;
1313
&lt;p style=&quot;text-align: center;&quot;&gt;&amp;nbsp;&lt;/p&gt;
1414
&lt;h2 style=&quot;text-align: center;&quot;&gt;TinyMCE is the world's most customizable, and flexible, rich text editor.&lt;/h2&gt;

src/demo/html/demo.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ <h3>Attribute config</h3>
1717
setup="editors.setupFn"
1818
on-change="editors.changeFn"
1919
on-init="editors.initFn"
20+
promotion="false"
2021
></tinymce-editor>
2122
<h3>Default with readonly</h3>
22-
<tinymce-editor readonly>
23+
<tinymce-editor promotion="false" readonly>
2324
&lt;p&gt;The quick &lt;b&gt;brown&lt;/b&gt; fox.&lt;/p&gt;
2425
&lt;p&gt;Jumps over the &lt;i&gt;lazy&lt;/i&gt; dog.&lt;/p&gt;
2526
&lt;p&gt;&lt;img src=&quot;http://www.google.com/google.jpg&quot; onload=&quot;javascript: alert('hello');&quot;/&gt;&lt;/p&gt;

src/demo/html/events.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ <h1>TinyMCE Web Component Events Demo Page</h1>
3131
on-Init="editors.initFn"
3232
on-Change="editors.changeFn"
3333
on-Click="editors.clickFn"
34+
promotion="false"
3435
></tinymce-editor>
3536
<script src="../../../node_modules/tinymce/tinymce.js"></script>
3637
<script src="../../../dist/tinymce-webcomponent.js"></script>

src/main/ts/component/Editor.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ const configAttributes: Record<string, (v: string) => unknown> = {
7171
images_upload_credentials: parseBooleanOrString, // boolean
7272
images_reuse_filename: parseBooleanOrString, // boolean
7373
icons: parseString, // name of icon pack eg. 'material'
74-
icons_url: parseString // url to icon pack js
74+
icons_url: parseString, // url to icon pack js
75+
promotion: parseBooleanOrString, // boolean
7576
};
7677

7778
const configRenames: Record<string, string> = {

0 commit comments

Comments
 (0)