Skip to content

Commit 06da318

Browse files
authored
DOC-2324: Configure 6 branch to build aggregated site for development
DOC-2324: Configure 6 branch to build aggregated site for development
2 parents 9f93cc1 + c856a5d commit 06da318

21 files changed

+178
-227
lines changed

.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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
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
1214
ui:
@@ -15,5 +17,5 @@ ui:
1517
asciidoc:
1618
attributes:
1719
tinymce_live_demo_url: https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinymce/6-dev/tinymce.min.js
18-
extensions:
19-
- '@tinymce/antora-extension-livedemos'
20+
runtime:
21+
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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ This class wraps the browsers native event logic with more convenient methods.
1919
listeners to child nodes within that target.|`xref:apis/tinymce.dom.eventutils.adoc[EventUtils]`
2020
|xref:#dispatch[dispatch()]|Dispatches the specified event on the specified target.|`xref:apis/tinymce.dom.eventutils.adoc[EventUtils]`
2121
|xref:#fire[fire()]|Fires the specified event on the specified target.
22+
23+
2224
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__|`xref:apis/tinymce.dom.eventutils.adoc[EventUtils]`
2325
|xref:#unbind[unbind()]|Unbinds the specified event by name, name and callback or all events on the target.|`xref:apis/tinymce.dom.eventutils.adoc[EventUtils]`
2426
|===
@@ -93,6 +95,8 @@ Dispatches the specified event on the specified target.
9395
fire(target: Object, name: String, args: Object): EventUtils
9496
----
9597
Fires the specified event on the specified target.
98+
99+
96100
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__
97101

98102
==== Parameters

modules/ROOT/pages/apis/tinymce.editor.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ link:https://www.tiny.cloud/docs/tinymce/6/events/[event reference] for more det
8888
the tinymce command identifiers documentation.|`xref:apis/tinymce.editor.adoc[Editor]`
8989
|xref:#fire[fire()]|Fires the specified event by name. Consult the
9090
link:https://www.tiny.cloud/docs/tinymce/6/events/[event reference] for more details on each event.
91+
92+
9193
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__|`xref:apis/tinymce.util.observable.adoc[Observable]`
9294
|xref:#focus[focus()]|Focuses/activates the editor. This will set this editor as the activeEditor in the tinymce collection
9395
it will also place DOM focus inside the editor.|`xref:apis/tinymce.editor.adoc[Editor]`
@@ -102,6 +104,8 @@ holds the iframe or the editable element.|`xref:apis/tinymce.editor.adoc[Editor]
102104
|xref:#getDoc[getDoc()]|Returns the iframes document object.|`xref:apis/tinymce.editor.adoc[Editor]`
103105
|xref:#getElement[getElement()]|Returns the target element/textarea that got replaced with a TinyMCE editor instance.|`xref:apis/tinymce.editor.adoc[Editor]`
104106
|xref:#getParam[getParam()]|Returns a configuration parameter by name.
107+
108+
105109
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use the `editor.options.get` API instead.__|`xref:apis/tinymce.editor.adoc[Editor]`
106110
|xref:#getWin[getWin()]|Returns the iframes window object.|`xref:apis/tinymce.editor.adoc[Editor]`
107111
|xref:#hasEditableRoot[hasEditableRoot()]|Returns the current editable state of the editor's root element.|`xref:apis/tinymce.editor.adoc[Editor]`
@@ -138,6 +142,8 @@ This method will move the HTML contents from the editor into that textarea or di
138142
so all events etc that method has will get dispatched as well.|`xref:apis/tinymce.editor.adoc[Editor]`
139143
|xref:#setContent[setContent()]|Sets the specified content to the editor instance, this will cleanup the content before it gets set using
140144
the different cleanup rules options.
145+
146+
141147
__Note: The content return value was deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0.__|`xref:apis/tinymce.editor.adoc[Editor]`
142148
|xref:#setDirty[setDirty()]|Explicitly sets the dirty state. This will fire the dirty event if the editor dirty state is changed from false to true
143149
by invoking this method.|`xref:apis/tinymce.editor.adoc[Editor]`
@@ -386,6 +392,8 @@ fire(name: String, args: Object?, bubble: Boolean?): Object
386392
----
387393
Fires the specified event by name. Consult the
388394
link:https://www.tiny.cloud/docs/tinymce/6/events/[event reference] for more details on each event.
395+
396+
389397
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use `dispatch` instead.__
390398

391399
==== Examples
@@ -533,6 +541,8 @@ Returns the target element/textarea that got replaced with a TinyMCE editor inst
533541
getParam(name: String, defaultVal: String, type: String): String
534542
----
535543
Returns a configuration parameter by name.
544+
545+
536546
__Deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0. Use the `editor.options.get` API instead.__
537547

538548
==== Examples
@@ -943,6 +953,8 @@ setContent(content: String, args: Object): String
943953
----
944954
Sets the specified content to the editor instance, this will cleanup the content before it gets set using
945955
the different cleanup rules options.
956+
957+
946958
__Note: The content return value was deprecated in TinyMCE 6.0 and has been marked for removal in TinyMCE 7.0.__
947959

948960
==== Examples

0 commit comments

Comments
 (0)