Skip to content

Commit d4b97bf

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 0752b51 commit d4b97bf

23 files changed

+957
-839
lines changed

docs/api/javascript/ui/gantt.md

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4195,6 +4195,53 @@ Prepares the widget for safe removal from DOM. Detaches all event handlers and r
41954195
gantt.destroy();
41964196
</script>
41974197

4198+
### editTask
4199+
4200+
Opens the popup window to edit the GanttTask object which is received from the call.
4201+
4202+
#### Parameters
4203+
4204+
##### task `kendo.data.GanttTask`
4205+
4206+
A kendo.data.GanttTask object which represents the currently selected task.
4207+
4208+
#### Example - Edit the items from the Task Treelist.
4209+
4210+
<div id="gantt"></div>
4211+
<script>
4212+
$("#gantt").kendoGantt({
4213+
dataSource: {
4214+
transport: {
4215+
read: {
4216+
url: "https://demos.telerik.com/kendo-ui/service/gantttasks",
4217+
dataType: "jsonp"
4218+
}
4219+
},
4220+
schema: {
4221+
model: {
4222+
id: "id",
4223+
fields: {
4224+
id: { from: "ID", type: "number" },
4225+
orderId: { from: "OrderID", type: "number", validation: { required: true } },
4226+
parentId: { from: "ParentID", type: "number", validation: { required: true } },
4227+
start: { from: "Start", type: "date" },
4228+
end: { from: "End", type: "date" },
4229+
title: { from: "Title", defaultValue: "", type: "string" },
4230+
percentComplete: { from: "PercentComplete", type: "number" },
4231+
summary: { from: "Summary" },
4232+
expanded: { from: "Expanded" }
4233+
}
4234+
}
4235+
}
4236+
}
4237+
});
4238+
$(".k-gantt").delegate(".k-gantt-treelist .k-grid-content tr", "click", function(e) {
4239+
var gantt = $("#gantt").data("kendoGantt");
4240+
var task = gantt.dataItem(this);
4241+
gantt.editTask(task);
4242+
});
4243+
</script>
4244+
41984245
### range
41994246

42004247
Sets range to the widget.
@@ -4211,7 +4258,7 @@ An Object that have start and end parameters of type Date.
42114258

42124259
#### Example - set range to the widget
42134260

