Skip to content

Commit eb108d2

Browse files
authored
DOC-2324: Migrate 6 antora changes to new branch in main repo
DOC-2324: Migrate 6 antora changes to new branch in main repo
2 parents 86419c7 + e97718d commit eb108d2

23 files changed

+189
-236
lines changed

-scripts/api-reference.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ unzip -o "$API_TMPDIR/tinymce-api-reference.zip"
2020
rm -rf modules/ROOT/pages/apis/
2121

2222
# removed old static api html pages (clear cache), it can corrupt the build
23-
rm -rf build/site/_/tinymce/6.0/apis/
23+
rm -rf build/site/tinymce/6/apis/
2424

2525
# move newly generated adoc pages, antora will then generate new static html pages
2626
mv _data/antora modules/ROOT/pages/apis

.github/pull_request_template.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
Ticket: DOC-<num>, <ticket-title-here>.
1+
Ticket: DOC-<num>
2+
3+
Site: [DOC-<num> site](http://docs-<hotfix/feature>-6-doc-<num>.staging.tiny.cloud/docs/tinymce/6/)
24

35
Changes:
46
* <placeholder-text>
57

68
Pre-checks:
79
- [ ] Branch prefixed with `feature/6/` or `hotfix/6/`
8-
- [ ] Changelog entry added
9-
- [ ] `modules/ROOT/nav.adoc` has been updated (if applicable)
10-
- [ ] Files has been included where required (if applicable)
11-
- [ ] Files removed have been deleted, not just excluded from the build (if applicable)
12-
- [ ] (New product features only) Release Note added
10+
- [ ] `modules/ROOT/nav.adoc` has been updated `(if applicable)`
11+
- [ ] Files has been included where required `(if applicable)`
12+
- [ ] Files removed have been deleted, not just excluded from the build `(if applicable)`
13+
- [ ] Files added for `New product features`, and included a `release note` entry.
1314

1415
Review:
15-
- [ ] Documentation Team Lead has reviewed
16+
- [ ] Documentation Team Lead has reviewed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ "feature/**", "hotfix/**", "staging/**", "release/**" ]
5+
branches: [ "feature/6/**", "hotfix/6/**", "6" ]
66
pull_request:
7-
branches: [ "staging/**", "release/**" ]
7+
branches: [ "6" ]
88
## Add schedule if needed
99
# schedule:
1010
# - cron: "17 23 * * 5"

.github/workflows/feature_6_docs.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/release_6_docs.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/staging_6_docs.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

antora-playbook-prod.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

antora-playbook-staging.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
site:
2-
title: TinyMCE Documentation (Dev)
2+
title: TinyMCE Documentation
33
url: https://www.tiny.cloud/docs
44
start_page: tinymce::index.adoc
55
content:
66
sources:
77
- url: ./
8-
branches: HEAD
8+
branches: [ HEAD ]
99
start_path: ./
10+
- url: https://github.com/MitchC1999/tinymce-docs.git
11+
branches: [ 5, 7 ]
1012
urls:
1113
html_extension_style: indexify
14+
latest_version_segment: latest
1215
ui:
1316
bundle:
1417
url: https://tiny-cloud-docs-antora-themes-staging.s3.amazonaws.com/ui-bundle.zip
1518
asciidoc:
16-
attributes:
17-
tinymce_live_demo_url: https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinymce/6-dev/tinymce.min.js
1819
extensions:
1920
- '@tinymce/antora-extension-livedemos'
21+
runtime:
22+
fetch: true

modules/ROOT/pages/apis/tinymce.dom.domutils.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ available. If it's not, it will fall back to the custom TinyMCE implementation.|
4848
|xref:#encode[encode()]|Entity encodes a string. This method encodes the most common entities, such as `<`, `>`, `"` and `&`.|`xref:apis/tinymce.dom.domutils.adoc[DOMUtils]`
4949
|xref:#findCommonAncestor[findCommonAncestor()]|Find the common ancestor of two elements. This is a shorter method than using the DOM Range logic.|`xref:apis/tinymce.dom.domutils.adoc[DOMUtils]`
5050
|xref:#fire[fire()]|Fires the specified event name and optional object on the specified target.
51+
52+
5153
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__|`xref:apis/tinymce.dom.domutils.adoc[DOMUtils]`
5254
|xref:#get[get()]|Returns the specified element by ID or the input element if it isn't a string.|`xref:apis/tinymce.dom.domutils.adoc[DOMUtils]`
5355
|xref:#getAttrib[getAttrib()]|Returns the specified attribute by name.|`xref:apis/tinymce.dom.domutils.adoc[DOMUtils]`
@@ -396,6 +398,8 @@ Find the common ancestor of two elements. This is a shorter method than using th
396398
fire(target: Node | Document | Window, name: String, evt: Object): Event
397399
----
398400
Fires the specified event name and optional object on the specified target.
401+
402+
399403
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__
400404

401405
==== Parameters

0 commit comments

Comments
 (0)