Skip to content

Commit

Permalink
Update to 18.1.2-beta.1 (#764)
Browse files Browse the repository at this point in the history
* Update to 18.1.2-beta.1

* Fix ajax request on server side
  • Loading branch information
dxvladislavvolkov authored Apr 25, 2018
1 parent be71ff5 commit c9478ac
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 31 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 18.1.2-beta.1 (2018-04-25)

### Features
- DevExtreme dependency has been updated to the 18.1.2-pre-beta

### Bug Fixes
- Event with subscriptions should be fired inside NgZoneEvent [#762](https://github.com/DevExpress/devextreme-angular/pull/762)

## 18.1.1-beta.6 (2018-04-17)

### Bug Fixes
Expand Down
40 changes: 14 additions & 26 deletions metadata/NGMetaData.json
Original file line number Diff line number Diff line change
Expand Up @@ -5508,7 +5508,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments of the chart's series points."
"Description": "Formats the point argument before it is displayed in the tooltip. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -18859,7 +18859,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments of the chart's series points."
"Description": "Formats the point argument before it is displayed in the tooltip. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -19384,7 +19384,7 @@
"PrimitiveTypes": [
"string"
],
"Description": ""
"Description": "Specifies when to apply changes made in the field chooser to the PivotGrid."
},
"enabled": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -19952,7 +19952,7 @@
"PrimitiveTypes": [
"string"
],
"Description": ""
"Description": "Specifies when to apply changes made in the widget to the PivotGrid."
},
"dataSource": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -20103,7 +20103,7 @@
"PrimitiveTypes": [
"any"
],
"Description": ""
"Description": "The widget's state."
},
"tabIndex": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -21900,7 +21900,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments of the chart's series points."
"Description": "Formats the point argument before it is displayed in the tooltip. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -26657,7 +26657,7 @@
"IsCollection": true,
"IsReadonly": true,
"SingularName": "selectedCellData",
"Description": ""
"Description": "Currently selected cells' data."
},
"shadeUntilCurrentTime": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -36596,7 +36596,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Formats the point argument before it will be displayed in the point label."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -37567,7 +37567,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Formats the point argument before it will be displayed in the point label."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -38478,12 +38478,6 @@
"SingularName": "column",
"Description": "An array of grid columns."
},
"command": {
"PrimitiveTypes": [
"string"
],
"Description": ""
},
"cssClass": {
"PrimitiveTypes": [
"string"
Expand Down Expand Up @@ -39710,12 +39704,6 @@
"SingularName": "column",
"Description": "Configures columns."
},
"command": {
"PrimitiveTypes": [
"string"
],
"Description": ""
},
"cssClass": {
"PrimitiveTypes": [
"string"
Expand Down Expand Up @@ -40200,7 +40188,7 @@
"Function"
],
"IsFunc": true,
"Description": "Parses string values into numeric or date-time values. Always used with formatter."
"Description": "Parses string values into numeric or date-time values. Can be used with formatter or one of the predefined formats."
},
"precision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -40563,7 +40551,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments displayed by point labels."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -40991,7 +40979,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments displayed by point labels."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -41477,7 +41465,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments displayed by point labels."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down Expand Up @@ -42181,7 +42169,7 @@
"ComplexTypes": [
"Format"
],
"Description": "Specifies a format for arguments displayed by point labels."
"Description": "Formats the point argument before it is displayed in the point label. To format the point value, use the format option."
},
"argumentPrecision": {
"PrimitiveTypes": [
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "devextreme-angular",
"version": "18.1.1-beta.6",
"version": "18.1.2-beta.1",
"description": "Angular UI and visualization components based on DevExtreme widgets",
"repository": {
"type": "git",
Expand All @@ -17,13 +17,13 @@
"author": "Developer Express Inc.",
"license": "MIT",
"peerDependencies": {
"devextreme": "~18.1.1-pre-18103",
"devextreme": "~18.1.2-pre-beta",
"@angular/core": ">5.0.0",
"@angular/common": ">5.0.0",
"@angular/forms": ">5.0.0"
},
"devDependencies": {
"devextreme": "~18.1.1-pre-18103",
"devextreme": "~18.1.2-pre-beta",
"zone.js": "^0.8.25",
"@angular/animations": "^5.0.0",
"@angular/common": "^5.0.0",
Expand Down
7 changes: 5 additions & 2 deletions src/core/integration.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@

import { NgModule, Inject, NgZone } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { NgHttp } from './http-request';

import * as domAdapter from 'devextreme/core/dom_adapter';
import * as readyCallbacks from 'devextreme/core/utils/ready_callbacks';

const events = ['mousemove', 'mouseover', 'mouseout', 'scroll'];
@NgModule({})
@NgModule({
providers: [ NgHttp ]
})
export class DxIntegrationModule {
constructor(@Inject(DOCUMENT) document: any, ngZone: NgZone) {
constructor(@Inject(DOCUMENT) document: any, ngZone: NgZone, _ngHttp: NgHttp) {
domAdapter.inject({
_document: document,

Expand Down

0 comments on commit c9478ac

Please sign in to comment.