Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #806 from metasfresh/dev-600
Browse files Browse the repository at this point in the history
Readonly flag is not respected #600
  • Loading branch information
damianprzygodzki authored May 30, 2017
2 parents d6a79ee + f384990 commit 5d51895
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/components/widget/Lookup/Lookup.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class Lookup extends Component {
setNextProperty={this.setNextProperty}
mainProperty={[item]}
blur={!property?true:false}
readonly={disabled}
readonly={disabled || readonly}
isInputEmpty={isInputEmpty}
/>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/components/widget/Lookup/RawLookup.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,9 @@ class RawLookup extends Component {
return (
<div
onKeyDown={this.handleKeyDown}
className={'raw-lookup-wrapper raw-lookup-wrapper-bcg '+
(disabled ? 'raw-lookup-disabled':'')
className={'raw-lookup-wrapper raw-lookup-wrapper-bcg'+
(disabled ? ' raw-lookup-disabled':'') +
(readonly ? ' input-disabled':'')
}
>
<div className={
Expand Down

0 comments on commit 5d51895

Please sign in to comment.