Skip to content

Commit

Permalink
Update to 24_2
Browse files Browse the repository at this point in the history
  • Loading branch information
alexslavr committed Jun 17, 2024
1 parent ee4c437 commit 3960cc9
Show file tree
Hide file tree
Showing 138 changed files with 436 additions and 436 deletions.
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/24_1/PhoneJS/person1.png",
"https://js.devexpress.com/Content/images/doc/24_1/PhoneJS/person2.png",
"https://js.devexpress.com/Content/images/doc/24_1/PhoneJS/person3.png",
"https://js.devexpress.com/Content/images/doc/24_1/PhoneJS/person4.png"
"https://js.devexpress.com/Content/images/doc/24_2/PhoneJS/person1.png",
"https://js.devexpress.com/Content/images/doc/24_2/PhoneJS/person2.png",
"https://js.devexpress.com/Content/images/doc/24_2/PhoneJS/person3.png",
"https://js.devexpress.com/Content/images/doc/24_2/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 HtmlEditor's <a href="https://github.com/DevExpress/DevExtreme/tree/24_1/packages/devextreme/js/ui/html_editor/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/DevExtreme/tree/24_1/packages/devextreme/js/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/33%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 HtmlEditor's <a href="https://github.com/DevExpress/DevExtreme/tree/24_2/packages/devextreme/js/ui/html_editor/formats" target="_blank">formats</a> and <a href="https://github.com/DevExpress/DevExtreme/tree/24_2/packages/devextreme/js/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/33%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/24_1/packages/devextreme/js/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/24_2/packages/devextreme/js/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/24_1/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/24_2/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/24_1/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/24_2/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/24_1/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/24_2/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/24_1/PhoneJS/person1.png",
src: "https://js.devexpress.com/Content/images/doc/24_2/PhoneJS/person1.png",
alt: "Photo",
width: "100px"
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Specifies whether to vertically align the drop-down menu so that the selected it
---
The drop-down menu can be displayed under the input field (**dropDownCentered** is **false**) or over it and centered on the selected item (**dropDownCentered** is **true**). The following live example illustrates the difference:

<div class="simulator-desktop-container" style="height:220px" data-view="/Content/Applications/24_1/UIWidgets/Lookup/dropDownCentered.html, /Content/Applications/24_1/UIWidgets/Lookup/dropDownCentered.js, /Content/Applications/24_1/UIWidgets/Lookup/dropDownCentered.css"></div>
<div class="simulator-desktop-container" style="height:220px" data-view="/Content/Applications/24_2/UIWidgets/Lookup/dropDownCentered.html, /Content/Applications/24_2/UIWidgets/Lookup/dropDownCentered.js, /Content/Applications/24_2/UIWidgets/Lookup/dropDownCentered.css"></div>
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/24_1/DataGrid/dg-selectall-unchecked.png"></td>
<td><img src="Content/images/doc/24_2/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/24_1/DataGrid/dg-selectall-checked.png"></td>
<td><img src="Content/images/doc/24_2/DataGrid/dg-selectall-checked.png"></td>
<td><code>filterType: "exclude"</code><br><code>filterValues: null</code></td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion api-reference/_hidden/dxPopupToolbarItem/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The following types of the specified value are available.

[note]You cannot use the [dxTemplate](/api-reference/10%20UI%20Components/Markup%20Components/dxTemplate '/Documentation/ApiReference/UI_Components/Markup_Components/dxTemplate/') component as a **toolbarItems** template.

