Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes in b:panel, b:dropMenu and b:selectOneMenu #915

Merged
merged 20 commits into from
Feb 19, 2018
Merged

Some fixes in b:panel, b:dropMenu and b:selectOneMenu #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d311555
Merge remote-tracking branch 'upstream/master'
Apr 29, 2017
d88b4b4
Merge remote-tracking branch 'upstream/master'
Apr 29, 2017
4de41f8
Merge remote-tracking branch 'upstream/master'
May 14, 2017
f47b04f
Merge remote-tracking branch 'upstream/master'
Jun 5, 2017
1e612bb
Merge remote-tracking branch 'upstream/master'
Jun 21, 2017
6b240af
Merge remote-tracking branch 'upstream/master'
Jul 10, 2017
3317e6e
Merge remote-tracking branch 'upstream/master'
Aug 15, 2017
c8753dd
Merge remote-tracking branch 'upstream/master'
Aug 22, 2017
0462366
Merge remote-tracking branch 'upstream/master'
Aug 23, 2017
c4f0415
Merge remote-tracking branch 'upstream/master'
Sep 23, 2017
134668a
Fixed non collapsible Panel in Responsive Layout
Sep 24, 2017
0b7b524
Fix for non field expressions.
Sep 24, 2017
1f5e666
Merge remote-tracking branch 'upstream/master'
Oct 5, 2017
45777b6
Revert to previous version
Dec 14, 2017
ba4f8d1
Merge remote-tracking branch 'upstream/master'
Dec 14, 2017
4e65e34
Merge remote-tracking branch 'upstream/master'
Jan 1, 2018
331a18e
Merge remote-tracking branch 'upstream/master'
Feb 16, 2018
76bc421
Detect as Dropmenu child, if generated inside a UIRepeat
Feb 16, 2018
ece66fa
Fix panel collapse icon if link is added by f:facet to header
Feb 16, 2018
346601c
Fix wrong assignment of selected object values
Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradleResources/staticResources/css/bsf.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,13 @@ label.bf-fatal { color: red; }
}

/* Collapsible panels */
.panel-heading a:after {
.panel-heading a.panel-title-link:after {
font-family:'Glyphicons Halflings';
content:"\e114";
float: right;
color: grey;
}
.panel-heading a.collapsed:after {
.panel-heading a.panel-title-link.collapsed:after {
content:"\e080";
}
a.panel-title-link {
Expand Down
4 changes: 2 additions & 2 deletions gradleResources/staticResources/less/bf/customizations.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

// Panels
/* Collapsible panels */
.panel-heading a:after {
.panel-heading a.panel-title-link:after {
font-family:'Glyphicons Halflings';
content:"\e114";
float: right;
color: grey;
}
.panel-heading a.collapsed:after {
.panel-heading a.panel-title-link.collapsed:after {
content:"\e080";
}
a.panel-title-link {
Expand Down
2 changes: 1 addition & 1 deletion mavenResources/META-INF/resources/bsf/css/bsf.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions src/main/java/net/bootsfaces/component/dropMenu/DropMenuRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
rw.writeText(value, null);
}
// Encode Caret
if ((!isFlyOutMenu) && (!(dropMenu.getParent() instanceof DropMenu))) {
if ((!isFlyOutMenu) && (!isDropMenuChild(dropMenu))) {
rw.startElement("b", dropMenu);
rw.writeAttribute("class", "caret", "class");
rw.endElement("b");
Expand All @@ -134,6 +134,16 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOEx
encodeDropMenuStart(dropMenu, rw, "dtL" + clientId);
}

private boolean isDropMenuChild(UIComponent component) {
UIComponent parent = component.getParent();
if (parent != null) {
while (parent.getClass().getSimpleName().equals("UIRepeat")) {
parent = parent.getParent();
}
}
return parent instanceof DropMenu;
}

private String determineHtmlTag(UIComponent component, boolean isFlyOutMenu) {
String htmlTag = "span";
if (isFlyOutMenu) {
Expand Down Expand Up @@ -178,7 +188,7 @@ private String getStyleClass(DropMenu dropMenu, boolean isFlyOutMenu) {
if (isFlyOutMenu) {
userClass += "dropdown-submenu" + " ";
return userClass;
} else if (dropMenu.getParent() instanceof DropMenu) {
} else if (isDropMenuChild(dropMenu)) {
userClass += "dropdown-submenu" + " ";
}
return (userClass + "drop" + direction).trim();
Expand Down
Loading