Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Fix for issue #546 #568

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue #546 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/scripts/mdEditDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand All @@ -313,13 +314,14 @@ function mdEditDialog($compile, $controller, $document, $mdUtil, $q, $rootScope,
'<md-edit-dialog>' +
'<div layout="column" class="md-content">' +
'<div ng-if="size === \'large\'" class="md-title">{{title || \'Edit\'}}</div>' +
'<form name="editDialog" layout="column" ng-submit="submit(model)">' +
'<form name="editDialog" layout="column" ng-submit="submit()">' +
'<md-input-container md-no-float>' +
'<input name="input" ng-model="model" md-autofocus placeholder="{{placeholder}} "' + getAttrs() + '>' +
'<input name="input" ng-model="model" md-autofocus placeholder="{{placeholder}} "' + getAttrs() + ' aria-label="{{ariaLabel}}">' +
'<div ng-messages="editDialog.input.$error">' +
'<div ng-repeat="(key, message) in messages" ng-message="{{key}}">{{message}}</div>' +
'</div>' +
'</md-input-container>' +
'<input type="submit" class="ng-hide" />' +
'</form>' +
'</div>' +
'<div ng-if="size === \'large\'" layout="row" layout-align="end" class="md-actions">' +
Expand Down
4 changes: 4 additions & 0 deletions src/styles/md-edit-dialog.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ md-edit-dialog {
.md-char-counter {
padding: 5px 2px 5px 0;
}

&:empty {
min-height: 24px;
}
}

[ng-message] {
Expand Down