Merge branch 'develop'

umco · Dec 28, 2016 · fe82d1c · fe82d1c
2 parents 2f5e3c1 + f45f6ae
commit fe82d1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # version format
-version: 1.0.2.{build}
+version: 1.0.3.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

diff --git a/...Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js b/...Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.controllers.js
@@ -14,7 +14,7 @@
         $scope.model.value = $scope.model.value || [];
 
         $scope.canAdd = function() {
-            return (!$scope.model.config.maxItems || $scope.model.config.maxItems === 0 || $scope.model.value.length < $scope.model.config.maxItems) && $scope.model.config.singleItemMode !== "1";
+            return (!$scope.model.config.maxItems || $scope.model.config.maxItems == 0 || $scope.model.value.length < $scope.model.config.maxItems) && $scope.model.config.singleItemMode != "1";
         }
 
         $scope.canDelete = function () {
@@ -83,7 +83,7 @@
                 callback: function (data) {
                     innerContentService.populateName(data.model, data.idx, $scope.model.config.contentTypes);
 
-                    scResources.getPreviewMarkup(data.model).then(function (markup) {
+                    scResources.getPreviewMarkup(data.model, editorState.current.id).then(function (markup) {
                         if (markup) {
                             $scope.markup[data.model.key] = markup;
                         }