merge with upstream

Author: GoodDayForSurf

apps/demos/Demos/Autocomplete/Overview/jQuery/index.js

@@ -94,7 +94,7 @@ $(() => {
   });
 
   function updateEmployeeInfo() {
-    let result = $.trim(`${firstName || ''} ${lastName || ''}`);
+    let result = `${firstName || ''} ${lastName || ''}`.trim();
 
     result += (result && position) ? (`, ${position}`) : position || '';
     result += (result && state) ? (`, ${state}`) : state || '';

apps/demos/Demos/CardView/SimpleArray/Angular/app/app.component.ts

@@ -22,7 +22,7 @@ if (window && window.config?.packageConfigPaths) {
 export class AppComponent {
   customers: Customer[];
 
-  columns = ['CompanyName', 'City', 'State', 'Phone', 'Fax'];
+  columns = ['CompanyName', 'Address', 'City', 'State', 'Zipcode', 'Phone'];
 
   constructor(service: Service) {
     this.customers = service.getCustomers();

apps/demos/Demos/CardView/SimpleArray/React/App.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import CardView, { Column } from 'devextreme-react/card-view';
 import { customers } from './data.ts';
 
-const columns = ['CompanyName', 'City', 'State', 'Phone', 'Fax'];
+const columns = ['CompanyName', 'Address', 'City', 'State', 'Zipcode', 'Phone'];
 
 const App = () => (
   <CardView

apps/demos/Demos/CardView/SimpleArray/ReactJs/App.js

@@ -2,7 +2,7 @@ import React from 'react';
 import CardView, { Column } from 'devextreme-react/card-view';
 import { customers } from './data.js';
 
-const columns = ['CompanyName', 'City', 'State', 'Phone', 'Fax'];
+const columns = ['CompanyName', 'Address', 'City', 'State', 'Zipcode', 'Phone'];
 const App = () => (
   <CardView
     dataSource={customers}

apps/demos/Demos/CardView/SimpleArray/Vue/App.vue

@@ -13,5 +13,5 @@
   import { DxCardView, DxColumn } from 'devextreme-vue/card-view';
   import { customers } from './data.ts';
 
-  const columns = ['CompanyName', 'City', 'State', 'Phone', 'Fax'];
+  const columns = ['CompanyName', 'Address', 'City', 'State', 'Zipcode', 'Phone'];
 </script>

apps/demos/Demos/CardView/SimpleArray/jQuery/index.js

@@ -2,6 +2,6 @@ $(() => {
   $('#card-view').dxCardView({
     dataSource: customers,
     keyExpr: 'ID',
-    columns: ['CompanyName', 'City', 'State', 'Phone', 'Fax'],
+    columns: ['CompanyName', 'Address', 'City', 'State', 'Zipcode', 'Phone'],
   });
 });

apps/demos/Demos/Charts/SignalRService/jQuery/index.js

@@ -1,4 +1,12 @@
 $(() => {
+  $.type = $.type || function (obj) {
+    if (obj == null) {
+      return obj + '';
+    }
+
+    return typeof obj;
+  };
+
   const hubConnection = new signalR.HubConnectionBuilder()
     .withUrl('https://js.devexpress.com/Demos/NetCore/stockTickDataHub', {
       skipNegotiation: true,

apps/demos/Demos/DataGrid/CollaborativeEditing/jQuery/index.js

@@ -1,4 +1,12 @@
 $(() => {
+  $.type = $.type || function (obj) {
+    if (obj == null) {
+      return obj + '';
+    }
+
+    return typeof obj;
+  };
+
   const BASE_PATH = 'https://js.devexpress.com/Demos/NetCore/';
   const url = `${BASE_PATH}api/DataGridCollaborativeEditing/`;
   const groupId = new DevExpress.data.Guid().toString();

apps/demos/Demos/DataGrid/SignalRService/jQuery/index.js

@@ -1,4 +1,12 @@
 $(() => {
+  $.type = $.type || function (obj) {
+    if (obj == null) {
+      return obj + '';
+    }
+
+    return typeof obj;
+  };
+
   const connection = new signalR.HubConnectionBuilder()
     .withUrl('https://js.devexpress.com/Demos/NetCore/liveUpdateSignalRHub', {
       skipNegotiation: true,

apps/demos/Demos/HtmlEditor/AITextEditing/Angular/app/app.component.html

@@ -4,7 +4,7 @@
   [aiIntegration]="aiIntegration"
 >
   <dxo-toolbar>
-    <dxi-item name="ai" commands="commands"></dxi-item>
+    <dxi-item name="ai" [commands]="commands"></dxi-item>
     <dxi-item name="separator"></dxi-item>
     <dxi-item name="undo"></dxi-item>
     <dxi-item name="redo"></dxi-item>