Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make embed grid editor editable again #8576

Merged
merged 5 commits into from
Aug 26, 2020
Merged

Make embed grid editor editable again #8576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71f2b7b
Change name of property passed in to embed infinite editor
bjarnef Aug 4, 2020
2a26a84
Use Utilities.extend
bjarnef Aug 4, 2020
746e2ed
Move type attribute first for readability
bjarnef Aug 4, 2020
2b5d7fd
Remove redundant bottom margin as text input by default has 10px bott…
bjarnef Aug 4, 2020
d193e29
Format document
bjarnef Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
};

if ($scope.model.modify) {
angular.extend($scope.model.embed, $scope.model.modify);
Utilities.extend($scope.model.embed, $scope.model.modify);

showPreview();
}
Expand All @@ -34,7 +34,7 @@
vm.close = close;

function onInit() {
if(!$scope.model.title) {
if (!$scope.model.title) {
localizationService.localize("general_embed").then(function(value){
$scope.model.title = value;
});
Expand Down Expand Up @@ -122,27 +122,25 @@
if ($scope.model.embed.url !== "") {
showPreview();
}

}

function toggleConstrain() {
$scope.model.embed.constrain = !$scope.model.embed.constrain;
}

function submit() {
if($scope.model && $scope.model.submit) {
if ($scope.model && $scope.model.submit) {
$scope.model.submit($scope.model);
}
}

function close() {
if($scope.model && $scope.model.close) {
if ($scope.model && $scope.model.close) {
$scope.model.close();
}
}

onInit();

}

angular.module("umbraco").controller("Umbraco.Editors.EmbedController", EmbedController);
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" focus-when="{{true}}" required />
<input type="text" id="url" class="umb-property-editor input-block-level" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" focus-when="{{true}}" required />
<umb-button
type="button"
action="vm.showPreview()"
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ angular.module("umbraco")

$scope.setEmbed = function () {

var original = Utilities.isObject($scope.control.value) ? $scope.control.value : null;
var modify = Utilities.isObject($scope.control.value) ? $scope.control.value : null;

var embed = {
original: original,
modify: modify,
submit: function (model) {

var embed = {
Expand Down