Skip to content

Commit 66ae6bd

Browse files
author
User Jenkins
committed
Sync with Kendo UI Professional
1 parent a7dbad5 commit 66ae6bd

File tree

6 files changed

+111
-10
lines changed

6 files changed

+111
-10
lines changed

docs-aspnet/styles-and-layout/sass-theme-builder.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ To customize an existing theme, use the following Sass Theme Builder features:
6565
1. Color swatches—Contains predefined color palettes that you can apply to all components in your application.
6666
1. Default—Provides the applicable color customization options.
6767
1. Selected Components—List of components to include in the preview and the final CSS bundle.
68-
1. Download—Downloads the archive that holds the generated style files after the customization completes. When you click the button, a dialog appears and prompts you to name your theme.
68+
1. Download—Downloads the archive that holds the generated style files after the customization completes. When you click the button, a dialog appears and prompts you to name your theme. The archive contains a css, scss and a json file. The json file contains information on the modified variables of the customized theme.
6969

7070
**Figure 3: Available options for customization**
7171

@@ -74,9 +74,15 @@ To customize an existing theme, use the following Sass Theme Builder features:
7474
To upload an existing theme you have previously created:
7575

7676
1. On the initial Sass Theme Builder pane, select **Import Theme**.
77-
1. Upload the `variables.scss` file which contains your current modifications of the customized theme. As a result, the selected components and styling elements load.
77+
1. Upload the `MyThemeName.json` file which contains information on the modified variables of the customized theme. As a result, the selected components and styling elements load.
7878
1. Start customizing your theme.
7979

80+
> Previous version of the Sass Theme Builder required the upload of the `variables.scss` file which contains the modifications of the customized theme. If you need to customize a theme generated with a previous version of the Sass Theme Builder, you can:
81+
82+
> * Download a theme from the new version,
83+
> * Update the generated json with the variable values from your scss file and
84+
> * Upload the json to the Sass Theme Builder to continue customization.
85+
8086
**Figure 4: Importing themes for customization**
8187

8288
![Themebuilder import existing theme](images/theme-builder-import-existing-theme-{{ site.framework_short }}.png)

docs/api/javascript/ui/editor.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4945,6 +4945,7 @@ A promise that will be resolved when the export completes.
49454945
<textarea id="editor"></textarea>
49464946
<script>
49474947
$("#editor").kendoEditor({
4948+
tools: ["pdf"],
49484949
pdfExport: function(e) {
49494950
}
49504951
});
@@ -4956,7 +4957,9 @@ A promise that will be resolved when the export completes.
49564957
<script>
49574958
function onEditorExport(e) {
49584959
}
4959-
$("#editor").kendoEditor();
4960+
$("#editor").kendoEditor({
4961+
tools: ["pdf"]
4962+
});
49604963
var editor = $("#editor").data("kendoEditor");
49614964
editor.bind("pdfExport", onEditorExport);
49624965
</script>

docs/api/javascript/ui/filter.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,14 @@ The text messages displayed in the filter. Use it to customize or localize the f
499499
});
500500
</script>
501501

502+
### messages.addExpression `String` *(default: "Add Expression")*
503+
504+
The title of the add expression button.
505+
506+
### messages.addGroup `String` *(default: "Add Group")*
507+
508+
The title of the add group button.
509+
502510
### messages.and `String` *(default: "And")*
503511

504512
The text of the option which represents the "and" logical operation.
@@ -507,6 +515,18 @@ The text of the option which represents the "and" logical operation.
507515

508516
The text inside the apply button.
509517

518+
### messages.close `String` *(default: "Close")*
519+
520+
The title of the close button.
521+
522+
### messages.fields `String` *(default: "Fields")*
523+
524+
The title of the fields drop down.
525+
526+
### messages.operators `String` *(default: "Operators")*
527+
528+
The title of the operators drop down.
529+
510530
### messages.or `String` *(default: "Or")*
511531

512532
The text of the option which represents the "or" logical operation.

docs/api/javascript/ui/radiogroup.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,11 +413,11 @@ The widget instance which fired the event.
413413

414414
The `<input type="radio">` DOM element that triggered the change.
415415

416-
##### e.oldValue `Number`
416+
##### e.oldValue `String`
417417

418418
The previous value of the widget.
419419

420-
##### e.newValue `Number`
420+
##### e.newValue `String`
421421

422422
The new value of the widget.
423423

@@ -427,7 +427,7 @@ The new value of the widget.
427427

