diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js index 43237a2b54..ff92c0a35f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js @@ -6,19 +6,19 @@ angular.module('umbraco') function($scope, dialogService, entityResource, $log, iconHelper){ $scope.renderModel = []; $scope.ids = []; - - $scope.cfg = { - multiPicker: false, - entityType: "Document", - type: "content", - treeAlias: "content" - }; + + $scope.cfg = { + multiPicker: false, + entityType: "Document", + type: "content", + treeAlias: "content" + }; if($scope.model.value){ $scope.ids = $scope.model.value.split(','); entityResource.getByIds($scope.ids, $scope.cfg.entityType).then(function(data){ - $(data).each(function(i, item){ + _.each(data, function (item, i) { item.icon = iconHelper.convertFromLegacyIcon(item.icon); $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon}); }); @@ -69,7 +69,7 @@ angular.module('umbraco') function populate(data){ if(angular.isArray(data)){ - $(data).each(function(i, item){ + _.each(data, function (item, i) { $scope.add(item); }); }else{ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js deleted file mode 100644 index 3a5bae3e4f..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js +++ /dev/null @@ -1,27 +0,0 @@ -angular.module("umbraco").controller("Umbraco.PropertyEditors.CodeMirrorController", - function ($scope, $rootScope, assetsService) { - - /* - require( - [ - 'css!../lib/codemirror/js/lib/codemirror.css', - 'css!../lib/codemirror/css/umbracoCustom.css', - 'codemirrorHtml' - ], - function () { - - var editor = CodeMirror.fromTextArea( - document.getElementById($scope.alias), - { - mode: CodeMirror.modes.htmlmixed, - tabMode: "indent" - }); - - editor.on("change", function(cm) { - $rootScope.$apply(function(){ - $scope.value = cm.getValue(); - }); - }); - - });*/ -}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html deleted file mode 100644 index 39a9b4a6f4..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html +++ /dev/null @@ -1,4 +0,0 @@ -
- - 
{{model.value}}
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 0a4d6d8699..ae477393c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -6,8 +6,7 @@ angular.module('umbraco') function($scope, dialogService, entityResource, $log, iconHelper){ $scope.renderModel = []; $scope.ids = $scope.model.value ? $scope.model.value.split(',') : []; - - + //configuration $scope.cfg = { multiPicker: false, @@ -20,22 +19,25 @@ angular.module('umbraco') if($scope.model.config){ $scope.cfg = angular.extend($scope.cfg, $scope.model.config); } + + //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that! + $scope.cfg.multiPicker = ($scope.cfg.multiPicker.toString() == "1" ? true : ($scope.cfg.multiPicker === true)); if($scope.cfg.type === "member"){ - $scope.cfg.entityType = "Member"; - }else if($scope.cfg.type === "media"){ + $scope.cfg.entityType = "Member"; + } + else if ($scope.cfg.type === "media") { $scope.cfg.entityType = "Media"; } $scope.cfg.callback = populate; + $scope.cfg.treeAlias = $scope.cfg.type; $scope.cfg.section = $scope.cfg.type; $scope.cfg.filterCssClass = "not-allowed not-published"; - //$scope.cfg.scope = $scope; - - + //load current data entityResource.getByIds($scope.ids, $scope.cfg.entityType).then(function(data){ - $(data).each(function(i, item){ + _.each(data, function (item, i) { item.icon = iconHelper.convertFromLegacyIcon(item.icon); $scope.renderModel.push({name: item.name, id: item.id, icon: item.icon}); }); @@ -95,7 +97,7 @@ angular.module('umbraco') function populate(data){ if(angular.isArray(data)){ - $(data).each(function(i, item){ + _.each(data, function (item, i) { $scope.add(item); }); }else{ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 91328896a3..e22d4cf22b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -15,7 +15,7 @@ -