From 47b3fa6d07338cb6a5e3c2998df84dabb03a3602 Mon Sep 17 00:00:00 2001 From: Arthur Mubarakshyn Date: Fri, 24 Mar 2017 12:20:25 +0100 Subject: [PATCH] + Configurable aria label from md-edit-dialog. * Fixed issue with time, date etc. inputs in md-edit-dialog. --- src/scripts/mdEditDialog.js | 24 +++++++++++++----------- src/styles/md-edit-dialog.less | 4 ++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/scripts/mdEditDialog.js b/src/scripts/mdEditDialog.js index 71a6fc8d..d47ea156 100644 --- a/src/scripts/mdEditDialog.js +++ b/src/scripts/mdEditDialog.js @@ -69,9 +69,9 @@ function mdEditDialog($compile, $controller, $document, $mdUtil, $q, $rootScope, positionDialog(element, options.target); - if(options.focusOnOpen) { - focusOnOpen(element); - } + if(options.focusOnOpen) { + focusOnOpen(element); + } if(options.clickOutsideToClose) { backdrop.on('click', function () { @@ -184,14 +184,14 @@ function mdEditDialog($compile, $controller, $document, $mdUtil, $q, $rootScope, }); } - function focusOnOpen(element) { - $mdUtil.nextTick(function () { + function focusOnOpen(element) { + $mdUtil.nextTick(function () { var autofocus = $mdUtil.findFocusTarget(element); - if(autofocus) { - autofocus.focus(); - } - }, false); + if(autofocus) { + autofocus.focus(); + } + }, false); } function positionDialog(element, target) { @@ -305,6 +305,7 @@ function mdEditDialog($compile, $controller, $document, $mdUtil, $q, $rootScope, messages: options.messages, model: options.modelValue, ok: options.ok || 'Save', + ariaLabel: options.ariaLabel || options.placeholder, placeholder: options.placeholder, title: options.title, size: size @@ -313,13 +314,14 @@ function mdEditDialog($compile, $controller, $document, $mdUtil, $q, $rootScope, '' + '
' + '
{{title || \'Edit\'}}
' + - '
' + + '' + '' + - '' + + '' + '
' + '
{{message}}
' + '
' + '
' + + '' + '
' + '
' + '
' + diff --git a/src/styles/md-edit-dialog.less b/src/styles/md-edit-dialog.less index ea6e4ced..0698fca8 100644 --- a/src/styles/md-edit-dialog.less +++ b/src/styles/md-edit-dialog.less @@ -35,6 +35,10 @@ md-edit-dialog { .md-char-counter { padding: 5px 2px 5px 0; } + + &:empty { + min-height: 24px; + } } [ng-message] {