Updated Branches: refs/heads/master 12ce76d17 -> 684b8363e
WICKET-4933 don't move disabled options Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/684b8363 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/684b8363 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/684b8363 Branch: refs/heads/master Commit: 684b8363ef86a5bd5facc872d230f3d7b2267379 Parents: 12ce76d Author: svenmeier <[email protected]> Authored: Thu Dec 20 08:52:37 2012 +0100 Committer: svenmeier <[email protected]> Committed: Thu Dec 20 08:52:37 2012 +0100 ---------------------------------------------------------------------- .../extensions/markup/html/form/palette/palette.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/684b8363/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js index 6a76cd9..96292bb 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/palette.js @@ -61,7 +61,7 @@ Wicket.Palette.moveHelper=function(source, dest) { var dirty=false; for (var i=0;i<source.options.length;i++) { - if (source.options[i].selected) { + if (source.options[i].selected && !source.options[i].disabled) { dest.appendChild(source.options[i]); i--; dirty=true;
