Skip to content

Commit

Permalink
Fix selected + unselectable shows unchecked checkbox
Browse files Browse the repository at this point in the history 
Close #427
  • Loading branch information
@mar10
mar10 committed May 7, 2015
1 parent ff1b213 commit c7de792
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# 2.9.1-0 / Unreleased
* [Fixed] #427 selected and unselectable shows unchecked checkbox

# 2.9.0 / 2015-04-19
* [Changed] ext-filter: `tree.filterNodes(filter, opts)` now accept an `opts`
Expand Down
3 changes: 1 addition & 2 deletions src/skin-awesome/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ span.fancytree-expander {
span.fancytree-checkbox {
margin-left: 0.5em;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
Expand Down
3 changes: 1 addition & 2 deletions src/skin-bootstrap-n/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ span.fancytree-expander {
span.fancytree-checkbox {
margin-left: 0.5em;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
Expand Down
3 changes: 1 addition & 2 deletions src/skin-bootstrap/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ span.fancytree-expander {
span.fancytree-checkbox {
margin-left: 0.5em;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
Expand Down
11 changes: 9 additions & 2 deletions src/skin-common.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,19 @@ span.fancytree-checkbox {
}
// Unselectable is dimmed, without hover effects
.fancytree-unselectable {
span.fancytree-checkbox,
span.fancytree-checkbox:hover {
span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
span.fancytree-checkbox:hover {
.useSprite(0, 2);
}
&.fancytree-partsel span.fancytree-checkbox:hover {
.useSprite(4, 2);
}
&.fancytree-selected span.fancytree-checkbox:hover {
.useSprite(2, 2);
}
}

/*------------------------------------------------------------------------------
Expand Down
11 changes: 9 additions & 2 deletions src/skin-lion/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-vista/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-win7/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-win8-n/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-win8-xxl/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -96px -64px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -64px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -128px -64px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -64px -64px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-win8/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down
11 changes: 9 additions & 2 deletions src/skin-xp/ui.fancytree.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,19 @@ span.fancytree-checkbox:hover {
.fancytree-selected span.fancytree-checkbox:hover {
background-position: -48px -32px;
}
.fancytree-unselectable span.fancytree-checkbox,
.fancytree-unselectable span.fancytree-checkbox:hover {
.fancytree-unselectable span.fancytree-checkbox {
opacity: 0.4;
filter: alpha(opacity=40);
}
.fancytree-unselectable span.fancytree-checkbox:hover {
background-position: 0px -32px;
}
.fancytree-unselectable.fancytree-partsel span.fancytree-checkbox:hover {
background-position: -64px -32px;
}
.fancytree-unselectable.fancytree-selected span.fancytree-checkbox:hover {
background-position: -32px -32px;
}
/*------------------------------------------------------------------------------
* Radiobutton icon
* This is a customization, that may be activated by overriding the 'checkbox'
Expand Down

0 comments on commit c7de792

Please sign in to comment.