4214-
<div id="gantt"></div>
4261+
<div id="gantt"></div>
42154262
<script>
42164263
$("#gantt").kendoGantt({
42174264
dataSource: [

docs/knowledge-base/gantt-open-editor-on-treelist-click.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,35 @@ How can I show the editor of the Gantt when I select tasks in the tree-list?
4141
1. Call the `editTask` method of the Gantt and pass the dataItem of the selected task as a parameter.
4242

4343
```dojo
44+
<div id="gantt"></div>
45+
<script>
46+
$("#gantt").kendoGantt({
47+
dataSource: [
48+
{
49+
id: 1,
50+
orderId: 0,
51+
parentId: null,
52+
title: "Task1",
53+
start: new Date("2014/6/17 9:00"),
54+
end: new Date("2014/6/17 11:00")
55+
},
56+
{
57+
id: 2,
58+
orderId: 1,
59+
parentId: null,
60+
title: "Task2",
61+
start: new Date("2014/6/17 12:00"),
62+
end: new Date("2014/6/17 14:00")
63+
}
64+
]
65+
});
66+
</script>
4467
<script>
4568
$(document).ready(function() {
4669
$(".k-gantt").delegate(".k-gantt-treelist .k-grid-content tr", "click", function(e) {
47-
var gantt = $("#gantt").data("kendoGantt");
48-
var task = gantt.dataItem(this);
49-
gantt.editTask(task);
70+
var gantt = $("#gantt").data("kendoGantt");
71+
var task = gantt.dataItem(this);
72+
gantt.editTask(task);
5073
});
5174
});
5275
</script>

docs/knowledge-base/use-both-multi-and-default-filtering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ When the [`filterMenuInit`](http://docs.telerik.com/kendo-ui/api/javascript/ui/g
3636
3737
<script>
3838
$(document).ready(function () {
39-
var crudServiceBaseUrl = "http://demos.telerik.com/kendo-ui/service",
39+
var crudServiceBaseUrl = "https://demos.telerik.com/kendo-ui/service",
4040
dataSource = new kendo.data.DataSource({
4141
transport: {
4242
read: {

src/kendo.notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var __meta__ = { // jshint ignore:line
4141
WRAPPER = '<div class="k-widget k-popup k-notification"></div>',
4242
TEMPLATE = '<div class="k-notification-wrap">' +
4343
'<span class="k-icon k-i-#=typeIcon#" title="#=typeIcon#"></span>' +
44-
'#=content#' +
44+
'<div class="k-notification-content">#=content#</div>' +
4545
'<span class="k-icon k-i-close" title="Hide"></span>' +
4646
'</div>',
4747
SAFE_TEMPLATE = TEMPLATE.replace("#=content#", "#:content#");
Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,33 @@
11
// Notification
22
.k-notification {
3-
padding: .6em .5em;
4-
border-width: 1px;
3+
border-width: @notification-border-width;
54
border-style: solid;
65
cursor: default;
76
position: relative;
87
white-space: nowrap;
98
box-sizing: border-box;
109

11-
&-closable {
12-
padding-right: 20px;
10+
> .k-notification-wrap {
11+
padding: @notification-padding-y @notification-padding-x;
12+
}
13+
14+
&-closable > .k-notification-wrap {
15+
padding-right: @notification-padding-end;
16+
}
17+
18+
.k-notification-content {
19+
display: inline-block;
20+
vertical-align: top;
21+
white-space: normal;
1322
}
1423
}
1524

16-
.k-notification-wrap > .k-i-information,
17-
.k-notification-wrap > .k-i-information,
18-
.k-notification-wrap > .k-i-information,
25+
.k-notification-wrap > .k-i-info,
26+
.k-notification-wrap > .k-i-success,
1927
.k-notification-wrap > .k-i-warning,
20-
.k-notification-wrap > .k-i-information {
28+
.k-notification-wrap > .k-i-error {
29+
margin-right: @notification-icon-spacing;
2130
vertical-align: text-bottom;
22-
margin-right: 4px;
2331
}
2432

2533
.k-notification-wrap > .k-i-close {
@@ -33,3 +41,26 @@
3341
.k-notification-closable .k-notification-wrap > .k-i-close {
3442
display: block;
3543
}
44+
45+
46+
47+
48+
// RTL
49+
.k-rtl .k-notification-closable .k-notification-wrap,
50+
.k-rtl.k-notification-closable .k-notification-wrap {
51+
padding-right: @notification-padding-x;
52+
padding-left: @notification-padding-end;
53+
}
54+
55+
.k-rtl .k-notification-wrap > .k-i-info,
56+
.k-rtl .k-notification-wrap > .k-i-success,
57+
.k-rtl .k-notification-wrap > .k-i-warning,
58+
.k-rtl .k-notification-wrap > .k-i-erorr {
59+
margin-right: 0;
60+
margin-left: @notification-icon-spacing;
61+
}
62+
63+
.k-rtl .k-notification-wrap > .k-i-close {
64+
right: auto;
65+
left: 4px;
66+
}

styles/web/kendo.common-bootstrap.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,16 @@
197197
@spreadsheet-drawing-handle-border-width: 1px;
198198

199199

200+
// Notification
201+
@notification-border-width: 1px;
202+
203+
@notification-padding-x: 0.5em;
204+
@notification-padding-y: 0.6em;
205+
@notification-padding-end: 20px;
206+
207+
@notification-icon-spacing: 4px;
208+
209+
200210
@import "common/all.less";
201211

202212
.k-widget.k-tabstrip

styles/web/kendo.common-fiori.less

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@
195195
@spreadsheet-drawing-handle-border-width: 1px;
196196

197197

198+
// Notification
199+
@notification-border-width: 1px;
200+
201+
@notification-padding-x: 1.786em;
202+
@notification-padding-y: 1.786em;
203+
@notification-padding-end: 1.786em;
204+
205+
@notification-icon-spacing: 4px;
206+
207+
198208
@import "common/all.less";
199209

200210
.k-textbox > input,
@@ -741,10 +751,6 @@ span.k-tooltip
741751
}
742752
}
743753

744-
.k-notification {
745-
padding: 1.786em;
746-
}
747-
748754
.k-slider-track {
749755
border-width: 0;
750756
}

styles/web/kendo.common-material.less

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,16 @@
196196
@spreadsheet-drawing-handle-border-width: 1px;
197197

198198

199+
// Notification
200+
@notification-border-width: 1px;
201+
202+
@notification-padding-x: 1.786em;
203+
@notification-padding-y: 1.786em;
204+
@notification-padding-end: 1.786em;
205+
206+
@notification-icon-spacing: 4px;
207+
208+
199209
@import "common/all.less";
200210

201211
@spreadsheet-first-tool-offset: 0;
@@ -855,10 +865,6 @@ div.editorToolbarWindow.k-window-content {
855865
}
856866
}
857867

858-
.k-notification {
859-
padding: 1.786em;
860-
}
861-
862868
.k-slider-track {
863869
border-width: 0;
864870
}

styles/web/kendo.common-nova.less

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,16 @@
201201
@spreadsheet-drawing-handle-border-width: 1px;
202202

203203

204+
// Notification
205+
@notification-border-width: 1px;
206+
207+
@notification-padding-x: 1.786em;
208+
@notification-padding-y: 1.786em;
209+
@notification-padding-end: 1.786em;
210+
211+
@notification-icon-spacing: 10px;
212+
213+
204214
@import "common/all.less";
205215

206216
.k-button {
@@ -844,10 +854,6 @@ div.editorToolbarWindow.k-window-content {
844854
height: 3.458em;
845855
}
846856

847-
.k-notification {
848-
padding: 1.786em;
849-
}
850-
851857
.k-gantt-edit-form > .k-edit-form-container {
852858
.k-textbox,
853859
.k-numerictextbox
@@ -1039,14 +1045,6 @@ form.k-filter-menu .k-textbox {
10391045
margin: -0.9em -0.6em -0.714em 0;
10401046
}
10411047

1042-
.k-notification .k-i-information,
1043-
.k-notification .k-i-information,
1044-
.k-notification .k-i-information,
1045-
.k-notification .k-i-warning,
1046-
.k-notification .k-i-information {
1047-
margin-right: 10px;
1048-
}
1049-
10501048
@checkbox-size: 16px;
10511049

10521050
.k-checkbox-label,

styles/web/kendo.common-office365.less

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@
195195
@spreadsheet-drawing-handle-border-width: 1px;
196196

197197

198+
// Notification
199+
@notification-border-width: 1px;
200+
201+
@notification-padding-x: 1.75em;
202+
@notification-padding-y: 1.75em;
203+
@notification-padding-end: 1.75em;
204+
205+
@notification-icon-spacing: 4px;
206+
207+
198208
@import "common/all.less";
199209

200210
.k-grid .k-header,
@@ -285,10 +295,6 @@
285295
padding: 0 6px;
286296
}
287297

288-
.k-notification {
289-
padding: 1.75em;
290-
}
291-
292298
.k-numerictextbox .k-link .k-i-arrow-60-up {
293299
vertical-align: bottom;
294300
}

0 commit comments

Comments
 (0)