428428
<script>
429429
$("#radiogroup").kendoRadioGroup({
430-
items: [ "one", "two", "three" ]
430+
items: [ "one", "two", "three" ],
431431
change: function (e) {
432432
/* The result can be observed in the DevTools(F12) console of the browser. */
433433
console.log(e.target);
@@ -459,7 +459,7 @@ The `<input type="radio">` DOM element that triggered the change.
459459

460460
<script>
461461
$("#radiogroup").kendoRadioGroup({
462-
items: [ "one", "two", "three" ]
462+
items: [ "one", "two", "three" ],
463463
focus: function (e) {
464464
/* The result can be observed in the DevTools(F12) console of the browser. */
465465
console.log(e.target);
@@ -491,7 +491,7 @@ The `<input type="radio">` DOM element that triggered the event.
491491

492492
<script>
493493
$("#radiogroup").kendoRadioGroup({
494-
items: [ "one", "two", "three" ]
494+
items: [ "one", "two", "three" ],
495495
select: function (e) {
496496
if(e.target.val() === "two") {
497497
// Prevent selection if clicking on the "two" radio button

docs/controls/scheduling/scheduler/timezones.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,78 @@ The following example demonstrates how to bind the Scheduler to UTC dates when t
9999
</script>
100100
````
101101

102+
## Schedulers with a timezone option set
103+
When the `timezone` option is set the events in the Scheduler will be displayed with respect to the configuration, regardless of the local timezone.
104+
105+
> The **kendo.timezones.min.js** file must be included in order to use timezones other than "Etc/UTC".
106+
107+
> The **timezone** option will not affect events if the widget's data source is initialized separately. In this case set the [schema.timezone](/api/javascript/data/schedulerdatasource/configuration/schema.timezone) option directly.
108+
109+
In the example below, the event will be displayed in the **Europe/Berlin** timezone. It will be displayed as scheduled for 4:00pm, regardless of your location.
110+
111+
````dojo
112+
<div id="scheduler"></div>
113+
<script>
114+
var version = kendo.version;
115+
116+
$.getScript( 'https://kendo.cdn.telerik.com/'+version+'/js/kendo.timezones.min.js', loadScheduler);
117+
118+
function loadScheduler() {
119+
$("#scheduler").kendoScheduler({
120+
timezone: "Europe/Berlin",
121+
date: new Date("2013/6/13"),
122+
startTime: new Date("2013/6/13 10:00"),
123+
endTime: new Date("2013/6/13 23:00"),
124+
height: 600,
125+
views: ["day"],
126+
editable: false,
127+
dataSource: [
128+
{
129+
title: "The Internship",
130+
start: new Date("2013-06-13T14:00:00.000Z"),
131+
end: new Date("2013-06-13T15:30:00.000Z")
132+
}
133+
]
134+
});
135+
}
136+
</script>
137+
````
138+
139+
## Schedulers with a startTimezone and endTimezone option
140+
141+
The startTimezone and endTimezone of each single event can be used to define which is the start and end timezone of the client where the event will be displayed. The example below demonstrates how events could be displayed starting at different time depending on the startTimezone and endTimezone configured.
142+
143+
````dojo
144+
<div id="scheduler"></div>
145+
<script>
146+
var version = kendo.version;
147+
$.getScript( 'https://kendo.cdn.telerik.com/'+version+'/js/kendo.timezones.min.js', function( data, textStatus, jqxhr ) {
148+
$("#scheduler").kendoScheduler({
149+
date: new Date("2013/6/13"),
150+
startTime: new Date("2013/6/13 10:00"),
151+
endTime: new Date("2013/6/13 23:00"),
152+
height: 600,
153+
views: ["day"],
154+
editable: false,
155+
dataSource: [
156+
{
157+
title: "No start/endTimezone set",
158+
start: new Date("2013-06-13T14:00:00.000Z"),
159+
end: new Date("2013-06-13T15:30:00.000Z")
160+
},
161+
{
162+
title: "Event Europe/Berlin",
163+
start: new Date("2013-06-13T14:00:00.000Z"),
164+
end: new Date("2013-06-13T15:30:00.000Z"),
165+
startTimezone: "Europe/Berlin",
166+
endTimezone: "Europe/Berlin"
167+
}
168+
]
169+
});
170+
});
171+
</script>
172+
````
173+
102174
## See Also
103175

104176
* [Basic Usage of the Scheduler (Demo)](https://demos.telerik.com/kendo-ui/scheduler/index)

typescript/kendo.all.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8103,8 +8103,8 @@ declare namespace kendo.ui {
81038103

81048104
interface RadioGroupChangeEvent extends RadioGroupEvent {
81058105
target?: JQuery;
8106-
oldValue?: number;
8107-
newValue?: number;
8106+
oldValue?: string;
8107+
newValue?: string;
81088108
}
81098109

81108110
interface RadioGroupFocusEvent extends RadioGroupEvent {

0 commit comments

Comments
 (0)