Sync with Kendo UI Professional

Author: Kendo Bot

docs/api/javascript/ui/grid.md

@@ -9848,8 +9848,6 @@ Fired when the user try to edit or create a data item, before the editor is crea
 
 The event handler function context (available via the `this` keyword) will be set to the widget instance.
 
-The event will be fired only when the Grid is `selectable`.
-
 #### Event Data
 
 ##### e.model `kendo.data.Model`
@@ -10105,6 +10103,8 @@ Fired when the user selects a table row or cell in the grid.
 
 The event handler function context (available via the `this` keyword) will be set to the widget instance.
 
+The event will be fired only when the Grid is [`selectable`](/api/javascript/ui/grid/configuration/selectable).
+
 #### Event Data
 
 ##### e.sender `kendo.ui.Grid`

src/kendo.colorpicker.js

@@ -668,6 +668,8 @@ var __meta__ = { // jshint ignore:line
             var content = that.wrapper = $(that._template(options));
             element.hide().after(content);
 
+            that._inputWrapper = $(that.wrapper[0].firstChild);
+
             if (element.is("input")) {
                 element.appendTo(content);
 

src/kendo.toolbar.js

@@ -1209,20 +1209,30 @@ var __meta__ = { // jshint ignore:line
 
             show: function(candidate) {
                 var item = this._getItem(candidate);
+                var buttonGroupInstance;
 
                 if (item.toolbar) {
                     if (item.toolbar.options.type === "button" && item.toolbar.options.isChild) {
+                        buttonGroupInstance = item.toolbar.getParentGroup();
                         item.toolbar.show();
-                        item.toolbar.getParentGroup().refresh();
+
+                        if (buttonGroupInstance) {
+                            buttonGroupInstance.refresh();
+                        }
                     } else if(item.toolbar.options.hidden) {
                         item.toolbar.show();
                     }
                 }
 
                 if (item.overflow) {
                     if (item.overflow.options.type === "button" && item.overflow.options.isChild) {
+                        buttonGroupInstance = item.overflow.getParentGroup();
+
                         item.toolbar.show();
-                        item.overflow.getParentGroup().refresh();
+
+                        if (buttonGroupInstance) {
+                            buttonGroupInstance.refresh();
+                        }
                     } else if(item.overflow.options.hidden) {
                         item.overflow.show();
                     }

tests/colorpicker/initialization.js

@@ -168,6 +168,15 @@
 
             assert.isOk(!cp.wrapper.hasClass("k-state-disabled"));
         });
+
+        it("picker inner wrapper has correct class", function() {
+            expect(0);
+
+            var dom = $("<input />").appendTo(Mocha.fixture).kendoColorPicker();
+            var cp = dom.data("kendoColorPicker");
+
+            assert.isOk(cp._inputWrapper.hasClass("k-picker-wrap"));
+        });
     });
 }());
 

tests/toolbar/api.js

@@ -530,6 +530,23 @@
             assert.isOk($("#splitButton_wrapper").is(":visible"));
         });
 
+        it("Show method shows hidden button in SplitButton", function() {
+            var toolbar = container.kendoToolBar({
+                items: [{
+                    type: "splitButton",
+                    id: "splitButton",
+                    text: "split button",
+                    menuButtons: [
+                        { text: "foo", id: "foo" },
+                        { text: "bar", id: "bar", hidden: true }
+                    ]
+                }]
+            }).data("kendoToolBar");
+
+            toolbar.show($("#bar"));
+            assert.isOk(!$("#bar").hasClass(".k-hidden"));
+        });
+
         it("After showing hidden button the button group updates k-group-start button", function() {
             var toolbar = container.kendoToolBar({
                 items: [