Skip to content

Commit 8ba068c

Browse files
author
Matt Lewis
committed
feat(draggable): allow external draggable events
BREAKING CHANGE: if not using CalendarModule.forRoot() and manually adding providers you must now also include the DraggableHelper from the angular-draggable-droppable module Closes #106
1 parent f86a0bd commit 8ba068c

6 files changed

+13
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
},
121121
"dependencies": {
122122
"@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.0",
123-
"angular-draggable-droppable": "^0.4.0",
123+
"angular-draggable-droppable": "^0.5.0",
124124
"angular-resizable-element": "^0.5.4",
125125
"calendar-utils": "0.0.39",
126126
"date-fns": "^1.15.1"

src/calendar.module.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule, ModuleWithProviders } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { ResizableModule } from 'angular-resizable-element';
4-
import { DragAndDropModule } from 'angular-draggable-droppable';
4+
import { DragAndDropModule, DraggableHelper } from 'angular-draggable-droppable';
55
import { CalendarDayViewComponent } from './components/day/calendarDayView.component';
66
import { CalendarWeekViewComponent } from './components/week/calendarWeekView.component';
77
import { CalendarMonthViewComponent } from './components/month/calendarMonthView.component';
@@ -60,7 +60,8 @@ export class CalendarModule {
6060
ngModule: CalendarModule,
6161
providers: [
6262
CalendarEventTitleFormatter,
63-
CalendarDateFormatter
63+
CalendarDateFormatter,
64+
DraggableHelper
6465
]
6566
};
6667

test/calendarDayView.component.spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from '@angular/core/testing';
77
import * as moment from 'moment';
88
import { expect } from 'chai';
9+
import { DraggableHelper } from 'angular-draggable-droppable';
910
import {
1011
CalendarEventTitleFormatter,
1112
CalendarEvent,
@@ -26,6 +27,7 @@ describe('CalendarDayViewComponent component', () => {
2627
TestBed.configureTestingModule({imports: [CalendarModule]});
2728
TestBed.configureCompiler({
2829
providers: [
30+
DraggableHelper,
2931
CalendarEventTitleFormatter,
3032
{provide: CalendarDateFormatter, useClass: CalendarMomentDateFormatter},
3133
{provide: MOMENT, useValue: moment}

test/calendarMonthView.component.spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
import * as moment from 'moment';
77
import { expect } from 'chai';
88
import { spy } from 'sinon';
9+
import { DraggableHelper } from 'angular-draggable-droppable';
910
import {
1011
CalendarEventTitleFormatter,
1112
CalendarEvent,
@@ -25,6 +26,7 @@ describe('calendarMonthView component', () => {
2526
TestBed.configureTestingModule({imports: [CalendarModule]});
2627
TestBed.configureCompiler({
2728
providers: [
29+
DraggableHelper,
2830
CalendarEventTitleFormatter,
2931
{provide: CalendarDateFormatter, useClass: CalendarMomentDateFormatter},
3032
{provide: MOMENT, useValue: moment}

test/calendarWeekView.component.spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
CalendarEventTimesChangedEvent
1616
} from './../src';
1717
import { CalendarWeekViewComponent } from './../src/components/week/calendarWeekView.component';
18+
import { DraggableHelper } from 'angular-draggable-droppable';
1819
import { Subject } from 'rxjs/Rx';
1920
import { triggerDomEvent } from './util';
2021

@@ -25,6 +26,7 @@ describe('calendarWeekView component', () => {
2526
TestBed.configureCompiler({
2627
providers: [
2728
CalendarEventTitleFormatter,
29+
DraggableHelper,
2830
{provide: CalendarDateFormatter, useClass: CalendarMomentDateFormatter},
2931
{provide: MOMENT, useValue: moment}
3032
]

yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ amdefine@>=0.0.4, amdefine@^1.0.0:
184184
version "1.0.1"
185185
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
186186

187-
angular-draggable-droppable@^0.4.0:
188-
version "0.4.0"
189-
resolved "https://registry.yarnpkg.com/angular-draggable-droppable/-/angular-draggable-droppable-0.4.0.tgz#84486ef94796b0427990f66316f89357854b4d80"
187+
angular-draggable-droppable@^0.5.0:
188+
version "0.5.0"
189+
resolved "https://registry.yarnpkg.com/angular-draggable-droppable/-/angular-draggable-droppable-0.5.0.tgz#71aedc7ff228a34514b74de2ea9d7257d7f82a4c"
190190

191191
angular-resizable-element@^0.5.4:
192192
version "0.5.4"

0 commit comments

Comments
 (0)