Sync with Kendo UI Professional

Kendo Bot · Kendo Bot · commit 707ec1c8ccee · 2020-02-14T04:59:04.000+02:00
diff --git a/src/kendo.colorpicker.js b/src/kendo.colorpicker.js
@@ -35,6 +35,7 @@ var __meta__ = { // jshint ignore:line
         NS = ".kendoColorTools",
         CLICK_NS = "click" + NS,
         KEYDOWN_NS = "keydown" + NS,
+        DISABLED = "k-state-disabled",
 
         browser = kendo.support.browser,
         isIE8 = browser.msie && browser.version < 9;
@@ -93,10 +94,9 @@ var __meta__ = { // jshint ignore:line
             if (arguments.length === 0) {
                 enable = true;
             }
-            $(".k-disabled-overlay", this.wrapper).remove();
-            if (!enable) {
-                this.wrapper.append("<div class='k-disabled-overlay'></div>");
-            }
+
+            this.wrapper.toggleClass(DISABLED, !enable);
+
             this._onEnable(enable);
         },
         _select: function(color, nohooks) {
diff --git a/src/kendo.core.js b/src/kendo.core.js
@@ -4513,12 +4513,8 @@ function pad(number, digits, end) {
         var groups = Object.keys(fileTypeMap);
         var type = "file";
 
-        if (extension === undefined) {
-            return "";
-        }
-
-        if (extension === "") {
-            return "folder";
+        if (extension === undefined || !extension.length) {
+            return type;
         }
 
         for (var i = 0; i < groups.length; i += 1) {
diff --git a/styles/web/common/gantt.less b/styles/web/common/gantt.less
@@ -284,19 +284,18 @@
 }
 
 // Lines
-
-.k-line-h,
-.k-line-v
+.k-gantt-line-h,
+.k-gantt-line-v
 {
     position: absolute;
 }
 
-.k-line-h
+.k-gantt-line-h
 {
     height: 2px;
 }
 
-.k-line-v
+.k-gantt-line-v
 {
     width: 2px;
 }
@@ -397,7 +396,7 @@
 }
 
 .k-task-wrap:hover,
-.k-line.k-state-selected
+.k-gantt-line.k-state-selected
 {
     z-index: 3;
 }
@@ -624,7 +623,7 @@
     display: block;
 }
 
-.k-dependency-hint
+.k-gantt-dependency-hint
 {
     z-index: 4;
 }
diff --git a/styles/web/common/inputs.less b/styles/web/common/inputs.less
@@ -756,17 +756,6 @@ span.k-numerictextbox {
     -webkit-appearance: none;
 }
 
-.k-disabled-overlay {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: #fff;
-    opacity: 0.5;
-    filter: alpha(opacity=50);
-}
-
 .k-rtl .k-multiselect-wrap {
     padding-right: 0;
     padding-left: (@grid-size + (@grid-size/4 + 2px));
diff --git a/styles/web/type-bootstrap.less b/styles/web/type-bootstrap.less
@@ -1813,13 +1813,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-default.less b/styles/web/type-default.less
@@ -1871,13 +1871,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-fiori.less b/styles/web/type-fiori.less
@@ -1921,13 +1921,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-flat.less b/styles/web/type-flat.less
@@ -1803,13 +1803,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-highcontrast.less b/styles/web/type-highcontrast.less
@@ -1821,13 +1821,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-material.less b/styles/web/type-material.less
@@ -1915,13 +1915,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
@@ -2882,11 +2882,11 @@ td.k-group-cell,
 .k-gantt .k-treelist .k-alt.k-state-selected,
 .k-gantt .k-treelist .k-alt.k-state-selected > td,
 .k-listview > .k-state-selected,
-.k-state-selected.k-line {
+.k-state-selected.k-gantt-line {
     background-color: @selected-background;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     color: @selected-background;
 }
diff --git a/styles/web/type-metro.less b/styles/web/type-metro.less
@@ -1863,13 +1863,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/styles/web/type-nova.less b/styles/web/type-nova.less
@@ -1802,12 +1802,12 @@ table:not(.k-scheduler-dayview) .k-scheduler-header-wrap .k-today {
     border-color: @accent;
 }
 
-.k-line {
+.k-gantt-line {
     background-color: @normal-text-color;
     color: @normal-text-color;
 }
 
-.k-state-selected.k-line {
+.k-state-selected.k-gantt-line {
     background-color: @accent;
     color: @accent;
 }
diff --git a/styles/web/type-office365.less b/styles/web/type-office365.less
@@ -1876,13 +1876,13 @@ div.k-filebrowser-dropzone em
     border-color: @selected-border-color;
 }
 
-.k-line
+.k-gantt-line
 {
     background-color: @widget-text-color;
     color: @widget-text-color;
 }
 
-.k-state-selected.k-line
+.k-state-selected.k-gantt-line
 {
     background-color: @selected-background-color;
     color: @selected-background-color;
diff --git a/tests/colorpicker/initialization.js b/tests/colorpicker/initialization.js
@@ -35,6 +35,25 @@
             assert.isOk($.isEmptyObject(cp._hsvEvents._events));
         });
 
+        it("receives k-state-disabled class when disabled", function() {
+            var dom = $("<div tabindex='5' />").appendTo(Mocha.fixture).kendoFlatColorPicker();
+            var cp = dom.data("kendoFlatColorPicker");
+
+            cp.enable(false);
+
+            assert.isOk(cp.wrapper.hasClass("k-state-disabled"));
+        });
+
+        it("removes k-state-disabled class when enabled", function() {
+            var dom = $("<div tabindex='5' />").appendTo(Mocha.fixture).kendoFlatColorPicker();
+            var cp = dom.data("kendoFlatColorPicker");
+
+            cp.enable(false);
+            cp.enable();
+
+            assert.isOk(!cp.wrapper.hasClass("k-state-disabled"));
+        });
+
     });
 }());
 
