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

Merge branch 'temp8-upgrade-angular' into temp8-angular-tree-update

Browse Source
This commit is contained in:
Shannon
2018-06-19 12:51:57 +10:00
parent ebbdb945c4 cf59067451
commit 49de3f264c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbpropertyeditor.directive.js
View File

@@ -7,7 +7,7 @@
**/
//share property editor directive function
var _umbPropertyEditor = function (umbPropEditorHelper) {
function umbPropEditor(umbPropEditorHelper) {
return {
scope: {
model: "=",
@@ -30,11 +30,10 @@ var _umbPropertyEditor = function (umbPropEditorHelper) {
scope.model.alias = Math.random().toString(36).slice(2);
}
scope.$watch("model.view", function(val){
scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view, scope.isPreValue);
});
scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view, scope.isPreValue);
}
};
};
angular.module("umbraco.directives").directive('umbPropertyEditor', _umbPropertyEditor);
angular.module("umbraco.directives").directive('umbPropertyEditor', umbPropEditor);

4
src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html
View File

@@ -1,6 +1,6 @@
<div class="form-horizontal" ng-controller="Umbraco.Editors.Content.Apps.ContentController as vm">
<div class="umb-expansion-panel" ng-repeat="group in model.tabs | filter: { hide : '!' + true }">
<div class="umb-expansion-panel" ng-repeat="group in model.tabs | filter: { hide : '!' + true } track by group.label">
<div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
<div>{{ group.label }}</div>
@@ -15,4 +15,4 @@
</div>
</div>
</div>