Merge remote-tracking branch 'origin/master' into ink__update-checkbox

This commit is contained in:
Tessa Kelly 2018-06-19 16:24:11 -07:00
commit cecc8b3e15
3 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,5 @@
{
"version": "5.5.2",
"version": "5.5.3",
"summary": "UI Widgets we use at NRI",
"repository": "https://github.com/NoRedInk/noredink-ui.git",
"license": "BSD3",

View File

@ -125,11 +125,15 @@ view_ theme model =
]
[ Events.onInput model.onInput
, Attributes.id (generateId model.label)
, Attributes.class "override-sass-styles"
, Attributes.autofocus model.autofocus
, Attributes.placeholder model.placeholder
, Attributes.attribute "data-gramm" "false" -- disables grammarly to prevent https://github.com/NoRedInk/NoRedInk/issues/14859
, Attributes.class "override-sass-styles"
, Attributes.attribute "aria-invalid" <|
if model.isInError then
"true"
else
"false"
]
[ Html.text model.value ]
]

View File

@ -118,6 +118,11 @@ view_ theme model =
, autofocus model.autofocus
, type_ inputType.fieldType
, class "override-sass-styles"
, Attributes.attribute "aria-invalid" <|
if model.isInError then
"true"
else
"false"
]
[]
, if model.showLabel then