Don't add disabled class if disabledWhen not provided
Merge pull request #2607 from bradleypriest/disabledWhen

Don't add disabled class if disabledWhen not provided