Skip to content
This repository has been archived by the owner on Aug 29, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(input): dont add focus/blur class if readonly
Closes #1203.
  • Loading branch information
ajoslin committed Jan 27, 2015
1 parent f3af15a commit 6333b72
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
22 changes: 13 additions & 9 deletions src/components/input/input.js
Expand Up @@ -172,6 +172,7 @@ function inputTextareaDirective($mdUtil, $window, $compile, $animate) {

var containerCtrl = ctrls[0];
var ngModelCtrl = ctrls[1] || $mdUtil.fakeNgModel();
var isReadonly = angular.isDefined(attr.readonly);

if ( !containerCtrl ) return;
if (containerCtrl.input) {
Expand Down Expand Up @@ -205,15 +206,18 @@ function inputTextareaDirective($mdUtil, $window, $compile, $animate) {
ngModelCtrl.$parsers.push(ngModelPipelineCheckValue);
ngModelCtrl.$formatters.push(ngModelPipelineCheckValue);

element
.on('input', inputCheckValue)
.on('focus', function(ev) {
containerCtrl.setFocused(true);
})
.on('blur', function(ev) {
containerCtrl.setFocused(false);
inputCheckValue();
});
element.on('input', inputCheckValue);

if (!isReadonly) {
element
.on('focus', function(ev) {
containerCtrl.setFocused(true);
})
.on('blur', function(ev) {
containerCtrl.setFocused(false);
inputCheckValue();
});
}

scope.$on('$destroy', function() {
containerCtrl.setFocused(false);
Expand Down
11 changes: 11 additions & 0 deletions src/components/input/input.spec.js
Expand Up @@ -23,6 +23,17 @@ describe('md-input-container directive', function() {
expect(el).not.toHaveClass('md-input-focused');
});

it('not should set focus class on container if readonly', function() {
var el = setup('readonly');
expect(el).not.toHaveClass('md-input-focused');

el.find('input').triggerHandler('focus');
expect(el).not.toHaveClass('md-input-focused');

el.find('input').triggerHandler('blur');
expect(el).not.toHaveClass('md-input-focused');
});

it('should set has-value class on container for non-ng-model input', function() {
var el = setup();
expect(el).not.toHaveClass('md-input-has-value');
Expand Down

0 comments on commit 6333b72

Please sign in to comment.