From c060cd3b8db28e8ee40b24d130565ce4fdc4544c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 1 May 2020 11:55:49 +0200 Subject: [PATCH] rename variantNodeModel to contentNodeModel --- .../components/content/umbtabbedcontent.directive.js | 9 +++++---- .../src/views/content/apps/content/content.html | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js index 97e837c523..42dd904259 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js @@ -117,11 +117,11 @@ function controller($scope) { - //expose the property/methods for other directives to use this.content = $scope.content; - if($scope.variantNodeModel) { - $scope.defaultVariant = _.find($scope.variantNodeModel.variants, variant => { + + if($scope.contentNodeModel) { + $scope.defaultVariant = _.find($scope.contentNodeModel.variants, variant => { // defaultVariant will never have segment. Wether it has a language or not depends on the setup. return !variant.segment && ((variant.language && variant.language.isDefault) || (!variant.language)); }); @@ -166,7 +166,8 @@ link: link, scope: { content: "=", - variantNodeModel: "=?" + //contentNodeModel is the content model for the node, + contentNodeModel: "=?" } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html index eebed6bae9..7023a4187a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/apps/content/content.html @@ -2,7 +2,7 @@