Skip to content

Commit 8e3ac8a

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 63f65b1 commit 8e3ac8a

File tree

3 files changed

+97
-59
lines changed

3 files changed

+97
-59
lines changed

docs/api/javascript/ui/window.md

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,62 @@ Specifies a URL or request options from where the Window will load its content.
191191
<div id="dialog"></div>
192192
<script>
193193
$("#dialog").kendoWindow({
194-
content: "/details"
194+
content: "https://demos.telerik.com/kendo-ui/content/web/tabstrip/ajax/ajaxContent1.html"
195+
});
196+
</script>
197+
198+
### content.url `String`
199+
200+
Specifies the url from which the content is fetched
201+
202+
#### Example - fetching JSON and displaying it through a template
203+
204+
<div id="dialog"></div>
205+
206+
<script>
207+
$("#dialog").kendoWindow({
208+
content: {
209+
url: "https://demos.telerik.com/kendo-ui/content/web/tabstrip/ajax/ajaxContent2.html",
210+
}
211+
});
212+
</script>
213+
214+
### content.dataType `String` *(default: "html")*
215+
216+
The type of result expected from the remote service. Used values are "html" and "json".
217+
218+
#### Example - fetching and displaying JSON content it in the Window
219+
220+
<div id="dialog"></div>
221+
222+
<script>
223+
$("#dialog").kendoWindow({
224+
content: {
225+
url: "https://demos.telerik.com/kendo-ui/content/shared/js/products.js",
226+
dataType: "json"
227+
}
228+
});
229+
</script>
230+
231+
### content.iframe `Boolean`
232+
233+
If the URL for the Window content contains a protocol, the Window creates an iframe for the content and assumes that the nested page resides in another domain.
234+
235+
If the URL does not contain a protocol, the URL is treated as a local URL which will load a partial view and the Window does not create an iframe for the content.
236+
237+
To control the creation of iframe Window content, you have to explicitly configure the option.
238+
239+
#### Example - Explicitly configure an iframe
240+
241+
<div id="dialog"></div>
242+
243+
<script>
244+
$("#dialog").kendoWindow({
245+
content: {
246+
url: "https://demos.telerik.com/kendo-ui/content/shared/js/products.js",
247+
dataType: "json",
248+
iframe: true
249+
}
195250
});
196251
</script>
197252

styles/web/common/imagebrowser.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
.k-filebrowser .k-filemanager-listview {
120120
height: 390px;
121121
max-height: 50vh;
122+
margin-bottom: 2em;
123+
}
124+
125+
.k-filebrowser .k-filemanager-listview .k-listview-content {
126+
height: 100%;
122127
}
123128

124129
.k-filebrowser .k-form-text-row

typescript/kendo.all.d.ts

Lines changed: 36 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ declare namespace kendo {
314314

315315
trigger(eventName: string, e?: any): boolean;
316316
unbind(eventName?: string, handler?: any): Observable;
317+
318+
angular(eventName: string, handler: Function): void;
317319
}
318320

