yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new overlay directive in related links property editor

Browse Source
This commit is contained in:
Mads Rasmussen
2015-09-29 11:39:22 +02:00
parent b29dcd10d4
commit 39d9e98f6a
2 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
View File

@@ -15,17 +15,55 @@
$scope.currentEditLink = null;
$scope.hasError = false;
$scope.internal = function ($event) {
$scope.currentEditLink = null;
var d = dialogService.contentPicker({ multipicker: false, callback: select });
$event.preventDefault();
};
$scope.selectInternal = function ($event, link) {
$scope.internal = function($event) {
$scope.currentEditLink = null;
$scope.contentPickerOverlay = {};
$scope.contentPickerOverlay.view = "contentpicker";
$scope.contentPickerOverlay.multiPicker = false;
$scope.contentPickerOverlay.show = true;
$scope.contentPickerOverlay.submit = function(model) {
select(model.selection[0]);
$scope.contentPickerOverlay.show = false;
$scope.contentPickerOverlay = null;
};
$scope.contentPickerOverlay.close = function(oldModel) {
$scope.contentPickerOverlay.show = false;
$scope.contentPickerOverlay = null;
};
$event.preventDefault();
};
$scope.selectInternal = function($event, link) {
$scope.currentEditLink = link;
$scope.contentPickerOverlay = {};
$scope.contentPickerOverlay.view = "contentpicker";
$scope.contentPickerOverlay.multiPicker = false;
$scope.contentPickerOverlay.show = true;
$scope.contentPickerOverlay.submit = function(model) {
select(model.selection[0]);
$scope.contentPickerOverlay.show = false;
$scope.contentPickerOverlay = null;
};
$scope.contentPickerOverlay.close = function(oldModel) {
$scope.contentPickerOverlay.show = false;
$scope.contentPickerOverlay = null;
};
$event.preventDefault();
$scope.currentEditLink = link;
var d = dialogService.contentPicker({ multipicker: false, callback: select });
$event.preventDefault();
};
$scope.edit = function (idx) {
@@ -147,5 +185,5 @@
$scope.newInternal = data.id;
$scope.newInternalName = data.name;
}
}
});
}
});

12
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
View File

@@ -1,5 +1,5 @@
<div class="umb-editor umb-relatedlinks" ng-controller="Umbraco.PropertyEditors.RelatedLinksController">
<table class="table table-striped">
<thead>
<tr>
@@ -78,4 +78,12 @@
</tr>
</tfoot>
</table>
</div>
<umb-overlay
ng-if="contentPickerOverlay.show"
model="contentPickerOverlay"
view="contentPickerOverlay.view"
position="right">
</umb-overlay>
</div>