Skip to content

Commit 3035baa

Browse files
committed
fix(window): Pin/unpin icon should show the respective action not window's state telerik/kendo#7059
1 parent 6f69417 commit 3035baa

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/kendo.window.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
var windowSpecificCommands = [ "maximize", "minimize" ];
374374

375375
actions = $.map(actions, function(action) {
376-
action = !pinned && action.toLowerCase() === "pin" ? "unpin" : action;
376+
action = pinned && action.toLowerCase() === "pin" ? "unpin" : action;
377377
return { name: (windowSpecificCommands.indexOf(action.toLowerCase()) > - 1) ? "window-" + action : action };
378378
});
379379

@@ -547,8 +547,8 @@
547547
"k-i-window-minimize": "minimize",
548548
"k-i-window-restore": "restore",
549549
"k-i-refresh": "refresh",
550-
"k-i-pin": "unpin",
551-
"k-i-unpin": "pin"
550+
"k-i-pin": "pin",
551+
"k-i-unpin": "unpin"
552552
}[iconClass];
553553
},
554554

@@ -1070,7 +1070,7 @@
10701070

10711071
if (!that.options.isMaximized) {
10721072
wrapper.css({position: "fixed", top: top - win.scrollTop(), left: left - win.scrollLeft()});
1073-
wrapper.children(KWINDOWTITLEBAR).find(KUNPIN).addClass("k-i-pin").removeClass("k-i-unpin");
1073+
wrapper.children(KWINDOWTITLEBAR).find(KPIN).addClass("k-i-unpin").removeClass("k-i-pin");
10741074

10751075
that.options.pinned = true;
10761076
that.options.draggable = false;
@@ -1086,7 +1086,7 @@
10861086

10871087
if (!that.options.isMaximized) {
10881088
wrapper.css({position: "", top: top + win.scrollTop(), left: left + win.scrollLeft()});
1089-
wrapper.children(KWINDOWTITLEBAR).find(KPIN).addClass("k-i-unpin").removeClass("k-i-pin");
1089+
wrapper.children(KWINDOWTITLEBAR).find(KUNPIN).addClass("k-i-pin").removeClass("k-i-unpin");
10901090

10911091
that.options.pinned = false;
10921092
that.options.draggable = true;

tests/window/api.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,13 @@
546546
actions: ["Pin"]
547547
});
548548

549-
equal(dialog.wrapper.find(".k-i-unpin").length, 1);
550-
equal(dialog.wrapper.find(".k-i-pin").length, 0);
549+
equal(dialog.wrapper.find(".k-i-pin").length, 1);
550+
equal(dialog.wrapper.find(".k-i-unpin").length, 0);
551551

552552
dialog.pin();
553553

554-
equal(dialog.wrapper.find(".k-i-pin").length, 1);
555-
equal(dialog.wrapper.find(".k-i-unpin").length, 0);
554+
equal(dialog.wrapper.find(".k-i-unpin").length, 1);
555+
equal(dialog.wrapper.find(".k-i-pin").length, 0);
556556
});
557557

558558
test("pin() substracts the browser scroll position from the wrapper's top and left styles", function() {
@@ -604,13 +604,13 @@
604604
pinned: true
605605
});
606606

607-
equal(dialog.wrapper.find(".k-i-pin").length, 1);
608-
equal(dialog.wrapper.find(".k-i-unpin").length, 0);
607+
equal(dialog.wrapper.find(".k-i-unpin").length, 1);
608+
equal(dialog.wrapper.find(".k-i-pin").length, 0);
609609

610610
dialog.unpin();
611611

612-
equal(dialog.wrapper.find(".k-i-unpin").length, 1);
613-
equal(dialog.wrapper.find(".k-i-pin").length, 0);
612+
equal(dialog.wrapper.find(".k-i-pin").length, 1);
613+
equal(dialog.wrapper.find(".k-i-unpin").length, 0);
614614
});
615615

616616
test("unpin() adds the browser scroll position to the wrapper's top and left styles", function() {
@@ -777,7 +777,7 @@
777777
dialog.maximize();
778778
dialog.restore();
779779

780-
equal(dialog.wrapper.find(".k-i-unpin:visible").length, 1);
780+
equal(dialog.wrapper.find(".k-i-pin:visible").length, 1);
781781
});
782782

783783
test("restore() removes the k-window-maximized class", function() {

tests/window/initialization.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420

421421
test("creating pinned window with a Pin command adds an Unpin button", function() {
422422
var dialog = createWindow({ pinned: true, actions: ["Pin"] });
423-
equal(dialog.wrapper.find(".k-i-pin").length, 1);
423+
equal(dialog.wrapper.find(".k-i-unpin").length, 1);
424424
});
425425

426426
test("creating window with an int zero top position applies a top style", function() {

0 commit comments

Comments
 (0)