Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/develop' into feature/ch…
Browse files Browse the repository at this point in the history
…ange_font_family_and_size

# Conflicts:
#	CHANGELOG.md
#	site/pages/Docs/Plugin and Macros/Macros/Samples/index.md
  • Loading branch information
LinneyS committed Dec 16, 2024
2 parents 2efd95a + 39e7ff0 commit 2a1927a
Show file tree
Hide file tree
Showing 802 changed files with 19,776 additions and 4,356 deletions.
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
# Change Log

- docs api: updated the WOPI section
- docs api: added the information about calling editor methods in the frameworks
- docs api: added the Checking PDF forms page
- docspace backend: added the Removed user page
- macros: added remove extra spaces in document macro sample
- macros: added the Sum of highlighted cells macro sample
- macros: added change font family and size in presentations macro sample

## 6.3.0
- docspace oauth api: added a new section
- docspace api backend: v3.0
- docspace api-system: auto creation
- docspace api-system: v3.0
- docs api: restructured Conversion API
- docs api: added the mobileView actions to the WOPI discovery
- docs api: restructured the Get Started section
- docs api: the editorConfig.customization.mobileForceView parameter is deprecated, please use the editorConfig.customization.mobile parameter instead
- docbuilder: redesign sections
- docbuilder: updated builder framework samples
- macros: added add comments and change cell colors in spreadsheet macro sample

## 6.2.0
- docspace js sdk: storybook link
Expand All @@ -23,8 +42,6 @@
- method redesign
- 404 page
- legacy version link
- macros: added add comments and change cell colors in spreadsheet macro sample
- macros: added change font family and size in presentations macro sample

## 6.1.0
- docspace js sdk: react component
Expand Down
3 changes: 3 additions & 0 deletions mise.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tools]
node = "21.7.3"
pnpm = "9.13.2"
4 changes: 4 additions & 0 deletions .mise.toml → mise.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[settings]
lockfile = true
experimental = true

[tools]
node = "prefix:21"
pnpm = "prefix:9"
Expand Down
25 changes: 22 additions & 3 deletions packages/console/lib/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,48 @@ export class Console extends NodeConsole {
this.error = () => {}
}

unmute(): void {
this.log = this.#log.bind(this)
this.warn = this.#warn.bind(this)
this.error = this.#error.bind(this)
}

restore(c: Console): void {
this.log = c.log.bind(c)
this.warn = c.warn.bind(c)
this.error = c.error.bind(c)
}

log(...data: Parameters<typeof NodeConsole["prototype"]["log"]>): void {
this.#log(...data)
}

warn(...data: Parameters<typeof NodeConsole["prototype"]["warn"]>): void {
this.#warn(...data)
}

error(...data: Parameters<typeof NodeConsole["prototype"]["error"]>): void {
this.#error(...data)
}

#log(...data: Parameters<typeof NodeConsole["prototype"]["log"]>): void {
const p = `${this.#prefix()} info:`
super.log(p, ...data)
}

warn(...data: Parameters<typeof NodeConsole["prototype"]["warn"]>): void {
#warn(...data: Parameters<typeof NodeConsole["prototype"]["warn"]>): void {
const p = yellow(`${this.#prefix()} warn:`)
super.warn(p, ...data)
}

error(...data: Parameters<typeof NodeConsole["prototype"]["error"]>): void {
#error(...data: Parameters<typeof NodeConsole["prototype"]["error"]>): void {
const p = red(`${this.#prefix()} error:`)
super.error(p, ...data)
}

#prefix(): string {
const d = new Date().toISOString()
return `${d} ${this.#name}`
const n = this.#name.replace("@onlyoffice/", "")
return `${d} ${n}`
}
}
13 changes: 13 additions & 0 deletions packages/docspace-plugin-sdk-resource/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import {type Config} from "@onlyoffice/typedoc-resource"

export const config: Config = [
{
name: "main",
source: {
owner: "onlyoffice",
repo: "docspace-plugin-sdk-declarations",
reference: "develop",
path: "docspace-plugin-sdk.json",
},
},
]
17 changes: 17 additions & 0 deletions packages/docspace-plugin-sdk-resource/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "@onlyoffice/docspace-plugin-sdk-resource",
"type": "module",
"private": true,
"main": "dist/main.ts",
"scripts": {
"clean": "rimraf dist node_modules",
"build": "typedoc-resource typedoc"
},
"dependencies": {
"@onlyoffice/library-declaration": "workspace:^"
},
"devDependencies": {
"@onlyoffice/typedoc-resource": "workspace:^",
"rimraf": "6.0.1"
}
}
3 changes: 3 additions & 0 deletions packages/docspace-plugin-sdk-resource/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../tsconfig.base.json"
}
18 changes: 14 additions & 4 deletions packages/docspace-resource/lib/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@ import {type Config, build, download} from "@onlyoffice/openapi-resource"
import pack from "../package.json" with {type: "json"}

const config: Config[] = [
{
name: "apisystem",
variant: "master",
source: {
owner: "onlyoffice",
repo: "docspace-declarations",
reference: "release/v3.0.0",
path: "asc.apisystem.swagger.json",
},
},
{
name: "data",
variant: "master",
source: {
owner: "onlyoffice",
repo: "docspace-declarations",
reference: "dist",
reference: "release/v3.0.0",
path: "asc.data.backup.swagger.json",
},
},
Expand All @@ -23,7 +33,7 @@ const config: Config[] = [
source: {
owner: "onlyoffice",
repo: "docspace-declarations",
reference: "dist",
reference: "release/v3.0.0",
path: "asc.files.swagger.json",
},
},
Expand All @@ -33,7 +43,7 @@ const config: Config[] = [
source: {
owner: "onlyoffice",
repo: "docspace-declarations",
reference: "dist",
reference: "release/v3.0.0",
path: "asc.people.swagger.json",
},
},
Expand All @@ -43,7 +53,7 @@ const config: Config[] = [
source: {
owner: "onlyoffice",
repo: "docspace-declarations",
reference: "dist",
reference: "release/v3.0.0",
path: "asc.web.api.swagger.json",
},
},
Expand Down
13 changes: 13 additions & 0 deletions packages/docspace-sdk-js-resource/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import {type Config} from "@onlyoffice/typedoc-resource"

export const config: Config = [
{
name: "main",
source: {
owner: "onlyoffice",
repo: "docspace-sdk-js-declarations",
reference: "develop",
path: "docspace-sdk-js.json",
},
},
]
17 changes: 17 additions & 0 deletions packages/docspace-sdk-js-resource/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "@onlyoffice/docspace-sdk-js-resource",
"type": "module",
"private": true,
"main": "dist/main.ts",
"scripts": {
"clean": "rimraf dist node_modules",
"build": "typedoc-resource typedoc"
},
"dependencies": {
"@onlyoffice/library-declaration": "workspace:^"
},
"devDependencies": {
"@onlyoffice/typedoc-resource": "workspace:^",
"rimraf": "6.0.1"
}
}
3 changes: 3 additions & 0 deletions packages/docspace-sdk-js-resource/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../tsconfig.base.json"
}
5 changes: 5 additions & 0 deletions packages/document-builder-html-element/lib/element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ export class DocumentBuilder extends DocumentEditor {
return this.#connector
}

constructor() {
super()
this.eventList.add("documenteditordocumentready")
}

connectedCallback(): void {
super.connectedCallback()
this.#listen()
Expand Down
Loading

0 comments on commit 2a1927a

Please sign in to comment.