Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove luxon and es6-object-assign #14825

Merged
merged 5 commits into from
Oct 9, 2020
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
4 changes: 0 additions & 4 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,4 @@ rrule.js (Open Source - BSD License)
Copyright 2010, Jakub Roztocil and Lars Schoning
https://github.com/jakubroztocil/rrule/blob/master/LICENCE

es6-object-assign (Open Source - MIT License)
Copyright (c) 2015-2017 Rubén Norte
https://github.com/rubennorte/es6-object-assign/blob/master/LICENSE

San4es marked this conversation as resolved.
Show resolved Hide resolved
The open source libraries included in this product are done so pursuant to each individual open source library license and subject to the disclaimers and limitations on liability set forth in each open source library license.
2 changes: 1 addition & 1 deletion js/ui/diagram/diagram.items_option.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class ItemsOption extends Component {

_dataSourceChangedHandler(newItems, e) {
this._resetCache();
this._items = newItems.map(item => Object.assign({}, item));
this._items = newItems.map(item => extend({}, item));
San4es marked this conversation as resolved.
Show resolved Hide resolved
this._dataSourceItems = newItems.slice();

if(e && e.changes) {
Expand Down
2 changes: 0 additions & 2 deletions js/ui/scheduler/recurrence.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// NOTE: https://github.com/jakubroztocil/rrule/issues/402 (IE11 support)
import 'es6-object-assign/auto';
import errors from '../../core/errors';
import { each } from '../../core/utils/iterator';
import { inArray } from '../../core/utils/array';
Expand Down
2 changes: 1 addition & 1 deletion js/ui/scheduler/ui.scheduler.resource_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ export default class ResourceManager {
const currentResourcesData = [];

resourceData.forEach(
data => currentResourcesData.push(Object.assign({}, data))
data => currentResourcesData.push(extend({}, data))
San4es marked this conversation as resolved.
Show resolved Hide resolved
);

each(groups, (_, value) => {
Expand Down
2 changes: 1 addition & 1 deletion js/ui/scheduler/workspaces/ui.scheduler.work_space.js
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ class SchedulerWorkSpace extends WidgetObserver {

if(this.isVirtualScrolling()) {
const virtualScrollingState = this.virtualScrollingDispatcher.getState();
Object.assign(options, {
extend(options, {
San4es marked this conversation as resolved.
Show resolved Hide resolved
topVirtualRowHeight: virtualScrollingState.topVirtualRowHeight,
bottomVirtualRowHeight: virtualScrollingState.bottomVirtualRowHeight,
startRowIndex: virtualScrollingState.startIndex,
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
"devexpress-gantt": "1.1.17",
"jszip": "^2.0.0 || ^3.0.0",
"devextreme-quill": "^0.9.5",
"rrule": "2.6.4",
"es6-object-assign": "^1.1.0",
"rrule": "2.6.6",
"showdown": "^1.8.6",
"turndown": "^6.0.0",
"preact": "^10.4.5"
Expand Down
8 changes: 1 addition & 7 deletions testing/runner/Views/Main/RunSuite.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,8 @@
'turndown': '@Url.Content("~/node_modules/turndown/lib/turndown.browser.umd.js")',
'showdown': '@Url.Content("~/node_modules/showdown/dist/showdown.js")',
'rrule': '@Url.Content("~/node_modules/rrule/dist/es5/rrule.js")',
'luxon': '@Url.Content("~/node_modules/luxon/build/global/luxon.min.js")',
'es6-object-assign': '@Url.Content("~/node_modules/es6-object-assign")',
// Global CSS

// Global CSS
'common.css': '@Url.Content("~/artifacts/css/dx.common.css")',

'generic_light.css': '@Url.Content("~/artifacts/css/dx.light.css")',
Expand All @@ -225,10 +223,6 @@
'cldr': {
main: '../cldr.js',
defaultExtension: 'js'
},
'es6-object-assign': {
main: './index.js',
defaultExtension: 'js'
}
},
meta: {
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = {
'exceljs': 'window.ExcelJS',
'jspdf': 'window.jspdf.jsPDF',
'devexpress-diagram': 'window.DevExpress.diagram',
'devexpress-gantt': 'window.DevExpress.Gantt'
'devexpress-gantt': 'window.DevExpress.Gantt',
'luxon': 'window.luxon'
San4es marked this conversation as resolved.
Show resolved Hide resolved
}
};