The following example adds a custom item to the Popup toolbar. Note that Angular and Vue use [custom templates](/concepts/05%20UI%20Components/zz%20Common/30%20Templates/10%20Custom%20Templates.md '/Documentation/Guide/UI_Components/Common/Templates/#Custom_Templates') instead of the **template** property. In React, specify the [render](/Documentation/24_1/ApiReference/UI_Components/dxPopup/Configuration/toolbarItems/#render) or [component](/Documentation/ApiReference/UI_Components/dxPopup/Configuration/toolbarItems/#component) properties.
The following example adds a custom item to the Popup toolbar. Note that Angular and Vue use [custom templates](/concepts/05%20UI%20Components/zz%20Common/30%20Templates/10%20Custom%20Templates.md '/Documentation/Guide/UI_Components/Common/Templates/#Custom_Templates') instead of the **template** property. In React, specify the [render](/Documentation/24_2/ApiReference/UI_Components/dxPopup/Configuration/toolbarItems/#render) or [component](/Documentation/ApiReference/UI_Components/dxPopup/Configuration/toolbarItems/#component) properties.

---
##### jQuery
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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#orientation" target="_blank"><b>orientation</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#columnCount" target="_blank"><b>columnCount</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#rowCount" target="_blank"><b>rowCount</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#columnItemSpacing" target="_blank"><b>columnItemSpacing</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#rowItemSpacing" target="_blank"><b>rowItemSpacing</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#position" target="_blank"><b>position</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#horizontalAlignment" target="_blank"><b>horizontalAlignment</b></a>:
<a href="/Documentation/24_2/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/24_1/ApiReference/UI_Components/dxChart/Configuration/legend/#verticalAlignment" target="_blank"><b>verticalAlignment</b></a>:
<a href="/Documentation/24_2/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/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/24_1/htmlEditor/HtmlEditor.png" alt="HtmlEditor">
<img src="/Content/images/doc/24_2/htmlEditor/HtmlEditor.png" alt="HtmlEditor">
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/24_1/Common/dx-logo.png"),
$("<img />").attr("src", "/Content/images/doc/24_2/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/24_1/GettingStartedWith/Accordion/index.html, /Content/Applications/24_1/GettingStartedWith/Accordion/index.js, /Content/Applications/24_1/GettingStartedWith/Accordion/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/24_2/GettingStartedWith/Accordion/index.html, /Content/Applications/24_2/GettingStartedWith/Accordion/index.js, /Content/Applications/24_2/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_24_1/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_1/js/dx.all.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_24_2/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_2/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/24_1/GettingStartedWith/Autocomplete/index.html, /Content/Applications/24_1/GettingStartedWith/Autocomplete/index.js, /Content/Applications/24_1/GettingStartedWith/Autocomplete/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/24_2/GettingStartedWith/Autocomplete/index.html, /Content/Applications/24_2/GettingStartedWith/Autocomplete/index.js, /Content/Applications/24_2/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_24_1/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_1/js/dx.all.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_24_2/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_2/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/24_1/UiWidgets/Box/Box_direction_row.png", "text": "<b>direction</b>: <i>'row'</i>" },
{ "image": "/Content/images/doc/24_1/UiWidgets/Box/Box_direction_column.png", "text": "<b>direction</b>: <i>'col'</i>" }
{ "image": "/Content/images/doc/24_2/UiWidgets/Box/Box_direction_row.png", "text": "<b>direction</b>: <i>'row'</i>" },
{ "image": "/Content/images/doc/24_2/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/24_1/GettingStartedWith/Button/index.html, /Content/Applications/24_1/GettingStartedWith/Button/index.js, /Content/Applications/24_1/GettingStartedWith/Button/index.css"></div>
<div class="simulator-desktop-container" data-view="/Content/Applications/24_2/GettingStartedWith/Button/index.html, /Content/Applications/24_2/GettingStartedWith/Button/index.js, /Content/Applications/24_2/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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The ButtonGroup is a set of toggle buttons that can be used as a mode switcher.

This tutorial describes how to configure basic ButtonGroup features. We create a ButtonGroup that logs the names of the selected buttons into the browser's console (open the console to see them):

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ You can use the following code to create the ButtonGroup:
<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_24_1/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_1/js/dx.all.js"></script>
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/minor_24_2/css/dx.light.css">
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/minor_24_2/js/dx.all.js"></script>
<script type="text/javascript" src="index.js"></script>
</head>
<body class="dx-viewport">
Expand Down
Loading

0 comments on commit 3960cc9

Please sign in to comment.