Merge branch 'master' into #42

primefaces · Jul 13, 2017 · ae60beb · ae60beb
2 parents ac7fb32 + 9920663
commit ae60beb
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 28 deletions.
diff --git a/src/components/button/Button.css b/src/components/button/Button.css
@@ -106,81 +106,113 @@ button.ui-button::-moz-focus-inner {
 
 /* Severity Buttons */
 /* Secondary */
-.ui-button.ui-button-secondary.ui-state-default {
+.ui-button.ui-button-secondary.ui-state-default,
+.ui-splitbutton.ui-button-secondary .ui-button.ui-state-default {
     background-color: #ffffff;
     border-color: #cccccc;
     color: #373a3c;
 }
 
-.ui-button.ui-button-secondary.ui-state-hover,
-.ui-button.ui-button-secondary.ui-state-focus {
+.ui-button.ui-button-secondary:enabled:hover,
+.ui-button.ui-button-secondary:focus,
+.ui-splitbutton.ui-button-secondary .ui-button:enabled:hover,
+.ui-splitbutton.ui-button-secondary .ui-button:focus {
     background-color: #f2f2f2;
+    border-color: #cccccc;
+    color: #373a3c;
 }
 
-.ui-button.ui-button-secondary.ui-state-active {
+.ui-button.ui-button-secondary:enabled:active,
+.ui-splitbutton.ui-button-secondary .ui-button:enabled:active  {
     background-color: #e6e6e6;
+    border-color: #cccccc;
+    color: #373a3c;
 }
 
 /* Success */
-.ui-button.ui-button-success.ui-state-default {
+.ui-button.ui-button-success.ui-state-default,
+.ui-splitbutton.ui-button-success .ui-button.ui-state-default {
     background-color: #5cb85c;
     border-color: #5cb85c;
     color: #ffffff;
 }
 
-.ui-button.ui-button-success.ui-state-hover,
-.ui-button.ui-button-success.ui-state-focus {
+.ui-button.ui-button-success:enabled:hover,
+.ui-button.ui-button-success:focus,
+.ui-splitbutton.ui-button-success .ui-button:enabled:hover,
+.ui-splitbutton.ui-button-success .ui-button:focus {
     background-color: #4cae4c;
+    border-color: #5cb85c;
 }
 
-.ui-button.ui-button-success.ui-state-active {
+.ui-button.ui-button-success:enabled:active,
+.ui-splitbutton.ui-button-success .ui-button:enabled:active {
     background-color: #449d44;
+    border-color: #5cb85c;
 }
 
 /* Info */
-.ui-button.ui-button-info.ui-state-default {
+.ui-button.ui-button-info.ui-state-default,
+.ui-splitbutton.ui-button-info .ui-button.ui-state-default {
     background-color: #5bc0de;
     border-color: #5bc0de;
     color: #ffffff;
 }
 
-.ui-button.ui-button-info.ui-state-hover,
-.ui-button.ui-button-info.ui-state-focus {
+.ui-button.ui-button-info:enabled:hover,
+.ui-button.ui-button-info:focus,
+.ui-splitbutton.ui-button-info .ui-button:enabled:hover,
+.ui-splitbutton.ui-button-info .ui-button:focus {
     background-color: #46b8da;
+    border-color: #5bc0de;
 }
 
-.ui-button.ui-button-info.ui-state-active {
+.ui-button.ui-button-info:enabled:active,
+.ui-splitbutton.ui-button-info .ui-button:enabled:active {
     background-color: #31b0d5;
+    border-color: #5bc0de;
 }
 
 /* Warning */
-.ui-button.ui-button-warning.ui-state-default {
+.ui-button.ui-button-warning.ui-state-default,
+.ui-splitbutton.ui-button-warning .ui-button.ui-state-default {
     background-color: #f0ad4e;
     border-color: #f0ad4e;
     color: #ffffff;
 }
 
-.ui-button.ui-button-warning.ui-state-hover,
-.ui-button.ui-button-warning.ui-state-focus {
+.ui-button.ui-button-warning:enabled:hover,
+.ui-button.ui-button-warning:focus,
+.ui-splitbutton.ui-button-warning .ui-button:enabled:hover,
+.ui-splitbutton.ui-button-warning .ui-button:focus {
     background-color: #eea236;
+    border-color: #f0ad4e;
 }
 
-.ui-button.ui-button-warning.ui-state-active {
+.ui-button.ui-button-warning:enabled:active,
+.ui-splitbutton.ui-button-warning .ui-button:enabled:active {
     background-color: #ec971f;
+    border-color: #f0ad4e;
 }
 
 /* Danger */
-.ui-button.ui-button-danger.ui-state-default {
+.ui-button.ui-button-danger.ui-state-default,
+.ui-splitbutton.ui-button-danger .ui-button.ui-state-default {
     background-color: #d9534f;
     border-color: #d9534f;
     color: #ffffff;
 }
 
-.ui-button.ui-button-danger.ui-state-hover,
-.ui-button.ui-button-danger.ui-state-focus {
+.ui-button.ui-button-danger:enabled:hover,
+.ui-button.ui-button-danger:focus,
+.ui-splitbutton.ui-button-danger .ui-button:enabled:hover,
+.ui-splitbutton.ui-button-danger .ui-button:focus {
     background-color: #d43f3a;
+    border-color: #d9534f;
 }
 
-.ui-button.ui-button-danger.ui-state-active {
+.ui-button.ui-button-danger:enabled:active,
+.ui-splitbutton.ui-button-danger .ui-button:enabled:active {
     background-color: #c9302c;
+    border-color: #d9534f;
 }
diff --git a/src/components/button/Button.js b/src/components/button/Button.js
@@ -31,10 +31,6 @@ export class Button extends Component {
         delete buttonProps.icon;
         delete buttonProps.label;
 
-        if (buttonProps.type !== 'submit' && buttonProps.type !== 'reset') {
-          buttonProps.type = 'button'
-        }
-
         if(this.props.icon) {
             iconStyleClass = classNames(this.props.icon, 'ui-c fa fa-fw', {
                 'ui-button-icon-left': this.props.iconPos !== 'right',
@@ -45,7 +41,7 @@ export class Button extends Component {
         return (
             <button {...buttonProps} className={styleClass}>
                 {this.props.icon && <span className={iconStyleClass}></span>}
-                <span className="ui-button-text ui-c">{this.props.label || 'ui-button'}</span>
+                <span className="ui-button-text ui-c">{this.props.label||'ui-btn'}</span>
                 {this.props.children}
             </button>
         );

diff --git a/src/components/dropdown/Dropdown.js b/src/components/dropdown/Dropdown.js
@@ -330,7 +330,7 @@ export class Dropdown extends Component {
                 var selected = (this.props.value !== null && this.props.value === option.value) || (this.props.value === null && index === 0);
                 var listItemStyleClass = classNames('ui-dropdown-item ui-corner-all', {'ui-state-highlight': selected || this.state.highlightOption === option});
                 var listItem = <li className={listItemStyleClass} key={option.value} onClick={(event) => this.onOptionClick(event, option)}
-                >
+                                   >
                     {listItemContent}
                 </li>;
 

diff --git a/src/components/utils/ObjectUtils.js b/src/components/utils/ObjectUtils.js
@@ -72,5 +72,21 @@ export default class ObjectUtils {
             return null;
         }
     }
+    static filter(value, fields, filterValue) {
+        var filteredItems=[];
+
+        if(value) {
+            for(let item of value) {
+                for(let field of fields) {
+                    if(String(this.resolveFieldData(item, field)).toLowerCase().indexOf(filterValue.toLowerCase()) > -1) {
+                        filteredItems.push(item);
+                        break;
+                    }
+                }
+            }
+        }
+
+        return filteredItems;
+    }
 
 }
diff --git a/src/showcase/button/ButtonDemo.js b/src/showcase/button/ButtonDemo.js
@@ -13,7 +13,9 @@ export class ButtonDemo extends Component {
     }
 
     increment() {
-        this.setState({count: this.state.count + 1});
+        this.setState((prevState, props) => ({
+            count: prevState.count + 1
+        }));
     }
 
     render() {
@@ -206,7 +208,9 @@ export class ButtonDemo extends Component {
     }
 
     increment() {
-        this.setState({count: this.state.count + 1});
+        this.setState((prevState, props) => ({
+            count: prevState.count + 1
+        }));
     }
 
     render() {