Skip to content

Commit bc4f2dc

Browse files
author
github-actions
committed
Merge branch 'main' into live
2 parents e6be141 + 8c16333 commit bc4f2dc

File tree

795 files changed

+256309
-19970
lines changed

Some content is hidden

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

795 files changed

+256309
-19970
lines changed

‎.openpublishing.publish.config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"word-js-1.8",
6666
"word-js-desktop-1.1",
6767
"word-js-1.9",
68+
"word-js-desktop-1.2",
6869
"word-js-online"
6970
],
7071
"open_to_public_contributors": true,
@@ -363,6 +364,10 @@
363364
"ReferenceTOC": "docs/docs-ref-autogen/word_1_9/toc.yml",
364365
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"
365366
},
367+
{
368+
"ReferenceTOC": "docs/docs-ref-autogen/word_desktop_1_2/toc.yml",
369+
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"
370+
},
366371
{
367372
"ReferenceTOC": "docs/docs-ref-autogen/word_online/toc.yml",
368373
"ConceptualTOCUrl": "/office/dev/add-ins/toc.json"

‎docs/code-snippets/outlook-snippets.yaml

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,12 +1903,12 @@ Office.SpamReportingEventCompletedOptions:interface:
19031903
// Run additional processing operations here.
19041904
19051905
/**
1906-
* Signals that the spam-reporting event has completed processing.
1907-
* It then moves the reported message to a custom mailbox folder named "Reported Messages"
1908-
* and shows a post-processing dialog to the user.
1909-
* If an error occurs while the message is being processed, the `onErrorDeleteItem`
1910-
* property determines whether the message will be deleted.
1911-
*/
1906+
* Signals that the spam-reporting event has completed processing.
1907+
* It then moves the reported message to a custom mailbox folder named "Reported Messages"
1908+
* and shows a post-processing dialog to the user.
1909+
* If an error occurs while the message is being processed, the `onErrorDeleteItem`
1910+
* property determines whether the message will be deleted.
1911+
*/
19121912
const event = asyncResult.asyncContext;
19131913
event.completed({
19141914
moveItemTo: Office.MailboxEnums.MoveSpamItemTo.CustomFolder,
@@ -1921,6 +1921,42 @@ Office.SpamReportingEventCompletedOptions:interface:
19211921
});
19221922
});
19231923
}
1924+
Office.SpamReportingEventCompletedOptions#commandId:member:
1925+
- |-
1926+
function onSpamReport(event) {
1927+
// Run operations to process the reported message.
1928+
1929+
/**
1930+
* Signals that the spam-reporting event has completed processing.
1931+
* A task pane is opened instead of showing a post-processing dialog.
1932+
* Context data is then passed to the task pane for processing.
1933+
* To ensure that the task pane opens and receives the context data,
1934+
* the reported message mustn't be moved from the folder in which it resides.
1935+
*/
1936+
event.completed({
1937+
commandId: "msgReadOpenPaneButton",
1938+
contextData: JSON.stringify({ a: "aValue", b: "bValue" }),
1939+
moveItemTo: Office.MailboxEnums.MoveSpamItemTo.NoMove
1940+
});
1941+
}
1942+
Office.SpamReportingEventCompletedOptions#contextData:member:
1943+
- |-
1944+
function onSpamReport(event) {
1945+
// Run operations to process the reported message.
1946+
1947+
/**
1948+
* Signals that the spam-reporting event has completed processing.
1949+
* A task pane is opened instead of showing a post-processing dialog.
1950+
* Context data is then passed to the task pane for processing.
1951+
* To ensure that the task pane opens and receives the context data,
1952+
* the reported message mustn't be moved from the folder in which it resides.
1953+
*/
1954+
event.completed({
1955+
commandId: "msgReadOpenPaneButton",
1956+
contextData: JSON.stringify({ a: "aValue", b: "bValue" }),
1957+
moveItemTo: Office.MailboxEnums.MoveSpamItemTo.NoMove
1958+
});
1959+
}
19241960
Office.SpamReportingEventCompletedOptions#postProcessingAction:member:
19251961
- |-
19261962
// The following example handles a SpamReporting event to process a reported spam or phishing message.
@@ -1935,10 +1971,10 @@ Office.SpamReportingEventCompletedOptions#postProcessingAction:member:
19351971
// Run additional processing operations here.
19361972
19371973
/**
1938-
* Signals that the spam-reporting event has completed processing.
1939-
* It then moves the reported message to the Junk Email folder of the mailbox and shows a
1940-
* post-processing dialog to the user.
1941-
*/
1974+
* Signals that the spam-reporting event has completed processing.
1975+
* It then moves the reported message to the Junk Email folder of the mailbox and shows a
1976+
* post-processing dialog to the user.
1977+
*/
19421978
const event = asyncResult.asyncContext;
19431979
event.completed({
19441980
postProcessingAction: "moveToSpamFolder",

‎docs/docfx.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,18 @@
827827
"src": "docs-ref-autogen/word_1_9",
828828
"dest": "api"
829829
},
830+
{
831+
"files": ["**/toc.yml"],
832+
"group": "word-js-desktop-1.2",
833+
"src": "docs-ref-autogen/word_desktop_1_2",
834+
"dest": "api/office-js-docs-reference"
835+
},
836+
{
837+
"files": ["**/*.md", "**/*.yml"],
838+
"group": "word-js-desktop-1.2",
839+
"src": "docs-ref-autogen/word_desktop_1_2",
840+
"dest": "api"
841+
},
830842
{
831843
"files": ["**/toc.yml"],
832844
"group": "word-js-online",
@@ -1091,6 +1103,10 @@
10911103
"dest": "word-js-1.9",
10921104
"moniker_range": "word-js-1.9"
10931105
},
1106+
"word-js-desktop-1.2": {
1107+
"dest": "word-js-desktop-1.2",
1108+
"moniker_range": "word-js-desktop-1.2"
1109+
},
10941110
"word-js-online": {
10951111
"dest": "word-js-online",
10961112
"moniker_range": "word-js-online"
@@ -1209,6 +1225,7 @@
12091225
"docs-ref-autogen/word_1_4_hidden_document/**": "word",
12101226
"docs-ref-autogen/word_1_5_hidden_document/**": "word",
12111227
"docs-ref-autogen/word_desktop_1_1/**": "word",
1228+
"docs-ref-autogen/word_desktop_1_2/**": "word",
12121229
"requirement-sets/excel/**": "excel",
12131230
"requirement-sets/onenote/**": "onenote",
12141231
"requirement-sets/outlook/**": "outlook",

‎docs/docs-ref-autogen/common/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@ items:
375375
href: ../../manifest/action.md
376376
- name: AllFormFactors
377377
href: ../../manifest/allformfactors.md
378+
- name: CommandSurface
379+
href: ../../manifest/commandsurface.md
378380
- name: Control
379381
href: ../../manifest/control.md
380382
- name: Control (Button)
@@ -848,6 +850,10 @@ items:
848850
- name: WordApi online-only requirement set
849851
href: ../../requirement-sets/word/word-api-online-requirement-set.md
850852
displayName: Word
853+
- name: WordApiDesktop 1.2 requirement set
854+
href: >-
855+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
856+
displayName: Word
851857
- name: WordApiDesktop 1.1 requirement set
852858
href: >-
853859
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/common_preview/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,8 @@ items:
377377
href: ../../manifest/action.md
378378
- name: AllFormFactors
379379
href: ../../manifest/allformfactors.md
380+
- name: CommandSurface
381+
href: ../../manifest/commandsurface.md
380382
- name: Control
381383
href: ../../manifest/control.md
382384
- name: Control (Button)
@@ -850,6 +852,10 @@ items:
850852
- name: WordApi online-only requirement set
851853
href: ../../requirement-sets/word/word-api-online-requirement-set.md
852854
displayName: Word
855+
- name: WordApiDesktop 1.2 requirement set
856+
href: >-
857+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
858+
displayName: Word
853859
- name: WordApiDesktop 1.1 requirement set
854860
href: >-
855861
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/excel/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,8 @@ items:
15291529
href: ../../manifest/action.md
15301530
- name: AllFormFactors
15311531
href: ../../manifest/allformfactors.md
1532+
- name: CommandSurface
1533+
href: ../../manifest/commandsurface.md
15321534
- name: Control
15331535
href: ../../manifest/control.md
15341536
- name: Control (Button)
@@ -2002,6 +2004,10 @@ items:
20022004
- name: WordApi online-only requirement set
20032005
href: ../../requirement-sets/word/word-api-online-requirement-set.md
20042006
displayName: Word
2007+
- name: WordApiDesktop 1.2 requirement set
2008+
href: >-
2009+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
2010+
displayName: Word
20052011
- name: WordApiDesktop 1.1 requirement set
20062012
href: >-
20072013
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/excel_1_1/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ items:
517517
href: ../../manifest/action.md
518518
- name: AllFormFactors
519519
href: ../../manifest/allformfactors.md
520+
- name: CommandSurface
521+
href: ../../manifest/commandsurface.md
520522
- name: Control
521523
href: ../../manifest/control.md
522524
- name: Control (Button)
@@ -990,6 +992,10 @@ items:
990992
- name: WordApi online-only requirement set
991993
href: ../../requirement-sets/word/word-api-online-requirement-set.md
992994
displayName: Word
995+
- name: WordApiDesktop 1.2 requirement set
996+
href: >-
997+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
998+
displayName: Word
993999
- name: WordApiDesktop 1.1 requirement set
9941000
href: >-
9951001
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/excel_1_10/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,8 @@ items:
12011201
href: ../../manifest/action.md
12021202
- name: AllFormFactors
12031203
href: ../../manifest/allformfactors.md
1204+
- name: CommandSurface
1205+
href: ../../manifest/commandsurface.md
12041206
- name: Control
12051207
href: ../../manifest/control.md
12061208
- name: Control (Button)
@@ -1674,6 +1676,10 @@ items:
16741676
- name: WordApi online-only requirement set
16751677
href: ../../requirement-sets/word/word-api-online-requirement-set.md
16761678
displayName: Word
1679+
- name: WordApiDesktop 1.2 requirement set
1680+
href: >-
1681+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
1682+
displayName: Word
16771683
- name: WordApiDesktop 1.1 requirement set
16781684
href: >-
16791685
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/excel_1_11/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,8 @@ items:
12131213
href: ../../manifest/action.md
12141214
- name: AllFormFactors
12151215
href: ../../manifest/allformfactors.md
1216+
- name: CommandSurface
1217+
href: ../../manifest/commandsurface.md
12161218
- name: Control
12171219
href: ../../manifest/control.md
12181220
- name: Control (Button)
@@ -1686,6 +1688,10 @@ items:
16861688
- name: WordApi online-only requirement set
16871689
href: ../../requirement-sets/word/word-api-online-requirement-set.md
16881690
displayName: Word
1691+
- name: WordApiDesktop 1.2 requirement set
1692+
href: >-
1693+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
1694+
displayName: Word
16891695
- name: WordApiDesktop 1.1 requirement set
16901696
href: >-
16911697
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

‎docs/docs-ref-autogen/excel_1_12/toc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,6 +1259,8 @@ items:
12591259
href: ../../manifest/action.md
12601260
- name: AllFormFactors
12611261
href: ../../manifest/allformfactors.md
1262+
- name: CommandSurface
1263+
href: ../../manifest/commandsurface.md
12621264
- name: Control
12631265
href: ../../manifest/control.md
12641266
- name: Control (Button)
@@ -1732,6 +1734,10 @@ items:
17321734
- name: WordApi online-only requirement set
17331735
href: ../../requirement-sets/word/word-api-online-requirement-set.md
17341736
displayName: Word
1737+
- name: WordApiDesktop 1.2 requirement set
1738+
href: >-
1739+
../../requirement-sets/word/word-api-desktop-1.2-requirement-set.md
1740+
displayName: Word
17351741
- name: WordApiDesktop 1.1 requirement set
17361742
href: >-
17371743
../../requirement-sets/word/word-api-desktop-1.1-requirement-set.md

0 commit comments

Comments
 (0)