diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index dff7609993..a78abf2466 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -21,7 +21,7 @@ } $scope.sortableOptions = { - axis: 'y', + axis: "y", cursor: "move", handle: ".icon-navigation" }; @@ -68,10 +68,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper) { - //$scope.model.config.contentTypes; - //$scope.model.config.minItems; - //$scope.model.config.maxItems; - var inited = false; _.each($scope.model.config.contentTypes, function (contentType) { @@ -89,10 +85,10 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.minItems = $scope.model.config.minItems || 0; $scope.maxItems = $scope.model.config.maxItems || 0; - if ($scope.maxItems == 0) + if ($scope.maxItems === 0) $scope.maxItems = 1000; - $scope.singleMode = $scope.minItems == 1 && $scope.maxItems == 1; + $scope.singleMode = $scope.minItems === 1 && $scope.maxItems === 1; $scope.showIcons = Object.toBoolean($scope.model.config.showIcons); $scope.wideMode = Object.toBoolean($scope.model.config.hideLabel); @@ -167,7 +163,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop }; $scope.editNode = function (idx) { - if ($scope.currentNode && $scope.currentNode.key == $scope.nodes[idx].key) { + if ($scope.currentNode && $scope.currentNode.key === $scope.nodes[idx].key) { $scope.currentNode = undefined; } else { $scope.currentNode = $scope.nodes[idx]; @@ -176,8 +172,8 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.deleteNode = function (idx) { if ($scope.nodes.length > $scope.model.config.minItems) { - if ($scope.model.config.confirmDeletes && $scope.model.config.confirmDeletes == 1) { - localizationService.localize('content_nestedContentDeleteItem').then(function (value) { + if ($scope.model.config.confirmDeletes && $scope.model.config.confirmDeletes === 1) { + localizationService.localize("content_nestedContentDeleteItem").then(function (value) { if (confirm(value)) { $scope.nodes.splice(idx, 1); $scope.setDirty(); @@ -205,7 +201,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop var item = $scope.model.value[idx]; // Add a temporary index property - item['$index'] = (idx + 1); + item["$index"] = (idx + 1); var newName = contentType.nameExp(item); if (newName && (newName = $.trim(newName))) { @@ -213,7 +209,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop } // Delete the index property as we don't want to persist it - delete item['$index']; + delete item["$index"]; } } @@ -233,14 +229,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop } $scope.sortableOptions = { - axis: 'y', + axis: "y", cursor: "move", handle: ".umb-nested-content__icon--move", start: function (ev, ui) { updateModel(); // Yea, yea, we shouldn't modify the dom, sue me $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () { - tinymce.execCommand('mceRemoveEditor', false, $(this).attr('id')); + tinymce.execCommand("mceRemoveEditor", false, $(this).attr("id")); $(this).css("visibility", "hidden"); }); $scope.$apply(function () { @@ -252,7 +248,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop }, stop: function (ev, ui) { $("#umb-nested-content--" + $scope.model.id + " .umb-rte textarea").each(function () { - tinymce.execCommand('mceAddEditor', true, $(this).attr('id')); + tinymce.execCommand("mceAddEditor", true, $(this).attr("id")); $(this).css("visibility", "visible"); }); $scope.$apply(function () { @@ -264,13 +260,13 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop $scope.getScaffold = function (alias) { return _.find($scope.scaffolds, function (scaffold) { - return scaffold.contentTypeAlias == alias; + return scaffold.contentTypeAlias === alias; }); } $scope.getContentTypeConfig = function (alias) { return _.find($scope.model.config.contentTypes, function (contentType) { - return contentType.ncAlias == alias; + return contentType.ncAlias === alias; }); } @@ -290,7 +286,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop // remove all tabs except the specified tab var tabs = scaffold.variants[0].tabs; var tab = _.find(tabs, function (tab) { - return tab.id != 0 && (tab.alias.toLowerCase() == contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias == ""); + return tab.id !== 0 && (tab.alias.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === ""); }); scaffold.tabs = []; if (tab) { @@ -320,14 +316,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop var initIfAllScaffoldsHaveLoaded = function () { // Initialize when all scaffolds have loaded - if ($scope.model.config.contentTypes.length == scaffoldsLoaded) { + if ($scope.model.config.contentTypes.length === scaffoldsLoaded) { // Because we're loading the scaffolds async one at a time, we need to // sort them explicitly according to the sort order defined by the data type. var contentTypeAliases = []; _.each($scope.model.config.contentTypes, function (contentType) { contentTypeAliases.push(contentType.ncAlias); }); - $scope.scaffolds = $filter('orderBy')($scope.scaffolds, function (s) { + $scope.scaffolds = $filter("orderBy")($scope.scaffolds, function (s) { return contentTypeAliases.indexOf(s.contentTypeAlias); }); @@ -352,7 +348,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop } // If there is only one item, set it as current node - if ($scope.singleMode || ($scope.nodes.length == 1 && $scope.maxItems == 1)) { + if ($scope.singleMode || ($scope.nodes.length === 1 && $scope.maxItems === 1)) { $scope.currentNode = $scope.nodes[0]; } @@ -373,7 +369,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop prop.propertyAlias = prop.alias; prop.alias = $scope.model.alias + "___" + prop.alias; // Force validation to occur server side as this is the - // only way we can have consistancy between mandatory and + // only way we can have consistency between mandatory and // regex validation messages. Not ideal, but it works. prop.validation = { mandatory: false, @@ -429,22 +425,22 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop updateModel(); }); - $scope.$on('$destroy', function () { + $scope.$on("$destroy", function () { unsubscribe(); }); // TODO: Move this into a shared location? var UUID = (function () { var self = {}; - var lut = []; for (var i = 0; i < 256; i++) { lut[i] = (i < 16 ? '0' : '') + (i).toString(16); } + var lut = []; for (var i = 0; i < 256; i++) { lut[i] = (i < 16 ? "0" : "") + (i).toString(16); } self.generate = function () { var d0 = Math.random() * 0xffffffff | 0; var d1 = Math.random() * 0xffffffff | 0; var d2 = Math.random() * 0xffffffff | 0; var d3 = Math.random() * 0xffffffff | 0; - return lut[d0 & 0xff] + lut[d0 >> 8 & 0xff] + lut[d0 >> 16 & 0xff] + lut[d0 >> 24 & 0xff] + '-' + - lut[d1 & 0xff] + lut[d1 >> 8 & 0xff] + '-' + lut[d1 >> 16 & 0x0f | 0x40] + lut[d1 >> 24 & 0xff] + '-' + - lut[d2 & 0x3f | 0x80] + lut[d2 >> 8 & 0xff] + '-' + lut[d2 >> 16 & 0xff] + lut[d2 >> 24 & 0xff] + + return lut[d0 & 0xff] + lut[d0 >> 8 & 0xff] + lut[d0 >> 16 & 0xff] + lut[d0 >> 24 & 0xff] + "-" + + lut[d1 & 0xff] + lut[d1 >> 8 & 0xff] + "-" + lut[d1 >> 16 & 0x0f | 0x40] + lut[d1 >> 24 & 0xff] + "-" + + lut[d2 & 0x3f | 0x80] + lut[d2 >> 8 & 0xff] + "-" + lut[d2 >> 16 & 0xff] + lut[d2 >> 24 & 0xff] + lut[d3 & 0xff] + lut[d3 >> 8 & 0xff] + lut[d3 >> 16 & 0xff] + lut[d3 >> 24 & 0xff]; } return self;