Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docgen-scheduler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: ['23_2', '24_1', '24_2', '25_1', '25_2']
branch: ['24_1', '24_2', '25_1', '25_2', '26_1']

steps:
- name: Get sources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Specifies a display mode for [item labels](/api-reference/10%20UI%20Components/d
<li><a href="/Documentation/ApiReference/UI_Components/dxForm/Item_Types/SimpleItem/label/#alignment">items[].label.alignment</a></li>
</ul>
</td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.html, /Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.js, /Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.css"></div></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.html, /Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.js, /Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.css"></div></td>
</tr>'
}

Expand Down
8 changes: 4 additions & 4 deletions api-reference/10 UI Components/dxGallery/dxGallery.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ The Gallery is a UI component that displays a collection of images in a carousel

##### widgettree
dataSource: [
"https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person1.png",
"https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person2.png",
"https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person3.png",
"https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person4.png"
"https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person1.png",
"https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person2.png",
"https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person3.png",
"https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person4.png"
],
height: 400

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can perform the following tasks after getting a format, module, or Parchment
You can change the markup tag associated with the format and allowed format values, as shown in the code example after this list.

- **<a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/extends" target="_blank">Extend</a> the format or module**
You can extend HTML Editor's <a href="https://github.com/DevExpress/DevExtreme/tree/25_2/packages/devextreme/js/__internal/ui/html_editor/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/DevExtreme/tree/25_2/packages/devextreme/js/__internal/ui/html_editor/modules" target="_blank">modules</a>, and also the DevExtreme Quill's <a href="https://github.com/DevExpress/devextreme-quill/tree/master/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/devextreme-quill/tree/master/modules" target="_blank">modules</a>. See the [Extend Built-In Formats and Modules](/concepts/05%20UI%20Components/HtmlEditor/10%20Formats/60%20Customize%20Built-In%20Formats%20and%20Modules/20%20Extend.md '/Documentation/Guide/UI_Components/HtmlEditor/Formats/#Customize_Built-In_Formats_and_Modules/Extend') topic for the code example.
You can extend HTML Editor's <a href="https://github.com/DevExpress/DevExtreme/tree/26_1/packages/devextreme/js/__internal/ui/html_editor/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/DevExtreme/tree/26_1/packages/devextreme/js/__internal/ui/html_editor/modules" target="_blank">modules</a>, and also the DevExtreme Quill's <a href="https://github.com/DevExpress/devextreme-quill/tree/master/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/devextreme-quill/tree/master/modules" target="_blank">modules</a>. See the [Extend Built-In Formats and Modules](/concepts/05%20UI%20Components/HtmlEditor/10%20Formats/60%20Customize%20Built-In%20Formats%20and%20Modules/20%20Extend.md '/Documentation/Guide/UI_Components/HtmlEditor/Formats/#Customize_Built-In_Formats_and_Modules/Extend') topic for the code example.

- **Create a custom format based on the Parchment**
Refer to the <a href="https://github.com/quilljs/parchment/blob/master/README.md" target="_blank">Parchment documentation</a> for more information.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ A module's instance.
The name of a [registered](/api-reference/10%20UI%20Components/dxHtmlEditor/3%20Methods/register(components).md '/Documentation/ApiReference/UI_Components/dxHtmlEditor/Methods/#registercomponents') module.

---
You can get DevExtreme <a href="https://github.com/DevExpress/devextreme-quill/tree/master/modules" target="_blank">Quill modules</a>, DevExtreme <a href="https://github.com/DevExpress/DevExtreme/tree/25_2/packages/devextreme/js/__internal/ui/html_editor/modules" target="_blank">UI modules</a>, or custom modules.
You can get DevExtreme <a href="https://github.com/DevExpress/devextreme-quill/tree/master/modules" target="_blank">Quill modules</a>, DevExtreme <a href="https://github.com/DevExpress/DevExtreme/tree/26_1/packages/devextreme/js/__internal/ui/html_editor/modules" target="_blank">UI modules</a>, or custom modules.

