Merge branch 'master' of https://github.com/fretje/DefinitelyTyped into fretje-master

types/kendo-ui/index.d.ts

@@ -1294,7 +1294,7 @@ declare namespace kendo.data {
 	interface DataSourcePushEvent extends DataSourceEvent {
         items?: DataSourceItemOrGroup[];
 		type?: string;
-       
+
     }
 
     interface DataSourceErrorEvent extends DataSourceEvent {
@@ -1553,15 +1553,27 @@ declare namespace kendo.drawing.pdf {
 }
 
 declare namespace kendo.ui {
-    class AgendaView implements kendo.ui.SchedulerView {
-        static fn: AgendaView;
+    class SchedulerView extends Widget {
+        static fn: SchedulerView;
 
         startDate(): Date;
         endDate(): Date;
 
+        static extend(proto: Object): SchedulerView;
+    }
+
+    class AgendaView extends SchedulerView {
+        static fn: AgendaView;
+
         static extend(proto: Object): AgendaView;
     }
 
+    class TimelineView extends SchedulerView {
+        static fn: TimelineView;
+
+        static extend(proto: Object): TimelineView;
+    }
+
     class Alert extends kendo.ui.Dialog {
 
         static fn: Alert;
@@ -4018,7 +4030,7 @@ declare namespace kendo.ui {
 
     interface GridDetailInitEvent extends GridEvent {
         data?: kendo.data.ObservableObject;
-        detailCell?: JQuery;
+        detailCell: JQuery;
         detailRow?: JQuery;
         masterRow?: JQuery;
     }
@@ -4595,7 +4607,7 @@ declare namespace kendo.ui {
     }
 
     interface NotificationShowEvent extends NotificationEvent {
-        element?: JQuery;
+        element: JQuery;
     }
 
 
@@ -5408,8 +5420,7 @@ declare namespace kendo.ui {
         slotByPosition(xPosition: number, yPosition: number): any;
         slotByElement(element: Element): any;
         slotByElement(element: JQuery): any;
-        view(): kendo.ui.SchedulerView;
-        view(name: string): void;
+        view(type?: string): void | SchedulerView;
         viewName(): string;
 
     }
@@ -5620,7 +5631,7 @@ declare namespace kendo.ui {
         orientation?: string;
     }
 
-    interface SchedulerView {
+    interface SchedulerViewOptions {
         allDayEventTemplate?: string|Function;
         allDaySlot?: boolean;
         allDaySlotTemplate?: string|Function;
@@ -5629,7 +5640,7 @@ declare namespace kendo.ui {
         dayTemplate?: string|Function;
         editable?: boolean|SchedulerViewEditable;
         endDate?(): Date;
-	endTime?: Date;
+	    endTime?: Date;
         eventHeight?: number;
         eventTemplate?: string|Function;
         eventTimeTemplate?: string|Function;
@@ -5643,10 +5654,10 @@ declare namespace kendo.ui {
         selectedShortDateFormat?: string;
         showWorkHours?: boolean;
         slotTemplate?: string|Function;
-	startDate?(): Date;
+	    startDate?(): Date;
         startTime?: Date;
         title?: string;
-        type?: string;
+        type?: string | SchedulerView;
         workWeekStart?: number;
         workWeekEnd?: number;
     }
@@ -5691,7 +5702,7 @@ declare namespace kendo.ui {
         startTime?: Date;
         timezone?: string;
         toolbar?: SchedulerToolbarItem[];
-        views?: SchedulerView[];
+        views?: SchedulerViewOptions[];
         width?: number|string;
         workDayStart?: Date;
         workDayEnd?: Date;
@@ -18498,7 +18509,7 @@ declare namespace kendo.ooxml {
     interface WorkbookSheetRow {
         cells?: WorkbookSheetRowCell[];
         index?: number;
-        height?: number;      
+        height?: number;
         type?: "header" | "footer" | "group-header" | "group-footer" | "data";
     }
 
@@ -18756,7 +18767,7 @@ declare namespace kendo.dataviz.geometry {
         setHeight(value: number): kendo.geometry.Size;
 
     }
-    
+
     interface SizeOptions {
         name?: string;
     }