Sync with Kendo UI Professional

Author: Kendo Bot

docs/api/javascript/ui/grid.md

@@ -7995,7 +7995,7 @@ Defines a list of fields which will be included in the search. If values for the
     </script>
 
 
-### selectable `Boolean|String` *(default: false)*
+### selectable `Boolean|String|Object` *(default: false)*
 
 If set to `true` the user would be able to select grid rows. By default selection is disabled.
 
@@ -8044,6 +8044,62 @@ Can also be set to the following string values:
 
 > Check [Selection](https://demos.telerik.com/kendo-ui/grid/selection) for a live demo.
 
+### selectable.mode `String`
+
+Can be set to the following string values:
+
+- "row" - the user can select a single row.
+- "cell" - the user can select a single cell.
+- "multiple, row" - the user can select multiple rows.
+- "multiple, cell" - the user can select multiple cells.
+
+> When the selectable property is set to "multiple, row" or "multiple, cell" the Grid cannot be scrollable on mobile devices as both are listening on the same event.
+
+#### Example
+
+    <div id="grid"></div>
+    <script>
+    $("#grid").kendoGrid({
+      columns: [
+        { field: "name" },
+        { field: "age" }
+      ],
+      dataSource: [
+        { name: "Jane Doe", age: 30 },
+        { name: "John Doe", age: 33 }
+      ],
+      selectable: {
+        mode: "multiple, row"
+      }
+    });
+    </script>
+
+### selectable.ignoreOverlapped `Boolean`
+
+When set to true, visually hidden elements that match by the filter option criteria but are overlapped by other elements that also can be selected, are ignored.
+
+> Applies only for multiple cell selection.
+
+#### Example
+
+    <div id="grid"></div>
+    <script>
+    $("#grid").kendoGrid({
+      columns: [
+        { field: "name" },
+        { field: "age" }
+      ],
+      dataSource: [
+        { name: "Jane Doe", age: 30 },
+        { name: "John Doe", age: 33 }
+      ],
+      selectable: {
+        mode: "multiple, cell",
+        ignoreOverlapped: true
+      }
+    });
+    </script>
+
 ### sortable `Boolean|Object` *(default: false)*
 
 If set to `true` the user could sort the grid by clicking the column header cells. By default sorting is disabled.

docs/api/javascript/ui/window.md

@@ -942,7 +942,7 @@ Indicates whether the content will be fetched within an `iframe` or with AJAX, a
 
 ### restore
 
-Restores a maximized or minimized Window to its previous state. Triggers the `resize` event.
+Restores a maximized or minimized Window to its previous state. Triggers the `resize` and `restore` events.
 
 #### Returns
 
@@ -1389,3 +1389,33 @@ Triggered when the user resizes the Window.
     var dialog = $("#dialog").data("kendoWindow");
     dialog.bind("resize", window_resize);
     </script>
+
+### restore
+
+Triggered when the Window is restored to its previous state(maximized or minimized) by pressing the restore button, or when the [`restore()`](/api/javascript/ui/window/methods/restore) method is called.
+
+#### Example - subscribing to the restore event during initialization
+
+    <div id="dialog"></div>
+
+    <script>
+      $("#dialog").kendoWindow({
+        restore: function() {
+          // the Window is back to its previous state
+        }
+      });
+    </script>
+
+#### Example - subscribing to the restore event after initialization
+
+    <div id="dialog"></div>
+
+    <script>
+      function window_restore() {
+        // the Window is back to its previous state
+      }
+
+      var dialog = $("#dialog").kendoWindow().getKendoWindow();
+
+      dialog.bind("restore", window_restore);
+    </script>

src/kendo.calendar.js

@@ -118,6 +118,9 @@ var __meta__ = { // jshint ignore:line
 
             if (that.options.hasFooter) {
                 that._footer(that.footer);
+            } else {
+                that._today = that.element.find('a.k-today');
+                that._toggle();
             }
 
             id = element
@@ -270,6 +273,7 @@ var __meta__ = { // jshint ignore:line
                 that._footer(that.footer);
             } else {
                 that.element.find(".k-footer").hide();
+                that._toggle();
             }
             that._index = views[that.options.start];
 
@@ -1262,7 +1266,8 @@ var __meta__ = { // jshint ignore:line
             var that = this,
                 options = that.options,
                 isTodayDisabled = that.options.disableDates(getToday()),
-                link = that._today;
+                link = that._today,
+                todayClass = that._todayClass();
 
             if (toggle === undefined) {
                 toggle = isInRange(getToday(), options.min, options.max);
@@ -1272,17 +1277,21 @@ var __meta__ = { // jshint ignore:line
                 link.off(CLICK);
 
                 if (toggle && !isTodayDisabled) {
-                    link.addClass(TODAY)
+                    link.addClass(todayClass)
                     .removeClass(DISABLED)
                     .on(CLICK, proxy(that._todayClick, that));
                 } else {
-                    link.removeClass(TODAY)
+                    link.removeClass(todayClass)
                     .addClass(DISABLED)
                     .on(CLICK, prevent);
                 }
             }
         },
 
+        _todayClass: function() {
+            return this.options.componentType === "modern" ? "k-today" : TODAY;
+        },
+
         _todayClick: function(e) {
             var that = this,
             depth = views[that.options.depth],

src/kendo.data.js

@@ -1909,7 +1909,7 @@ var __meta__ = { // jshint ignore:line
         if (customGroupSort) {
             query = query.group(group, data, options);
 
-            if (skip !== undefined && take !== undefined) {
+            if (skip !== undefined && take !== undefined && !options.groupPaging) {
                 query = new Query(flatGroups(query.toArray())).range(skip, take);
 
                 groupDescriptorsWithoutSort = map(groupDescriptorsWithoutCompare, function(groupDescriptor) {

src/kendo.datepicker.js

@@ -187,7 +187,9 @@ var __meta__ = { // jshint ignore:line
         },
 
         close: function() {
-            this.popup.close();
+            if (this.popup) {
+                this.popup.close();
+            }
         },
 
         min: function(value) {

src/kendo.datetimepicker.js

@@ -994,8 +994,8 @@ var __meta__ = { // jshint ignore:line
                 .appendTo(document.body);
 
             div.append(kendo.template(SINGLE_POPUP_TEMPLATE)(that.options));
-            that.popup = new ui.Popup(div, extend(options.popup, options, { 
-                name: "Popup", 
+            that.popup = new ui.Popup(div, extend(options.popup, options, {
+                name: "Popup",
                 isRtl: kendo.support.isRtl(that.wrapper),
                 anchor: that.wrapper,
                 activate: function () {
@@ -1005,7 +1005,10 @@ var __meta__ = { // jshint ignore:line
                         that.timeView._updateRanges();
                     }
                 },
-                open: function(){
+                open: function(e){
+                    if (that.trigger(OPEN, {view: this.element.find('.k-date-tab').length ? 'date' : 'time', sender: that})) {
+                        e.preventDefault();
+                    }
                     that.timeView._updateTitle();
                 }
             }));
@@ -1034,6 +1037,8 @@ var __meta__ = { // jshint ignore:line
         },
 
         _switchToTimeView: function() {
+            this.timeView.addTranslate();
+            this.timeView.applyValue(this._value);
             this.timeView._updateRanges();
             this.popup.element.find(".k-group-start, .k-group-end").removeClass(STATE_ACTIVE).eq(1).addClass(STATE_ACTIVE);
             this.popup.element.find(".k-datetime-wrap").removeClass("k-date-tab").addClass("k-time-tab");
@@ -1054,9 +1059,10 @@ var __meta__ = { // jshint ignore:line
 
         _setClickHandler: function() {
             var value = this._applyDateValue();
-            var time = this.timeView._currentlySelected || new Date();
+            var time;
 
             value = value || new Date();
+            time = this.timeView._currentlySelected || value;
             this.timeView._updateCurrentlySelected();
             value.setHours(time.getHours());
             value.setMinutes(time.getMinutes());

src/kendo.listview.js

@@ -71,6 +71,8 @@ var __meta__ = { // jshint ignore:line
 
             that._dataSource();
 
+            that._setContentHeight();
+
             that._templates();
 
             that._navigatable();
@@ -301,6 +303,18 @@ var __meta__ = { // jshint ignore:line
 
         },
 
+        _setContentHeight: function() {
+            var that = this,
+                options = that.options,
+                height;
+
+            if (options.scrollable && that.wrapper.is(":visible")) {
+
+                height = that.wrapper.innerHeight();
+                that.content.height(height);
+            }
+        },
+
         refresh: function(e) {
             var that = this,
                 view = that.dataSource.view(),
@@ -397,6 +411,7 @@ var __meta__ = { // jshint ignore:line
                 }
             }
 
+            that._setContentHeight();
             that._angularItems("compile");
 
             that._progress(false);

src/kendo.selectable.js

@@ -25,7 +25,8 @@ var __meta__ = { // jshint ignore:line
         UNSELECTING = "k-state-unselecting",
         INPUTSELECTOR = "input,a,textarea,.k-multiselect-wrap,select,button,.k-button>span,.k-button>img,span.k-icon.k-i-arrow-60-down,span.k-icon.k-i-arrow-60-up,label.k-checkbox-label.k-no-text,.k-icon.k-i-collapse,.k-icon.k-i-expand,span.k-numeric-wrap,.k-focusable",
         msie = kendo.support.browser.msie,
-        supportEventDelegation = false;
+        supportEventDelegation = false,
+        extend = $.extend;
 
         (function($) {
             (function() {
@@ -83,7 +84,8 @@ var __meta__ = { // jshint ignore:line
             filter: ">*",
             inputSelectors: INPUTSELECTOR,
             multiple: false,
-            relatedTarget: $.noop
+            relatedTarget: $.noop,
+            ignoreOverlapped: false
         },
 
         _isElement: function(target) {
@@ -234,6 +236,8 @@ var __meta__ = { // jshint ignore:line
                 related,
                 toSelect;
 
+            this._currentlyActive = [];
+
             for (idx = 0, length = items.length; idx < length; idx ++) {
                 toSelect = items.eq(idx);
                 related = toSelect.add(this.relatedTarget(toSelect));
@@ -243,9 +247,10 @@ var __meta__ = { // jshint ignore:line
                         if(ctrlKey && target !== toSelect[0]) {
                             related.removeClass(SELECTED).addClass(UNSELECTING);
                         }
-                    } else if (!toSelect.hasClass(ACTIVE) && !toSelect.hasClass(UNSELECTING)) {
+                    } else if (!toSelect.hasClass(ACTIVE) && !toSelect.hasClass(UNSELECTING) && !this._collidesWithActiveElement(related, position)) {
                         related.addClass(ACTIVE);
                     }
+                    this._currentlyActive.push(related[0]);
                 } else {
                     if (toSelect.hasClass(ACTIVE)) {
                         related.removeClass(ACTIVE);
@@ -256,6 +261,36 @@ var __meta__ = { // jshint ignore:line
             }
         },
 
+        _collidesWithActiveElement: function (element, marqueeRect) {
+            if (!this.options.ignoreOverlapped) {
+                return false;
+            }
+
+            var activeElements = this._currentlyActive;
+            var elemRect = element[0].getBoundingClientRect();
+            var activeElementRect;
+            var collision = false;
+            var isRtl = kendo.support.isRtl(element);
+            var leftRight = isRtl ? "right" : "left";
+            var tempRect = {};
+
+            marqueeRect.right = marqueeRect.left + marqueeRect.width;
+            marqueeRect.bottom = marqueeRect.top + marqueeRect.height;
+
+            for (var i = 0; i < activeElements.length; i++) {
+                activeElementRect = activeElements[i].getBoundingClientRect();
+                if (overlaps(elemRect, activeElementRect)) {
+                    tempRect[leftRight] = leftRight === "left" ? activeElementRect.right : activeElementRect.left;
+                    elemRect = extend({}, elemRect, tempRect);
+                    if (elemRect.left > elemRect.right) {
+                        return true;
+                    }
+                    collision = !overlaps(elemRect, marqueeRect);
+                }
+            }
+            return collision;
+        },
+
         value: function(val, e) {
             var that = this,
                 selectElement = proxy(that._selectElement, that);
@@ -396,7 +431,8 @@ var __meta__ = { // jshint ignore:line
     });
 
     Selectable.parseOptions = function(selectable) {
-        var asLowerString = typeof selectable === "string" && selectable.toLowerCase();
+        var selectableMode = selectable.mode || selectable;
+        var asLowerString = typeof selectableMode === "string" && selectableMode.toLowerCase();
 
         return {
             multiple: asLowerString && asLowerString.indexOf("multiple") > -1,
@@ -422,6 +458,13 @@ var __meta__ = { // jshint ignore:line
             elementPosition.bottom < position.top);
     }
 
+    function overlaps(firstRect, secondRect) {
+        return !(firstRect.right <= secondRect.left ||
+            firstRect.left >= secondRect.right ||
+            firstRect.bottom <= secondRect.top ||
+            firstRect.top >= secondRect.bottom);
+    }
+
     kendo.ui.plugin(Selectable);
 
 })(window.kendo.jQuery);