If you implement the [customizeModules](/api-reference/10%20UI%20Components/dxHtmlEditor/1%20Configuration/customizeModules.md '/Documentation/ApiReference/UI_Components/dxHtmlEditor/Configuration/#customizeModules') function, make sure that it does not disable the modules that you want to get.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ An embedded format's [value](/concepts/05%20UI%20Components/HtmlEditor/10%20Form
<!--JavaScript-->
// Adds an image at the beginning of the content
$("#htmlEditorContainer").dxHtmlEditor("instance").insertEmbed(0, "extendedImage", {
src: "https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person1.png",
alt: "Photo",
width: "100px"
});
Expand All @@ -38,7 +38,7 @@ An embedded format's [value](/concepts/05%20UI%20Components/HtmlEditor/10%20Form
// @ViewChild(DxHtmlEditorComponent) htmlEditor: DxHtmlEditorComponent;
insertImageAtTheBeginning() {
this.htmlEditor.instance.insertEmbed(0, "extendedImage", {
src: "https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person1.png",
alt: "Photo",
width: "100px"
});
Expand Down Expand Up @@ -80,7 +80,7 @@ An embedded format's [value](/concepts/05%20UI%20Components/HtmlEditor/10%20Form
insertImageAtTheBeginning() {
// Makes the first five characters bold and underlined
this.htmlEditor.insertEmbed(0, "extendedImage", {
src: "https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person1.png",
alt: "Photo",
width: "100px"
});
Expand Down Expand Up @@ -108,7 +108,7 @@ An embedded format's [value](/concepts/05%20UI%20Components/HtmlEditor/10%20Form
const insertImageAtTheBeginning = () => {
// Makes the first five characters bold and underlined
htmlEditor.current.instance().insertEmbed(0, "extendedImage", {
src: "https://js.devexpress.com/Content/images/doc/25_2/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/26_1/PhoneJS/person1.png",
alt: "Photo",
width: "100px"
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ This property can have one of the following values:
</tr>
<tr>
<td><i>"circle"</i></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/25_2/UIWidgets/LoadIndicator/animationCircle/index.html, /Content/Applications/25_2/UIWidgets/LoadIndicator/animationCircle/index.js"></div></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/26_1/UIWidgets/LoadIndicator/animationCircle/index.html, /Content/Applications/26_1/UIWidgets/LoadIndicator/animationCircle/index.js"></div></td>
</tr>
<tr>
<td><i>"sparkle"</i></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/25_2/UIWidgets/LoadIndicator/animationSparkle/index.html, /Content/Applications/25_2/UIWidgets/LoadIndicator/animationSparkle/index.js"></div></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/26_1/UIWidgets/LoadIndicator/animationSparkle/index.html, /Content/Applications/26_1/UIWidgets/LoadIndicator/animationSparkle/index.js"></div></td>
</tr>
</table>
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Specifies the [label](/api-reference/10%20UI%20Components/dxTextEditor/1%20Confi
<tr>
<td><i>"outside"</i></td>
<td>The label is outside.</td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.html, /Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.js, /Content/Applications/25_2/UIWidgets/TextEditor/labelModeOutside/index.css"></div></td>
<td><div class="simulator-desktop-container" data-view="/Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.html, /Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.js, /Content/Applications/26_1/UIWidgets/TextEditor/labelModeOutside/index.css"></div></td>
</tr>'
}

[note]

If autofill is enabled in the browser, we do not recommend that you use "*floating*" mode. The autofill values will overlap the label when it is displayed as a placeholder. Use "*static*" mode instead.

[/note]
[/note]
4 changes: 2 additions & 2 deletions api-reference/_hidden/GridBaseColumn/filterType.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ This property changes when the user clicks the **Select All** checkbox in the [h
<th>filterType / filterValues</th>
</tr>
<tr>
<td><img src="Content/images/doc/25_2/DataGrid/dg-selectall-unchecked.png"></td>
<td><img src="Content/images/doc/26_1/DataGrid/dg-selectall-unchecked.png"></td>
<td><code>filterType: "include"</code><br><code>filterValues: null</code></td>
</tr>
<tr>
<td><img src="Content/images/doc/25_2/DataGrid/dg-selectall-checked.png"></td>
<td><img src="Content/images/doc/26_1/DataGrid/dg-selectall-checked.png"></td>
<td><code>filterType: "exclude"</code><br><code>filterValues: null</code></td>
</tr>
</table>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<div style="text-align:center; margin: 10px">
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#orientation" target="_blank"><b>orientation</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#orientation" target="_blank"><b>orientation</b></a>:
<div class="editor select-box" id="orientation">
</div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#columnCount" target="_blank"><b>columnCount</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#columnCount" target="_blank"><b>columnCount</b></a>:
<div class="editor number-box" id="columnCount">
</div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#rowCount" target="_blank"><b>rowCount</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#rowCount" target="_blank"><b>rowCount</b></a>:
<div class="editor number-box" id="rowCount">
</div><br />
<div style="height:10px"></div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#columnItemSpacing" target="_blank"><b>columnItemSpacing</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#columnItemSpacing" target="_blank"><b>columnItemSpacing</b></a>:
<div class="editor number-box" id="columnItemSpacing">
</div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#rowItemSpacing" target="_blank"><b>rowItemSpacing</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#rowItemSpacing" target="_blank"><b>rowItemSpacing</b></a>:
<div class="editor number-box" id="rowItemSpacing">
</div>
<div id="chart"></div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div style="text-align:center; margin: 10px">
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#position" target="_blank"><b>position</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#position" target="_blank"><b>position</b></a>:
<div class="editor select-box" id="position">
</div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#horizontalAlignment" target="_blank"><b>horizontalAlignment</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#horizontalAlignment" target="_blank"><b>horizontalAlignment</b></a>:
<div class="editor select-box" id="horizontalAlignment">
</div>
<div class="option-block">
<a href="/Documentation/25_2/ApiReference/UI_Components/dxChart/Configuration/legend/#verticalAlignment" target="_blank"><b>verticalAlignment</b></a>:
<a href="/Documentation/26_1/ApiReference/UI_Components/dxChart/Configuration/legend/#verticalAlignment" target="_blank"><b>verticalAlignment</b></a>:
<div class="editor select-box" id="verticalAlignment">
</div>
<div id="chart"></div>
Expand Down
2 changes: 1 addition & 1 deletion applications/GettingStartedWith/Chat/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const firstUser = {
const secondUser = {
id: "2",
name: "Feedback Bot",
avatarUrl: "/Content/images/doc/25_2/Chat/bot.png"
avatarUrl: "/Content/images/doc/26_1/Chat/bot.png"
};

const initialMessages = [{
Expand Down
2 changes: 1 addition & 1 deletion applications/GettingStartedWith/HtmlEditor/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div id="html-editor">
<h2>
<img src="/Content/images/doc/25_2/htmlEditor/HtmlEditor.png" alt="HTML Editor">
<img src="/Content/images/doc/26_1/htmlEditor/HtmlEditor.png" alt="HTML Editor">
Rich Text Editor (HTML Editor)
</h2>
<br>
Expand Down
2 changes: 1 addition & 1 deletion applications/GettingStartedWith/Popup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $(function () {
contentTemplate: () => {
const content = $("<div />");
content.append(
$("<img />").attr("src", "/Content/images/doc/25_2/Common/dx-logo.png"),
$("<img />").attr("src", "/Content/images/doc/26_1/Common/dx-logo.png"),
$(popupText)
);
return content;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The Accordion UI component contains several panels displayed one under another.

This tutorial shows how to add an Accordion to the page and configure the component's core settings. As a result, you will create the following UI component:

<div class="simulator-desktop-container" data-view="/Content/Applications/25_2/GettingStartedWith/Accordion/index.html, /Content/Applications/25_2/GettingStartedWith/Accordion/index.js, /Content/Applications/25_2/GettingStartedWith/Accordion/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/26_1/GettingStartedWith/Accordion/index.html, /Content/Applications/26_1/GettingStartedWith/Accordion/index.js, /Content/Applications/26_1/GettingStartedWith/Accordion/index.css"></div>

Each section in this tutorial describes a single configuration step. You can also find the full source code in the GitHub repository.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<head>
<!-- ... -->
<script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_25_2/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_25_2/js/dx.all.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_26_1/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_26_1/js/dx.all.js"></script>
<script type="text/javascript" src="index.js"></script>
</head>
<body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AutoComplete is a text box that displays suggestions while a user types.

This tutorial shows how to add an AutoComplete component to the page and configure the component's core settings. As a result, you will create the following UI component:

<div class="simulator-desktop-container" data-view="/Content/Applications/25_2/GettingStartedWith/Autocomplete/index.html, /Content/Applications/25_2/GettingStartedWith/Autocomplete/index.js, /Content/Applications/25_2/GettingStartedWith/Autocomplete/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/26_1/GettingStartedWith/Autocomplete/index.html, /Content/Applications/26_1/GettingStartedWith/Autocomplete/index.js, /Content/Applications/26_1/GettingStartedWith/Autocomplete/index.css"></div>

Each section in this tutorial describes a single configuration step. You can also find the full source code in the GitHub repository.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ The code example below specifies the [dataSource](/api-reference/10%20UI%20Compo
<head>
<!-- ... -->
<script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_25_2/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_25_2/js/dx.all.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_26_1/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_26_1/js/dx.all.js"></script>
<script type="text/javascript" src="index.js"></script>
<script type="text/javascript" src="data.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions concepts/05 UI Components/Box/10 Arrange and Align Items.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ Items can be arranged in a row or in a column depending on the value of the [dir
"height": 300
},
"images": [
{ "image": "/Content/images/doc/25_2/UiWidgets/Box/Box_direction_row.png", "text": "<b>direction</b>: <i>'row'</i>" },
{ "image": "/Content/images/doc/25_2/UiWidgets/Box/Box_direction_column.png", "text": "<b>direction</b>: <i>'col'</i>" }
{ "image": "/Content/images/doc/26_1/UiWidgets/Box/Box_direction_row.png", "text": "<b>direction</b>: <i>'row'</i>" },
{ "image": "/Content/images/doc/26_1/UiWidgets/Box/Box_direction_column.png", "text": "<b>direction</b>: <i>'col'</i>" }
]
}
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This tutorial shows how to add a Button to a page, apply styling, and configure its core features. As a result, you will create the following UI component:

<div class="simulator-desktop-container" data-view="/Content/Applications/25_2/GettingStartedWith/Button/index.html, /Content/Applications/25_2/GettingStartedWith/Button/index.js, /Content/Applications/25_2/GettingStartedWith/Button/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/26_1/GettingStartedWith/Button/index.html, /Content/Applications/26_1/GettingStartedWith/Button/index.js, /Content/Applications/26_1/GettingStartedWith/Button/index.css"></div>

Refer to the following sections for information on each configuration step. The full code is available in the GitHub repository.

Expand Down
Loading
Loading