Merge pull request gwtbootstrap3#432 from sjardine/master

Fixes problem when Icon was inserted into DOM even if IconType was null.
rchikatw · Oct 28, 2015 · 3c75cc1 · 3c75cc1
2 parents 728a105 + 5fb6fdd
commit 3c75cc1
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/base/mixin/IconTextMixin.java b/gwtbootstrap3/src/main/java/org/gwtbootstrap3/client/ui/base/mixin/IconTextMixin.java
@@ -199,24 +199,27 @@ public void execute() {
 
                 if (icon != null) {
                     icon.removeFromParent();
+                    icon = null;
                 }
 
-                icon = new Icon();
-                icon.setType(iconType);
-                icon.setSize(iconSize);
-                icon.setFlip(iconFlip);
-                icon.setRotate(iconRotate);
-                icon.setSpin(iconSpin);
-                icon.setPulse(iconPulse);
-                icon.setBorder(iconBordered);
-                icon.setFixedWidth(iconFixedWidth);
-                icon.setInverse(iconInverse);
+                if (iconType != null) {
+                    icon = new Icon();
+                    icon.setType(iconType);
+                    icon.setSize(iconSize);
+                    icon.setFlip(iconFlip);
+                    icon.setRotate(iconRotate);
+                    icon.setSpin(iconSpin);
+                    icon.setPulse(iconPulse);
+                    icon.setBorder(iconBordered);
+                    icon.setFixedWidth(iconFixedWidth);
+                    icon.setInverse(iconInverse);
+                }
 
                 // Since we are dealing with Icon/Text, we can insert them at the right position
                 // Helps on widgets like ButtonDropDown, where it has a caret added
                 int position = 0;
 
-                if (iconPosition == IconPosition.LEFT) {
+                if (icon != null && iconPosition == IconPosition.LEFT) {
                     widget.insert(icon, position++);
                     widget.insert(separator, position++);
                 }
@@ -225,7 +228,7 @@ public void execute() {
                     widget.insert(text, position);
                 }
 
-                if (iconPosition == IconPosition.RIGHT) {
+                if (icon != null && iconPosition == IconPosition.RIGHT) {
                     widget.insert(separator, position++);
                     widget.insert(icon, position);
                 }