@@ -126,6 +145,29 @@
 
             cp.toggle();
         });
+
+        it("receives k-state-disabled class when disabled", function() {
+            expect(0);
+
+            var dom = $("<input disabled='disabled' />").appendTo(Mocha.fixture).kendoColorPicker();
+            var cp = dom.data("kendoColorPicker");
+
+            cp.enable(false);
+
+            assert.isOk(cp.wrapper.hasClass("k-state-disabled"));
+        });
+
+        it("removes k-state-disabled class when enabled", function() {
+            expect(0);
+
+            var dom = $("<input disabled='disabled' />").appendTo(Mocha.fixture).kendoColorPicker();
+            var cp = dom.data("kendoColorPicker");
+
+            cp.enable(false);
+            cp.enable();
+
+            assert.isOk(!cp.wrapper.hasClass("k-state-disabled"));
+        });
     });
 }());
 
@@ -142,5 +184,24 @@
             cp.enable(true);
             assert.equal(cp.wrapper.attr("tabIndex"), 5);
         });
+
+        it("receives k-state-disabled class when disabled", function() {
+            var dom = $("<div tabindex='5' />").appendTo(Mocha.fixture).kendoColorPalette();
+            var cp = dom.data("kendoColorPalette");
+
+            cp.enable(false);
+
+            assert.isOk(cp.wrapper.hasClass("k-state-disabled"));
+        });
+
+        it("removes k-state-disabled class when enabled", function() {
+            var dom = $("<div tabindex='5' />").appendTo(Mocha.fixture).kendoColorPalette();
+            var cp = dom.data("kendoColorPalette");
+
+            cp.enable(false);
+            cp.enable();
+
+            assert.isOk(!cp.wrapper.hasClass("k-state-disabled"));
+        });
     });
 }());

Original file line number	Diff line number	Diff line change
`@@ -284,19 +284,18 @@`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`// Lines`
`287`		`-`
`288`		`-.k-line-h,`
`289`		`-.k-line-v`
	`287`	`+.k-gantt-line-h,`
	`288`	`+.k-gantt-line-v`
`290`	`289`	`{`
`291`	`290`	`position: absolute;`
`292`	`291`	`}`
`293`	`292`
`294`		`-.k-line-h`
	`293`	`+.k-gantt-line-h`
`295`	`294`	`{`
`296`	`295`	`height: 2px;`
`297`	`296`	`}`
`298`	`297`
`299`		`-.k-line-v`
	`298`	`+.k-gantt-line-v`
`300`	`299`	`{`
`301`	`300`	`width: 2px;`
`302`	`301`	`}`
`@@ -397,7 +396,7 @@`
`397`	`396`	`}`
`398`	`397`
`399`	`398`	`.k-task-wrap:hover,`
`400`		`-.k-line.k-state-selected`
	`399`	`+.k-gantt-line.k-state-selected`
`401`	`400`	`{`
`402`	`401`	`z-index: 3;`
`403`	`402`	`}`
`@@ -624,7 +623,7 @@`
`624`	`623`	`display: block;`
`625`	`624`	`}`
`626`	`625`
`627`		`-.k-dependency-hint`
	`626`	`+.k-gantt-dependency-hint`
