Merge branch 'v7/dev' into v8/dev

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html
This commit is contained in:
Sebastiaan Janssen
2019-09-05 15:10:01 +02:00

View File

@@ -16,7 +16,7 @@
<umb-box-content>
<umb-control-group label="@general_url">
<input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
<input id="url" class="umb-property-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
<umb-button
type="button"
action="vm.showPreview()"