319321
interface ViewOptions {
@@ -746,7 +748,7 @@ declare namespace kendo.data {
746748

747749
append(model: any): void;
748750
level(): number;
749-
load(id: any): void;
751+
load(): void;
750752
loaded(value: boolean): void;
751753
loaded(): boolean;
752754
parentNode(): Node;
@@ -1520,6 +1522,16 @@ declare namespace kendo.data.binders.widget.grid {
15201522

15211523
declare namespace kendo.data.transports {
15221524
var odata: DataSourceTransport;
1525+
var filebrowser: DataSourceTransport;
1526+
var imagebrowser: DataSourceTransport;
1527+
var signalr: DataSourceTransport;
1528+
}
1529+
1530+
declare namespace kendo.data.schemas {
1531+
var odata: DataSourceSchema;
1532+
var filemanager: DataSourceSchema;
1533+
var filebrowser: DataSourceSchema;
1534+
var imagebrowser: DataSourceSchema;
15231535
}
15241536

15251537
declare namespace kendo.ui {
@@ -1673,7 +1685,9 @@ declare namespace kendo.ui {
16731685

16741686
declare namespace kendo.ui.editor {
16751687
class Toolbar extends kendo.ui.Widget{
1676-
window: kendo.ui.Window;
1688+
element: JQuery;
1689+
options: any;
1690+
tools: any[];
16771691
}
16781692
}
16791693

@@ -6674,7 +6688,7 @@ declare namespace kendo.ui {
66746688
activatePage(): void;
66756689
loadPage(): void;
66766690
execute(): void;
6677-
setOptions(): void;
6691+
setOptions(options: any): void;
66786692
destroy(): void;
66796693

66806694
}
@@ -10561,6 +10575,9 @@ declare namespace kendo.ui {
1056110575
}
1056210576

1056310577
interface WindowContent {
10578+
url?: string;
10579+
dataType?: string;
10580+
iframe?: boolean;
1056410581
template?: string;
1056510582
}
1056610583

@@ -11186,26 +11203,20 @@ declare namespace kendo.drawing {
1118611203

1118711204

1118811205
interface PDFOptions {
11189-
11190-
11191-
1119211206
creator?: string;
1119311207
date?: Date;
1119411208
imgDPI?: number;
1119511209
keywords?: string;
1119611210
landscape?: boolean;
1119711211
margin?: any;
11212+
multiPage?: boolean;
1119811213
paperSize?: any;
11214+
jpegQuality?: number;
11215+
keepPNG?: boolean;
1119911216
subject?: string;
1120011217
title?: string;
11201-
11202-
11203-
11204-
1120511218
}
1120611219

11207-
11208-
1120911220
class Path extends kendo.drawing.Element {
1121011221

1121111222

@@ -13322,6 +13333,7 @@ declare namespace kendo.dataviz.ui {
1332213333
padding?: number | ChartSeriesDefaultsLabelsPadding;
1332313334
rotation?: string|number;
1332413335
template?: string|Function;
13336+
position?: string|Function;
1332513337
visible?: boolean;
1332613338
visual?: Function;
1332713339
from?: ChartSeriesDefaultsLabelsFrom;
@@ -20537,10 +20549,10 @@ declare namespace kendo {
2053720549
function guid(): string;
2053820550
function htmlEncode(value: string): string;
2053920551
function observableHierarchy(array: any): void;
20540-
function parseDate(value: string, formats?: string, culture?: string): Date;
20541-
function parseDate(value: string, formats?: any, culture?: string): Date;
20542-
function parseExactDate(value: string, formats?: string, culture?: string): Date;
20543-
function parseExactDate(value: string, formats?: any, culture?: string): Date;
20552+
function parseDate(value: string, formats?: string, culture?: string): Date | null;
20553+
function parseDate(value: string, formats?: any, culture?: string): Date | null;
20554+
function parseExactDate(value: string, formats?: string, culture?: string): Date | null;
20555+
function parseExactDate(value: string, formats?: any, culture?: string): Date| null;
2054420556
function parseFloat(value: string, culture?: string): number;
2054520557
function parseInt(value: string, culture?: string): number;
2054620558
function parseColor(color: string, noerror: boolean): kendo.Color;
@@ -20585,57 +20597,40 @@ declare namespace kendo {
2058520597
}
2058620598
declare namespace kendo.spreadsheet {
2058720599
class CustomFilter extends Observable {
20588-
20589-
2059020600
options: CustomFilterOptions;
2059120601

20592-
20593-
20594-
2059520602
init(options: any): void;
20596-
2059720603
}
2059820604

2059920605
interface CustomFilterOptions {
2060020606
name?: string;
2060120607
}
20608+
2060220609
interface CustomFilterEvent {
2060320610
sender: CustomFilter;
2060420611
preventDefault: Function;
2060520612
isDefaultPrevented(): boolean;
2060620613
}
2060720614

20608-
2060920615
class DynamicFilter extends Observable {
20610-
20611-
2061220616
options: DynamicFilterOptions;
2061320617

20614-
20615-
20616-
2061720618
init(options: any): void;
20618-
2061920619
}
2062020620

2062120621
interface DynamicFilterOptions {
2062220622
name?: string;
2062320623
}
20624+
2062420625
interface DynamicFilterEvent {
2062520626
sender: DynamicFilter;
2062620627
preventDefault: Function;
2062720628
isDefaultPrevented(): boolean;
2062820629
}
2062920630

20630-
2063120631
class Range extends Observable {
20632-
20633-
2063420632
options: RangeOptions;
2063520633

20636-
20637-
20638-
2063920634
background(): string;
2064020635
background(value?: string): void;
2064120636
bold(): boolean;
@@ -20702,27 +20697,21 @@ declare namespace kendo.spreadsheet {
2070220697
verticalAlign(value?: string): void;
2070320698
wrap(): boolean;
2070420699
wrap(value?: boolean): void;
20705-
2070620700
}
2070720701

2070820702
interface RangeOptions {
2070920703
name?: string;
2071020704
}
20705+
2071120706
interface RangeEvent {
2071220707
sender: Range;
2071320708
preventDefault: Function;
2071420709
isDefaultPrevented(): boolean;
2071520710
}
2071620711

20717-
2071820712
class Sheet extends Observable {
20719-
20720-
2072120713
options: SheetOptions;
2072220714

20723-
20724-
20725-
2072620715
clearFilter(indexes: number): void;
2072720716
clearFilter(indexes: any): void;
2072820717
columnWidth(): void;
@@ -20750,13 +20739,13 @@ declare namespace kendo.spreadsheet {
2075020739
toJSON(): void;
2075120740
unhideColumn(index: number): void;
2075220741
unhideRow(index: number): void;
20753-
2075420742
}
2075520743

2075620744
interface SheetOptions {
2075720745
name?: string;
2075820746
change?(e: SheetChangeEvent): void;
2075920747
}
20748+
2076020749
interface SheetEvent {
2076120750
sender: Sheet;
2076220751
preventDefault: Function;
@@ -20766,51 +20755,39 @@ declare namespace kendo.spreadsheet {
2076620755
interface SheetChangeEvent extends SheetEvent {
2076720756
}
2076820757

20769-
2077020758
class TopFilter extends Observable {
20771-
20772-
2077320759
options: TopFilterOptions;
2077420760

20775-
20776-
20777-
2077820761
init(options: any): void;
20779-
2078020762
}
2078120763

2078220764
interface TopFilterOptions {
2078320765
name?: string;
2078420766
}
20767+
2078520768
interface TopFilterEvent {
2078620769
sender: TopFilter;
2078720770
preventDefault: Function;
2078820771
isDefaultPrevented(): boolean;
2078920772
}
2079020773

20791-
2079220774
class ValueFilter extends Observable {
20793-
20794-
2079520775
options: ValueFilterOptions;
2079620776

20797-
20798-
20799-
2080020777
init(options: any): void;
20801-
2080220778
}
2080320779

2080420780
interface ValueFilterOptions {
2080520781
name?: string;
2080620782
}
20783+
2080720784
interface ValueFilterEvent {
2080820785
sender: ValueFilter;
2080920786
preventDefault: Function;
2081020787
isDefaultPrevented(): boolean;
2081120788
}
2081220789

20813-
20790+
function defineFunction(name: String, handler: Function): any;
2081420791
}
2081520792

2081620793
declare namespace kendo.stepper {
@@ -21983,6 +21960,7 @@ declare namespace kendo.ooxml {
2198321960
cells?: WorkbookSheetRowCell[];
2198421961
index?: number;
2198521962
height?: number;
21963+
type?: string;
2198621964
}
2198721965

2198821966
interface WorkbookSheet {

0 commit comments

Comments
 (0)