`628`	`627`	`{`
`629`	`628`	`z-index: 4;`
`630`	`629`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1813,13 +1813,13 @@ div.k-filebrowser-dropzone em`
`1813`	`1813`	`border-color: @selected-border-color;`
`1814`	`1814`	`}`
`1815`	`1815`
`1816`		`-.k-line`
	`1816`	`+.k-gantt-line`
`1817`	`1817`	`{`
`1818`	`1818`	`background-color: @widget-text-color;`
`1819`	`1819`	`color: @widget-text-color;`
`1820`	`1820`	`}`
`1821`	`1821`
`1822`		`-.k-state-selected.k-line`
	`1822`	`+.k-state-selected.k-gantt-line`
`1823`	`1823`	`{`
`1824`	`1824`	`background-color: @selected-background-color;`
`1825`	`1825`	`color: @selected-background-color;`
Original file line number	Diff line number	Diff line change
`@@ -1871,13 +1871,13 @@ div.k-filebrowser-dropzone em`
`1871`	`1871`	`border-color: @selected-border-color;`
`1872`	`1872`	`}`
`1873`	`1873`
`1874`		`-.k-line`
	`1874`	`+.k-gantt-line`
`1875`	`1875`	`{`
`1876`	`1876`	`background-color: @widget-text-color;`
`1877`	`1877`	`color: @widget-text-color;`
`1878`	`1878`	`}`
`1879`	`1879`
`1880`		`-.k-state-selected.k-line`
	`1880`	`+.k-state-selected.k-gantt-line`
`1881`	`1881`	`{`
`1882`	`1882`	`background-color: @selected-background-color;`
`1883`	`1883`	`color: @selected-background-color;`
Original file line number	Diff line number	Diff line change
`@@ -1921,13 +1921,13 @@ div.k-filebrowser-dropzone em`
`1921`	`1921`	`border-color: @selected-border-color;`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`		`-.k-line`
	`1924`	`+.k-gantt-line`
`1925`	`1925`	`{`
`1926`	`1926`	`background-color: @widget-text-color;`
`1927`	`1927`	`color: @widget-text-color;`
`1928`	`1928`	`}`
`1929`	`1929`
`1930`		`-.k-state-selected.k-line`
	`1930`	`+.k-state-selected.k-gantt-line`
`1931`	`1931`	`{`
`1932`	`1932`	`background-color: @selected-background-color;`
`1933`	`1933`	`color: @selected-background-color;`
Original file line number	Diff line number	Diff line change
`@@ -1803,13 +1803,13 @@ div.k-filebrowser-dropzone em`
`1803`	`1803`	`border-color: @selected-border-color;`
`1804`	`1804`	`}`
`1805`	`1805`
`1806`		`-.k-line`
	`1806`	`+.k-gantt-line`
`1807`	`1807`	`{`
`1808`	`1808`	`background-color: @widget-text-color;`
`1809`	`1809`	`color: @widget-text-color;`
`1810`	`1810`	`}`
`1811`	`1811`
`1812`		`-.k-state-selected.k-line`
	`1812`	`+.k-state-selected.k-gantt-line`
`1813`	`1813`	`{`
`1814`	`1814`	`background-color: @selected-background-color;`
`1815`	`1815`	`color: @selected-background-color;`
Original file line number	Diff line number	Diff line change
`@@ -1821,13 +1821,13 @@ div.k-filebrowser-dropzone em`
`1821`	`1821`	`border-color: @selected-border-color;`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`		`-.k-line`
	`1824`	`+.k-gantt-line`
`1825`	`1825`	`{`
`1826`	`1826`	`background-color: @widget-text-color;`
`1827`	`1827`	`color: @widget-text-color;`
`1828`	`1828`	`}`
`1829`	`1829`
`1830`		`-.k-state-selected.k-line`
	`1830`	`+.k-state-selected.k-gantt-line`
`1831`	`1831`	`{`
`1832`	`1832`	`background-color: @selected-background-color;`
`1833`	`1833`	`color: @selected-background-color;`
Original file line number	Diff line number	Diff line change
`@@ -1915,13 +1915,13 @@ div.k-filebrowser-dropzone em`
`1915`	`1915`	`border-color: @selected-border-color;`
`1916`	`1916`	`}`
`1917`	`1917`
`1918`		`-.k-line`
	`1918`	`+.k-gantt-line`
`1919`	`1919`	`{`
`1920`	`1920`	`background-color: @widget-text-color;`
`1921`	`1921`	`color: @widget-text-color;`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`		`-.k-state-selected.k-line`
	`1924`	`+.k-state-selected.k-gantt-line`
`1925`	`1925`	`{`
`1926`	`1926`	`background-color: @selected-background-color;`
`1927`	`1927`	`color: @selected-background-color;`
`@@ -2882,11 +2882,11 @@ td.k-group-cell,`
`2882`	`2882`	`.k-gantt .k-treelist .k-alt.k-state-selected,`
`2883`	`2883`	`.k-gantt .k-treelist .k-alt.k-state-selected > td,`
`2884`	`2884`	`.k-listview > .k-state-selected,`
`2885`		`-.k-state-selected.k-line {`
	`2885`	`+.k-state-selected.k-gantt-line {`
`2886`	`2886`	`background-color: @selected-background;`
`2887`	`2887`	`}`
`2888`	`2888`
`2889`		`-.k-state-selected.k-line`
	`2889`	`+.k-state-selected.k-gantt-line`
`2890`	`2890`	`{`
`2891`	`2891`	`color: @selected-background;`
`2892`	`2892`	`}`