Markup example
+++ +@param {string} text Set the text for the checkbox label. +@param {string} labelKey Set a dictinary/localization string for the checkbox label +@param {callback} action Callback when the value of the checkbox change by interaction. +@param {string} cssClass Set a css class modifier +@param {string} color Set a hex code like+ +++ + +
#f5c1bc
+@param {boolean} showText Set to true to show the text. false by default
+@param {domElement} element Highlights a DOM-element (HTML-selector)
+@param {string} state Set the initial state of the component. To have it hidden use hidden
+@param {string} mode Set the mode, which decides how to style the component. "small" and "tab" are currently supported
+**/
+
+(function () {
+ 'use strict';
+
+ function UmbButtonEllipsis($timeout, localizationService) {
+
+ var vm = this;
+
+ vm.$onInit = onInit;
+ vm.clickButton = clickButton;
+
+ function onInit() {
+ setText();
+
+ setColor();
+ }
+
+ function clickButton(event) {
+ if(vm.action) {
+ vm.action({$event: event});
+ }
+ }
+
+ function setText() {
+ if (vm.labelKey) {
+ localizationService.localize(vm.labelKey).then(function (data) {
+ // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
+ if(data.indexOf('[') === -1){
+ vm.text = data;
+ }
+ });
+ }
+ }
+
+ function setColor() {
+ vm.color = vm.color ? vm.color : '#000000';
+ }
+ }
+
+ var component = {
+ templateUrl: 'views/components/buttons/umb-button-ellipsis.html',
+ controller: UmbButtonEllipsis,
+ controllerAs: 'vm',
+ transclude: true,
+ bindings: {
+ text: "@",
+ labelKey: "@?",
+ action: "&",
+ cssClass: "@?",
+ color: "@?",
+ showText: " {
if ((vm.culture === "invariant" || v.language && v.language.culture === vm.culture) && v.segment === vm.segment) {
activeVariant = v;
}
});
+
if (!activeVariant) {
// Set the first variant to active if we can't find it.
// If the content item is invariant, then only one item exists in the array.
@@ -103,13 +105,16 @@
//now re-sync any other editor content (i.e. if split view is open)
for (var s = 1; s < vm.editors.length; s++) {
//get the variant from the scope model
- var variant = _.find(vm.content.variants, function (v) {
- return (!v.language || v.language.culture === vm.editors[s].content.language.culture) && v.segment === vm.editors[s].content.segment;
- });
+ var variant = vm.content.variants.find(v =>
+ (!v.language || v.language.culture === vm.editors[s].content.language.culture) && v.segment === vm.editors[s].content.segment);
+
vm.editors[s].content = variant;
}
}
-
+
+ if (vm.content.variants.length > 1) {
+ eventsService.emit('editors.content.cultureChanged', activeVariant.language);
+ }
}
/**
@@ -160,32 +165,30 @@
*/
function openSplitView(selectedVariant) {
// enforce content contentApp in splitview.
- var contentApp = vm.content.apps.find((app) => app.alias === "umbContent");
+ var contentApp = vm.content.apps.find(app => app.alias === "umbContent");
if(contentApp) {
selectApp(contentApp);
}
insertVariantEditor(vm.editors.length, selectedVariant);
- splitViewChanged();
-
+ splitViewChanged();
}
-
- $scope.$on("editors.content.splitViewRequest", function(event, args) {requestSplitView(args);});
- vm.requestSplitView = requestSplitView;
+
function requestSplitView(args) {
var culture = args.culture;
var segment = args.segment;
- var variant = _.find(vm.content.variants, function (v) {
- return (!v.language || v.language.culture === culture) && v.segment === segment;
- });
+ var variant = vm.content.variants.find(v =>
+ (!v.language || v.language.culture === culture) && v.segment === segment);
if (variant != null) {
openSplitView(variant);
}
}
+ eventsService.on("editors.content.splitViewRequest", (_, args) => requestSplitView(args));
+
/** Closes the split view */
function closeSplitView(editorIndex) {
// TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
@@ -194,8 +197,9 @@
editor.content.active = false;
//update the current culture to reflect the last open variant (closing the split view corresponds to selecting the other variant)
-
- $location.search({"cculture": vm.editors[0].content.language ? vm.editors[0].content.language.culture : null, "csegment": vm.editors[0].content.segment});
+ const culture = vm.editors[0].content.language ? vm.editors[0].content.language.culture : null;
+
+ $location.search({"cculture": culture, "csegment": vm.editors[0].content.segment});
splitViewChanged();
}
@@ -222,11 +226,9 @@
$location.search("cculture", variantCulture).search("csegment", variantSegment);
}
else {
-
//update the editors collection
- insertVariantEditor(editorIndex, variant);
-
- }
+ insertVariantEditor(editorIndex, variant);
+ }
}
/**
@@ -244,7 +246,6 @@
vm.onSelectAppAnchor({"app": app, "anchor": anchor});
}
}
-
function getScope() {
return $scope;
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 389aec2044..717cefbb0a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -31,8 +31,10 @@
@param {boolean} disabled Set the checkbox to be disabled.
@param {boolean} required Set the checkbox to be required.
@param {callback} onChange Callback when the value of the checkbox change by interaction.
-@param {string} cssClass Set a css class modifier
-@param {boolean} disableDirtyCheck Disable checking if the model is dirty
+@param {string} cssClass Set a css class modifier.
+@deprecated @param {string} iconClass Set an icon next to checkbox. Use "icon" parameter instead.
+@param {string} icon Set an icon next to checkbox.
+@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
**/
@@ -49,6 +51,8 @@
function onInit() {
vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
+ vm.icon = vm.icon || vm.iconClass || null;
+
// If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
if (vm.labelKey) {
localizationService.localize(vm.labelKey).then(function (data) {
@@ -85,7 +89,8 @@
required: "<",
onChange: "&?",
cssClass: "@?",
- iconClass: "@?",
+ iconClass: "@?", // deprecated
+ icon: "@?",
disableDirtyCheck: "=?"
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
new file mode 100644
index 0000000000..569f49b88a
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js
@@ -0,0 +1,82 @@
+(function() {
+ 'use strict';
+
+ function FocusLock($timeout) {
+
+ function getAutoFocusElement (elements) {
+ var elmentWithAutoFocus = null;
+
+ elements.forEach((element) => {
+ if(element.getAttribute('umb-auto-focus') === 'true') {
+ elmentWithAutoFocus = element;
+ }
+ });
+
+ return elmentWithAutoFocus;
+ }
+
+ function link(scope, element) {
+
+ function onInit() {
+ // List of elements that can be focusable within the focus lock
+ var focusableElementsSelector = 'a[href]:not([disabled]), button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled])';
+ var bodyElement = document.querySelector('body');
+
+ $timeout(function() {
+ var target = element[0];
+
+ var focusableElements = target.querySelectorAll(focusableElementsSelector);
+ var defaultFocusedElement = getAutoFocusElement(focusableElements);
+ var firstFocusableElement = focusableElements[0];
+ var lastFocusableElement = focusableElements[focusableElements.length -1];
+
+ // We need to add the tabbing-active class in order to highlight the focused button since the default style is
+ // outline: none; set in the stylesheet specifically
+ bodyElement.classList.add('tabbing-active');
+
+ // If there is no default focused element put focus on the first focusable element in the nodelist
+ if(defaultFocusedElement === null ){
+ firstFocusableElement.focus();
+ }
+
+ target.addEventListener('keydown', function(event){
+ var isTabPressed = (event.key === 'Tab' || event.keyCode === 9);
+
+ if (!isTabPressed){
+ return;
+ }
+
+ // If shift + tab key
+ if(event.shiftKey){
+ // Set focus on the last focusable element if shift+tab are pressed meaning we go backwards
+ if(document.activeElement === firstFocusableElement){
+ lastFocusableElement.focus();
+ event.preventDefault();
+ }
+ }
+ // Else only the tab key is pressed
+ else{
+ // Using only the tab key we set focus on the first focusable element mening we go forward
+ if (document.activeElement === lastFocusableElement) {
+ firstFocusableElement.focus();
+ event.preventDefault();
+ }
+ }
+ });
+ }, 250);
+ }
+
+ onInit();
+ }
+
+ var directive = {
+ restrict: 'A',
+ link: link
+ };
+
+ return directive;
+ }
+
+ angular.module('umbraco.directives').directive('umbFocusLock', FocusLock);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index d79140f947..3232ed7f34 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -26,10 +26,14 @@
@param {string} value Set the value of the radiobutton.
@param {string} name Set the name of the radiobutton.
@param {string} text Set the text for the radiobutton label.
-@param {string} labelKey Set a dictinary/localization string for the checkbox label
+@param {string} labelKey Set a dictinary/localization string for the checkbox label.
+@param {string} serverValidationField Set the val-server-field of the radiobutton.
@param {boolean} disabled Set the radiobutton to be disabled.
@param {boolean} required Set the radiobutton to be required.
@param {callback} onChange Callback when the value of the radiobutton change by interaction.
+@param {string} cssClass Set a css class modifier.
+@param {string} iconClass Set an icon next to radiobutton.
+@param {boolean} disableDirtyCheck Disable checking if the model is dirty.
**/
@@ -46,6 +50,8 @@
function onInit() {
vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
+ vm.icon = vm.icon || vm.iconClass || null;
+
// If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
if (vm.labelKey) {
localizationService.localize(vm.labelKey).then(function (data) {
@@ -77,9 +83,14 @@
name: "@",
text: "@",
labelKey: "@?",
+ serverValidationField: "@",
disabled: "<",
required: "<",
- onChange: "&?"
+ onChange: "&?",
+ cssClass: "@?",
+ iconClass: "@?", // deprecated
+ icon: "@?",
+ disableDirtyCheck: "=?"
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
new file mode 100644
index 0000000000..7929316275
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js
@@ -0,0 +1,84 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbSearchFilter
+@restrict E
+@scope
+
+@description
+Added in Umbraco version 8.7.0 Use this directive to render an umbraco search filter.
+
+Markup example
+++ +@param {boolean} model Set to+ +++ + +
true or false to set the checkbox to checked or unchecked.
+@param {string} inputId Set the id of the checkbox.
+@param {string} text Set the text for the checkbox label.
+@param {string} labelKey Set a dictinary/localization string for the checkbox label
+@param {callback} onChange Callback when the value of the checkbox change by interaction.
+@param {boolean} autoFocus Add autofocus to the input field
+@param {boolean} preventSubmitOnEnter Set the enter prevent directive or not
+
+**/
+
+(function () {
+ 'use strict';
+
+ function UmbSearchFilterController($timeout, localizationService) {
+
+ var vm = this;
+
+ vm.$onInit = onInit;
+ vm.change = change;
+
+ function onInit() {
+ vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
+
+ // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
+ if (vm.labelKey) {
+ localizationService.localize(vm.labelKey).then(function (data) {
+ if(data.indexOf('[') === -1){
+ vm.text = data;
+ }
+ });
+ }
+ }
+
+ function change() {
+ if (vm.onChange) {
+ $timeout(function () {
+ vm.onChange({ model: vm.model, value: vm.value });
+ }, 0);
+ }
+ }
+ }
+
+ var component = {
+ templateUrl: 'views/components/forms/umb-search-filter.html',
+ controller: UmbSearchFilterController,
+ controllerAs: 'vm',
+ transclude: true,
+ bindings: {
+ model: "=",
+ inputId: "@",
+ text: "@",
+ labelKey: "@?",
+ onChange: "&?",
+ autoFocus: " constraints.left.max)
- {
- left = constraints.left.max;
- }
+ var validatePosition = function (left, top) {
+ if (left > constraints.left.max) {
+ left = constraints.left.max;
+ }
- if(left <= constraints.left.min){
- left = constraints.left.min;
- }
+ if (left <= constraints.left.min) {
+ left = constraints.left.min;
+ }
- if(top > constraints.top.max)
- {
- top = constraints.top.max;
- }
- if(top <= constraints.top.min){
- top = constraints.top.min;
- }
+ if (top > constraints.top.max) {
+ top = constraints.top.max;
+ }
+ if (top <= constraints.top.min) {
+ top = constraints.top.min;
+ }
- if(scope.dimensions.image.left !== left){
- scope.dimensions.image.left = left;
- }
+ if (scope.dimensions.image.left !== left) {
+ scope.dimensions.image.left = left;
+ }
- if(scope.dimensions.image.top !== top){
- scope.dimensions.image.top = top;
- }
- };
+ if (scope.dimensions.image.top !== top) {
+ scope.dimensions.image.top = top;
+ }
+ };
- //sets scope.crop to the recalculated % based crop
- var calculateCropBox = function(){
- scope.crop = cropperHelper.pixelsToCoordinates(scope.dimensions.image, scope.dimensions.cropper.width, scope.dimensions.cropper.height, scope.dimensions.margin);
- };
+ //sets scope.crop to the recalculated % based crop
+ var calculateCropBox = function () {
+ scope.crop = cropperHelper.pixelsToCoordinates(scope.dimensions.image, scope.dimensions.cropper.width, scope.dimensions.cropper.height, scope.dimensions.margin);
+ };
- //Drag and drop positioning, using jquery ui draggable
- var onStartDragPosition, top, left;
- $overlay.draggable({
- drag: function(event, ui) {
- scope.$apply(function(){
- validatePosition(ui.position.left, ui.position.top);
- });
- },
- stop: function(event, ui){
- scope.$apply(function(){
- //make sure that every validates one more time...
- validatePosition(ui.position.left, ui.position.top);
+ //Drag and drop positioning, using jquery ui draggable
+ var onStartDragPosition, top, left;
+ $overlay.draggable({
+ drag: function (event, ui) {
+ scope.$apply(function () {
+ validatePosition(ui.position.left, ui.position.top);
+ });
+ },
+ stop: function (event, ui) {
+ scope.$apply(function () {
+ //make sure that every validates one more time...
+ validatePosition(ui.position.left, ui.position.top);
- calculateCropBox();
- scope.dimensions.image.rnd = Math.random();
- });
- }
- });
+ calculateCropBox();
+ scope.dimensions.image.rnd = Math.random();
+ });
+ }
+ });
- var init = function(image){
- scope.loaded = false;
+ var init = function (image) {
+ scope.loaded = false;
- //set dimensions on image, viewport, cropper etc
- setDimensions(image);
+ //set dimensions on image, viewport, cropper etc
+ setDimensions(image);
- //create a default crop if we haven't got one already
+ //create a default crop if we haven't got one already
var createDefaultCrop = !scope.crop;
if (createDefaultCrop) {
calculateCropBox();
}
- resizeImageToCrop();
+ resizeImageToCrop();
//if we're creating a new crop, make sure to zoom out fully
if (createDefaultCrop) {
scope.dimensions.scale.current = scope.dimensions.scale.min;
- resizeImageToScale(scope.dimensions.scale.min);
+ resizeImageToScale(scope.dimensions.scale.min);
+
+ if (scope.center) {
+ // Move image to focal point if set
+ // Repeating a few calls here, but logic is too difficult to follow elsewhere
+ var x1 = Math.min(
+ Math.max(
+ scope.center.left * scope.dimensions.image.width - scope.dimensions.cropper.width / 2,
+ 0
+ ),
+ scope.dimensions.image.width - scope.dimensions.cropper.width
+ );
+ var y1 = Math.min(
+ Math.max(
+ scope.center.top * scope.dimensions.image.height - scope.dimensions.cropper.height / 2,
+ 0
+ ),
+ scope.dimensions.image.height - scope.dimensions.cropper.height
+ );
+ scope.dimensions.image.left = x1;
+ scope.dimensions.image.top = y1;
+ calculateCropBox();
+ resizeImageToCrop();
+ }
}
- //sets constaints for the cropper
- setConstraints();
- scope.loaded = true;
- };
+ //sets constaints for the cropper
+ setConstraints();
+ scope.loaded = true;
+ };
- // Watchers
- scope.$watchCollection('[width, height]', function(newValues, oldValues){
- // We have to reinit the whole thing if
- // one of the external params changes
- if(newValues !== oldValues){
- setDimensions($image);
- setConstraints();
- }
- });
+ // Watchers
+ scope.$watchCollection('[width, height]', function (newValues, oldValues) {
+ // We have to reinit the whole thing if
+ // one of the external params changes
+ if (newValues !== oldValues) {
+ setDimensions($image);
+ setConstraints();
+ }
+ });
- var throttledResizing = _.throttle(function(){
+ var throttledResizing = _.throttle(function () {
resizeImageToScale(scope.dimensions.scale.current);
- calculateCropBox();
- }, 15);
+ calculateCropBox();
+ }, 15);
- // Happens when we change the scale
+ // Happens when we change the scale
scope.$watch("dimensions.scale.current", function (newValue, oldValue) {
- if (scope.loaded) {
- throttledResizing();
- }
- });
+ if (scope.loaded) {
+ throttledResizing();
+ }
+ });
- // Init
- $image.on("load", function(){
- $timeout(function(){
- init($image);
- });
- });
- }
- };
- });
+ // Init
+ $image.on("load", function () {
+ $timeout(function () {
+ init($image);
+ });
+ });
+ }
+ };
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
index dfa1afc247..6f34cfc0a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
@@ -1,7 +1,7 @@
(function () {
'use strict';
- function MediaNodeInfoDirective($timeout, $location, eventsService, userService, dateHelper, editorService, mediaHelper, mediaResource, $q) {
+ function MediaNodeInfoDirective($timeout, $location, $q, eventsService, userService, dateHelper, editorService, mediaHelper, mediaResource) {
function link(scope, element, attrs, ctrl) {
@@ -37,7 +37,7 @@
});
});
- // get document type details
+ // get media type details
scope.mediaType = scope.node.contentType;
// set the media link initially
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
index 3b6a2c069a..8dd6d56139 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/member/umbmembernodeinfo.directive.js
@@ -11,6 +11,19 @@
scope.allowChangeMemberType = false;
function onInit() {
+
+ userService.getCurrentUser().then(function (user) {
+ // only allow change of member type if user has access to the settings sections
+ Utilities.forEach(user.sections, function (section) {
+ if (section.alias === "settings") {
+ scope.allowChangeMemberType = true;
+ }
+ });
+ });
+
+ // get member type details
+ scope.memberType = scope.node.contentType;
+
// make sure dates are formatted to the user's locale
formatDatesToLocal();
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index d1bdf6f42f..f7ba043ef1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -221,6 +221,10 @@ Opens an overlay to show a custom YSOD.
$timeout(function () {
+ if (!scope.name) {
+ scope.name = 'overlay';
+ }
+
if (scope.position === "target" && scope.model.event) {
setTargetPosition();
@@ -403,11 +407,15 @@ Opens an overlay to show a custom YSOD.
function setTargetPosition() {
- var container = $("#contentwrapper");
- var containerLeft = container[0].offsetLeft;
- var containerRight = containerLeft + container[0].offsetWidth;
- var containerTop = container[0].offsetTop;
- var containerBottom = containerTop + container[0].offsetHeight;
+ var overlay = $(scope.model.event.target).closest('.umb-overlay');
+ var container = overlay.length > 0 ? overlay : $("#contentwrapper");
+
+ let rect = container[0].getBoundingClientRect();
+
+ var containerLeft = rect.left;
+ var containerRight = containerLeft + rect.width;
+ var containerTop = rect.top;
+ var containerBottom = containerTop + rect.height;
var mousePositionClickX = null;
var mousePositionClickY = null;
@@ -430,8 +438,9 @@ Opens an overlay to show a custom YSOD.
elementWidth = el[0].clientWidth;
// move element to this position
- position.left = mousePositionClickX - (elementWidth / 2);
- position.top = mousePositionClickY - (elementHeight / 2);
+ // when using hotkey it fallback to center of container
+ position.left = mousePositionClickX ? mousePositionClickX - (elementWidth / 2) : (containerLeft + containerRight) / 2 - (elementWidth / 2);
+ position.top = mousePositionClickY ? mousePositionClickY - (elementHeight / 2) : (containerTop + containerBottom) / 2 - (elementHeight / 2);
// check to see if element is outside screen
// outside right
@@ -459,6 +468,7 @@ Opens an overlay to show a custom YSOD.
}
el.css(position);
+ el.css("visibility", "visible");
}
scope.submitForm = function (model) {
@@ -530,6 +540,7 @@ Opens an overlay to show a custom YSOD.
view: "=",
position: "@",
size: "=?",
+ name: "=?",
parentScope: "=?"
},
link: link
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
index 0ccaf7b05c..a412f73c5a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
@@ -88,9 +88,8 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
/** Helper function to emit tree events */
function emitEvent(eventName, args) {
if (registeredCallbacks[eventName] && Utilities.isArray(registeredCallbacks[eventName])) {
- _.each(registeredCallbacks[eventName], function (c) {
- c(args);//call it
- });
+ // call it
+ registeredCallbacks[eventName].forEach(c => c(args));
}
}
@@ -342,26 +341,17 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
var css = [];
if (node.cssClasses) {
- _.each(node.cssClasses, function (c) {
- css.push(c);
- });
+ node.cssClasses.forEach(c => css.push(c));
}
return css.join(" ");
};
- $scope.selectEnabledNodeClass = function (node) {
- return node ?
- node.selected ?
- 'icon umb-tree-icon sprTree icon-check green temporary' :
- '' :
- '';
- };
+ $scope.selectEnabledNodeClass = node =>
+ node && node.selected ? 'icon umb-tree-icon sprTree icon-check green temporary' : '';
/* helper to force reloading children of a tree node */
- $scope.loadChildren = function (node, forceReload) {
- return loadChildren(node, forceReload);
- };
+ $scope.loadChildren = (node, forceReload) => loadChildren(node, forceReload);
/**
Method called when the options button next to the root node is called.
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 8767de446a..f2fc0d2dae 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -70,9 +70,7 @@ angular.module("umbraco.directives")
var css = [];
if (node.cssClasses) {
- _.each(node.cssClasses, function(c) {
- css.push(c);
- });
+ node.cssClasses.forEach(c => css.push(c));
}
if (node.selected) {
css.push("umb-tree-node-checked");
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
index 96ce8735eb..9a841e3e4a 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js
@@ -21,14 +21,6 @@ Use this directive to render a ui component for selecting child items to a paren
on-remove="vm.removeChild">
-
-
-
@@ -71,17 +71,23 @@ The prompt can be opened in four direction up, down, left or right.
function link(scope, el, attr, ctrl) {
- scope.clickConfirm = function() {
- if(scope.onConfirm) {
- scope.onConfirm();
- }
- };
+ scope.clickButton = function (event) {
+ if(scope.onDelete) {
+ scope.onDelete({$event: event});
+ }
+ }
- scope.clickCancel = function() {
- if(scope.onCancel) {
- scope.onCancel();
- }
- };
+ scope.clickConfirm = function() {
+ if(scope.onConfirm) {
+ scope.onConfirm();
+ }
+ };
+
+ scope.clickCancel = function() {
+ if(scope.onCancel) {
+ scope.onCancel();
+ }
+ };
}
@@ -91,6 +97,8 @@ The prompt can be opened in four direction up, down, left or right.
templateUrl: 'views/components/umb-confirm-action.html',
scope: {
direction: "@",
+ show: "<",
+ onDelete: "&?",
onConfirm: "&",
onCancel: "&"
},
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
index 0498b81963..ed9c011d72 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbdatetimepicker.directive.js
@@ -189,7 +189,7 @@ Use this directive to render a date time picker
};
}
- // bind hook for onOpen
+ // bind hook for onOpen
if (ctrl.options && ctrl.onClose) {
ctrl.options.onClose = function (selectedDates, dateStr, instance) {
$timeout(function () {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 3f53a1e18c..92d2df43e5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -161,19 +161,17 @@
var resourceLookup = scope.contentType === "documentType" ? contentTypeResource.getAvailableCompositeContentTypes : mediaTypeResource.getAvailableCompositeContentTypes;
return resourceLookup(scope.model.id, selectedContentTypeAliases, propAliasesExisting).then(function (filteredAvailableCompositeTypes) {
- _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (current) {
+ scope.compositionsDialogModel.availableCompositeContentTypes.forEach(current => {
//reset first
current.allowed = true;
//see if this list item is found in the response (allowed) list
- var found = _.find(filteredAvailableCompositeTypes, function (f) {
- return current.contentType.alias === f.contentType.alias;
- });
+ var found = filteredAvailableCompositeTypes.find(f => current.contentType.alias === f.contentType.alias);
//allow if the item was found in the response (allowed) list -
// and ensure its set to allowed if it is currently checked,
// DO not allow if it's a locked content type.
- current.allowed = scope.model.lockedCompositeContentTypes.indexOf(current.contentType.alias) === -1 &&
- (selectedContentTypeAliases.indexOf(current.contentType.alias) !== -1) || ((found !== null && found !== undefined) ? found.allowed : false);
+ current.allowed = scope.model.lockedCompositeContentTypes.includes(current.contentType.alias) &&
+ (selectedContentTypeAliases.includes(current.contentType.alias)) || (found ? found.allowed : false);
});
});
@@ -192,15 +190,15 @@
function setupAvailableContentTypesModel(result) {
scope.compositionsDialogModel.availableCompositeContentTypes = result;
//iterate each one and set it up
- _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (c) {
+ scope.compositionsDialogModel.availableCompositeContentTypes.forEach(c => {
//enable it if it's part of the selected model
- if (scope.compositionsDialogModel.compositeContentTypes.indexOf(c.contentType.alias) !== -1) {
+ if (scope.compositionsDialogModel.compositeContentTypes.includes(c.contentType.alias)) {
c.allowed = true;
}
//set the inherited flags
c.inherited = false;
- if (scope.model.lockedCompositeContentTypes.indexOf(c.contentType.alias) > -1) {
+ if (scope.model.lockedCompositeContentTypes.includes(c.contentType.alias)) {
c.inherited = true;
}
// convert icons for composite content types
@@ -281,6 +279,8 @@
},
selectCompositeContentType: function (selectedContentType) {
+ var deferred = $q.defer();
+
//first check if this is a new selection - we need to store this value here before any further digests/async
// because after that the scope.model.compositeContentTypes will be populated with the selected value.
var newSelection = scope.model.compositeContentTypes.indexOf(selectedContentType.alias) === -1;
@@ -308,7 +308,10 @@
//based on the selection, we need to filter the available composite types list
filterAvailableCompositions(selectedContentType, newSelection).then(function () {
+ deferred.resolve({ selectedContentType, newSelection });
// TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+ }, function () {
+ deferred.reject();
});
});
}
@@ -318,10 +321,14 @@
//based on the selection, we need to filter the available composite types list
filterAvailableCompositions(selectedContentType, newSelection).then(function () {
+ deferred.resolve({ selectedContentType, newSelection });
// TODO: Here we could probably re-enable selection if we previously showed a throbber or something
+ }, function () {
+ deferred.reject();
});
}
+ return deferred.promise;
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
new file mode 100644
index 0000000000..517776388b
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbicon.directive.js
@@ -0,0 +1,86 @@
+/**
+@ngdoc directive
+@name umbraco.directives.directive:umbIcon
+@restrict E
+@scope
+@description
+Use this directive to show an render an umbraco backoffice svg icon. All svg icons used by this directive should use the following naming convention to keep things consistent: icon-[name of icon]. For example
@@ -102,10 +102,10 @@
{{topic.name}}
-
+ icon-alert.svg+ +
Markup example
+ +Simple icon +++ +Icon with additional attribute. It can be treated like any other dom element ++
++ +Manual svg string +This format is only used in the iconpicker.html ++
++@example + **/ + +(function () { + "use strict"; + + function UmbIconDirective(iconHelper) { + + var directive = { + replace: true, + transclude: true, + templateUrl: "views/components/umb-icon.html", + scope: { + icon: "@", + svgString: "=?" + }, + + link: function (scope) { + + if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) { + var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker + + _requestIcon(icon); + } + scope.$watch("icon", function (newValue, oldValue) { + if (newValue && oldValue) { + var newicon = newValue.split(" ")[0]; + var oldicon = oldValue.split(" ")[0]; + + if (newicon !== oldicon) { + _requestIcon(newicon); + } + } + }); + + function _requestIcon(icon) { + // Reset svg string before requesting new icon. + scope.svgString = null; + + iconHelper.getIcon(icon) + .then(data => { + if (data !== null && data.svgString !== undefined) { + // Watch source SVG string + //icon.svgString.$$unwrapTrustedValue(); + scope.svgString = data.svgString; + } + }); + } + } + + }; + + return directive; + } + + angular.module("umbraco.directives").directive("umbIcon", UmbIconDirective); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js index aa28d49c4a..241f1e80e8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js @@ -322,6 +322,41 @@ Use this directive to generate a thumbnail grid of media items. scope.$on('$destroy', function() { unbindItemsWatcher(); }); + //determine if sort is current + scope.sortColumn = "name"; + scope.sortReverse = false; + scope.sortDirection = "asc"; + //check sort status + scope.isSortDirection = function (col, direction) { + return col === scope.sortColumn && direction === scope.sortDirection; + }; + //change sort + scope.setSort = function (col) { + if (scope.sortColumn === col) { + scope.sortReverse = !scope.sortReverse; + } + else { + scope.sortColumn = col; + if (col === "updateDate") { + scope.sortReverse = true; + } + else { + scope.sortReverse = false; + } + } + scope.sortDirection = scope.sortReverse ? "desc" : "asc"; + + } + // sort function + scope.sortBy = function (item) { + if (scope.sortColumn === "updateDate") { + return [-item['isFolder'],item['updateDate']]; + } + else { + return [-item['isFolder'],item['name']]; + } + }; + } @@ -345,7 +380,8 @@ Use this directive to generate a thumbnail grid of media items. onlyImages: "@", onlyFolders: "@", includeSubFolders: "@", - currentFolderId: "@" + currentFolderId: "@", + showMediaList: "=" }, link: link }; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index 66e03a7302..3865ffcdae 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -63,7 +63,7 @@ } // update children miniListView.children = data.items; - _.each(miniListView.children, function(c) { + miniListView.children.forEach(c => { // child allowed by default c.allowed = true; @@ -95,7 +95,8 @@ var filtered = angular.isFunction(scope.entityTypeFilter.filter) ? _.filter(miniListView.children, scope.entityTypeFilter.filter) : _.where(miniListView.children, scope.entityTypeFilter.filter); - _.each(filtered, (node) => node.allowed = false); + + filtered.forEach(node => node.allowed = false); } // update pagination diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js index ef7006be2c..ce1885a7cf 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbtooltip.directive.js @@ -77,13 +77,17 @@ Use this directive to render a tooltip. scope.tooltipStyles.left = 0; scope.tooltipStyles.top = 0; - function setTooltipPosition(event) { + function setTooltipPosition(event) { - var container = $("#contentwrapper"); - var containerLeft = container[0].offsetLeft; - var containerRight = containerLeft + container[0].offsetWidth; - var containerTop = container[0].offsetTop; - var containerBottom = containerTop + container[0].offsetHeight; + var overlay = $(event.target).closest('.umb-overlay'); + var container = overlay.length > 0 ? overlay : $("#contentwrapper"); + + let rect = container[0].getBoundingClientRect(); + + var containerLeft = rect.left; + var containerRight = containerLeft + rect.width; + var containerTop = rect.top; + var containerBottom = containerTop + rect.height; var elementHeight = null; var elementWidth = null; @@ -102,39 +106,43 @@ Use this directive to render a tooltip. position.left = event.pageX - (elementWidth / 2); position.top = event.pageY; - // check to see if element is outside screen - // outside right - if (position.left + elementWidth > containerRight) { - position.right = 10; - position.left = "inherit"; + if (overlay.length > 0) { + position.left = event.pageX - rect.left - (elementWidth / 2); + position.top = event.pageY - rect.top; } + else { + // check to see if element is outside screen + // outside right + if (position.left + elementWidth > containerRight) { + position.right = 10; + position.left = "inherit"; + } - // outside bottom - if (position.top + elementHeight > containerBottom) { - position.bottom = 10; - position.top = "inherit"; - } + // outside bottom + if (position.top + elementHeight > containerBottom) { + position.bottom = 10; + position.top = "inherit"; + } - // outside left - if (position.left < containerLeft) { - position.left = containerLeft + 10; - position.right = "inherit"; - } + // outside left + if (position.left < containerLeft) { + position.left = containerLeft + 10; + position.right = "inherit"; + } - // outside top - if (position.top < containerTop) { - position.top = 10; - position.bottom = "inherit"; + // outside top + if (position.top < containerTop) { + position.top = 10; + position.bottom = "inherit"; + } } scope.tooltipStyles = position; el.css(position); - } setTooltipPosition(scope.event); - } var directive = { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js index 6a8ffa7969..3581aed9e0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js @@ -19,6 +19,17 @@ function umbFileUpload() { //clear the element value - this allows us to pick the same file again and again el.val(''); }); + + el.on('drag dragstart dragend dragover dragenter dragleave drop', function (e) { + e.preventDefault(); + e.stopPropagation(); + }) + .on('dragover dragenter', function () { + scope.$emit("isDragover", { value: true }); + }) + .on('dragleave dragend drop', function () { + scope.$emit("isDragover", { value: false }); + }); } }; } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js index 653b4f427c..db1e38adc6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbpropertyfileupload.directive.js @@ -78,6 +78,8 @@ /** Called when the component initializes */ function onInit() { $scope.$on("filesSelected", onFilesSelected); + $scope.$on("isDragover", isDragover); + initialize(); } @@ -118,7 +120,9 @@ isImage: mediaHelper.detectIfImageByExtension(file), extension: getExtension(file) }; + f.fileSrc = getThumbnail(f); + return f; }); @@ -228,19 +232,22 @@ var index = i; //capture var isImage = mediaHelper.detectIfImageByExtension(files[i].name); + var extension = getExtension(files[i].name); - //save the file object to the files collection - vm.files.push({ + var f = { isImage: isImage, - extension: getExtension(files[i].name), + extension: extension, fileName: files[i].name, isClientSide: true - }); + }; + + // Save the file object to the files collection + vm.files.push(f); //special check for a comma in the name newVal += files[i].name.split(',').join('-') + ","; - if (isImage) { + if (isImage || extension === "svg") { var deferred = $q.defer(); @@ -293,6 +300,11 @@ } } + function isDragover(e, args) { + vm.dragover = args.value; + angularHelper.safeApply($scope); + } + }; var umbPropertyFileUploadComponent = { @@ -303,6 +315,7 @@ propertyAlias: "@", value: "<", hideSelection: "<", + dragover: "<", /** * Called when a file is selected on this instance */ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js index 77c26e066e..c7894da171 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js @@ -204,7 +204,7 @@ function valFormManager(serverValidationManager, $rootScope, $timeout, $location var parts = nextPath.split("?"); var query = {}; if (parts.length > 1) { - _.each(parts[1].split("&"), function (q) { + parts[1].split("&").forEach(q => { var keyVal = q.split("="); query[keyVal[0]] = keyVal[1]; }); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js index 3b58c127a7..aeb6229360 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js @@ -8,12 +8,12 @@ angular.module('umbraco.mocks'). } function returnNodebyIds(status, data, headers) { - var ids = mocksUtils.getParameterByName(data, "ids") || "1234,1234,4234"; + var ids = mocksUtils.getParameterByName(data, "ids") || ['1234','1234','4234']; var items = []; - _.each(ids, function(id){ - items.push(_getNode( parseInt( id, 10 )) ); - }); + for (var i = 0; i < ids.length; i += 1) { + items.push(_getNode(parseInt(ids[i], 10))); + } return [200, items, null]; } @@ -26,8 +26,6 @@ angular.module('umbraco.mocks'). var id = mocksUtils.getParameterByName(data, "id") || 1234; id = parseInt(id, 10); - - return [200, _getNode(id), null]; } diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js index da6f78a6a5..868bc4c6d5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js @@ -19,7 +19,8 @@ Umbraco.Sys.ServerVariables = { "dashboardApiBaseUrl": "/umbraco/UmbracoApi/Dashboard/", "updateCheckApiBaseUrl": "/umbraco/Api/UpdateCheck/", "relationApiBaseUrl": "/umbraco/UmbracoApi/Relation/", - "rteApiBaseUrl": "/umbraco/UmbracoApi/RichTextPreValue/" + "rteApiBaseUrl": "/umbraco/UmbracoApi/RichTextPreValue/", + "iconApiBaseUrl": "/umbraco/UmbracoApi/Icon/" }, umbracoSettings: { "umbracoPath": "/umbraco", diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 4ca85f44e6..3dfbeade4f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -442,9 +442,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { getByIds: function (ids) { var idQuery = ""; - _.each(ids, function (item) { - idQuery += "ids=" + item + "&"; - }); + ids.forEach(id => idQuery += `ids=${id}&`); return umbRequestHelper.resourcePromise( $http.get( @@ -455,9 +453,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { 'Failed to retrieve data for content with multiple ids') .then(function (result) { //each item needs to be re-formatted - _.each(result, function (r) { - umbDataFormatter.formatContentGetData(r) - }); + result.forEach(r => umbDataFormatter.formatContentGetData(r)); return $q.when(result); }); }, diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js index e24f4786eb..06eb2ed4d2 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js @@ -226,9 +226,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) { getByIds: function (ids) { var idQuery = ""; - _.each(ids, function (item) { - idQuery += "ids=" + item + "&"; - }); + ids.forEach(id => idQuery += `ids=${id}&`); return umbRequestHelper.resourcePromise( $http.get( diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js index c83a31e47c..f9b9da9944 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/membergroup.resource.js @@ -32,9 +32,7 @@ function memberGroupResource($q, $http, umbRequestHelper) { getByIds: function (ids) { var idQuery = ""; - _.each(ids, function (item) { - idQuery += "ids=" + item + "&"; - }); + ids.forEach(id => idQuery += `ids=${id}&`); return umbRequestHelper.resourcePromise( $http.get( diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js index 6c15b89c0e..2314fa6d6c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/membertype.resource.js @@ -16,16 +16,15 @@ function memberTypeResource($q, $http, umbRequestHelper, umbDataFormatter) { } var query = ""; - _.each(filterContentTypes, function (item) { - query += "filterContentTypes=" + item + "&"; - }); + filterContentTypes.forEach(fct => query += `filterContentTypes=${fct}&`); + // if filterContentTypes array is empty we need a empty variable in the querystring otherwise the service returns a error if (filterContentTypes.length === 0) { query += "filterContentTypes=&"; } - _.each(filterPropertyTypes, function (item) { - query += "filterPropertyTypes=" + item + "&"; - }); + + filterPropertyTypes.forEach(fpt => query += `filterPropertyTypes=${fpt}&`); + // if filterPropertyTypes array is empty we need a empty variable in the querystring otherwise the service returns a error if (filterPropertyTypes.length === 0) { query += "filterPropertyTypes=&"; diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js index 2b9e0c0fd5..91f00a36e3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js @@ -295,6 +295,38 @@ "Failed to retrieve data for user " + userId); } + + /** + * @ngdoc method + * @name umbraco.resources.usersResource#getUsers + * @methodOf umbraco.resources.usersResource + * + * @description + * Gets users from ids + * + * ##usage + *+ +
+ * usersResource.getUsers([1,2,3])
+ * .then(function(data) {
+ * alert("It's here");
+ * });
+ *
+ *
+ * @param {Array} userIds user ids.
+ * @returns {Promise} resourcePromise object containing the users array.
+ *
+ */
+ function getUsers(userIds) {
+
+ return umbRequestHelper.resourcePromise(
+ $http.get(
+ umbRequestHelper.getApiUrl(
+ "userApiBaseUrl",
+ "GetByIds",
+ { ids: userIds })),
+ "Failed to retrieve data for users " + userIds);
+ }
+
/**
* @ngdoc method
* @name umbraco.resources.usersResource#createUser
@@ -481,6 +513,7 @@
setUserGroupsOnUsers: setUserGroupsOnUsers,
getPagedResults: getPagedResults,
getUser: getUser,
+ getUsers: getUsers,
createUser: createUser,
inviteUser: inviteUser,
saveUser: saveUser,
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
index 30e59e9a88..b474b66174 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
@@ -276,7 +276,7 @@ angular.module('umbraco.services')
//blocking
var promises = [];
var assets = [];
- _.each(nonEmpty, function (path) {
+ nonEmpty.forEach(path => {
path = convertVirtualPath(path);
var asset = service._getAssetPromise(path);
//if not previously loaded, add to list of promises
@@ -325,19 +325,17 @@ angular.module('umbraco.services')
scope = $rootScope;
}
angularHelper.safeApply(scope,
- function () {
- asset.deferred.resolve(true);
- });
+ () => asset.deferred.resolve(true));
}
if (cssAssets.length > 0) {
- var cssPaths = _.map(cssAssets, function (asset) { return appendRnd(asset.path) });
- LazyLoad.css(cssPaths, function () { _.each(cssAssets, assetLoaded); });
+ var cssPaths = cssAssets.map(css => appendRnd(css.path));
+ LazyLoad.css(cssPaths, () => cssAssets.forEach(assetLoaded));
}
if (jsAssets.length > 0) {
- var jsPaths = _.map(jsAssets, function (asset) { return appendRnd(asset.path) });
- LazyLoad.js(jsPaths, function () { _.each(jsAssets, assetLoaded); });
+ var jsPaths = jsAssets.map(js => appendRnd(js.path));
+ LazyLoad.js(jsPaths, () => jsAssets.forEach(assetLoaded));
}
return promise;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
index 4ffd0c3c0b..c27283d5ad 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
@@ -123,10 +123,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
self.handleSaveError({
showNotifications: args.showNotifications,
softRedirect: args.softRedirect,
- err: err,
- rebindCallback: function () {
- rebindCallback.apply(self, [args.content, err.data]);
- }
+ err: err
});
//update editor state to what is current
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
index 538bd41ce0..0f4f04c6bf 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
@@ -669,23 +669,6 @@ When building a custom infinite editor view you can use the same components as a
open(editor);
}
- /**
- * @ngdoc method
- * @name umbraco.services.editorService#memberTypeEditor
- * @methodOf umbraco.services.editorService
- *
- * @description
- * Opens the member type editor in infinite editing, the submit callback returns the saved member type
- * @param {Object} editor rendering options
- * @param {Callback} editor.submit Submits the editor
- * @param {Callback} editor.close Closes the editor
- * @returns {Object} editor object
- */
- function memberTypeEditor(editor) {
- editor.view = "views/membertypes/edit.html";
- open(editor);
- }
-
/**
* @ngdoc method
* @name umbraco.services.editorService#queryBuilder
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js b/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
new file mode 100644
index 0000000000..a3dd91194e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/focuslock.service.js
@@ -0,0 +1,26 @@
+(function () {
+ "use strict";
+
+ function focusLockService() {
+ var elementToInert = document.querySelector('#mainwrapper');
+
+ function addInertAttribute() {
+ elementToInert.setAttribute('inert', true);
+ }
+
+ function removeInertAttribute() {
+ elementToInert.removeAttribute('inert');
+ }
+
+ var service = {
+ addInertAttribute: addInertAttribute,
+ removeInertAttribute: removeInertAttribute
+ }
+
+ return service;
+
+ }
+
+ angular.module("umbraco.services").factory("focusLockService", focusLockService);
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
index 5866e28b1e..d9c11770cc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
@@ -17,10 +17,10 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
* @function
*
* @description
- * Called by controllers when submitting a form - this ensures that all client validation is checked,
+ * Called by controllers when submitting a form - this ensures that all client validation is checked,
* server validation is cleared, that the correct events execute and status messages are displayed.
* This returns true if the form is valid, otherwise false if form submission cannot continue.
- *
+ *
* @param {object} args An object containing arguments for form submission
*/
submitForm: function (args) {
@@ -33,6 +33,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
if (!args.scope) {
throw "args.scope cannot be null";
}
+
if (!args.formCtrl) {
//try to get the closest form controller
currentForm = angularHelper.getRequiredCurrentForm(args.scope);
@@ -44,15 +45,13 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
//the first thing any form must do is broadcast the formSubmitting event
args.scope.$broadcast("formSubmitting", { scope: args.scope, action: args.action });
- // Some property editors need to perform an action after all property editors have reacted to the formSubmitting.
- args.scope.$broadcast("formSubmittingFinalPhase", { scope: args.scope, action: args.action });
-
- // Set the form state to submitted
- currentForm.$setSubmitted();
+ this.focusOnFirstError(currentForm);
+ args.scope.$broadcast("postFormSubmitting", { scope: args.scope, action: args.action });
//then check if the form is valid
if (!args.skipValidation) {
if (currentForm.$invalid) {
+
return false;
}
}
@@ -68,6 +67,32 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
return true;
},
+ /**
+ * @ngdoc function
+ * @name umbraco.services.formHelper#focusOnFirstError
+ * @methodOf umbraco.services.formHelper
+ * @function
+ *
+ * @description
+ * Called by submitForm when a form has been submitted, it will fire a focus on the first found invalid umb-property it finds in the form..
+ *
+ * @param {object} form Pass in a form object.
+ */
+ focusOnFirstError: function(form) {
+ var invalidNgForms = form.$$element.find(`.umb-property ng-form.ng-invalid, .umb-property-editor ng-form.ng-invalid-required`);
+ var firstInvalidNgForm = invalidNgForms.first();
+
+ if(firstInvalidNgForm.length !== 0) {
+ var focusableFields = [...firstInvalidNgForm.find("umb-range-slider .noUi-handle,input,textarea,select,button")];
+ if(focusableFields.length !== 0) {
+ var firstErrorEl = focusableFields.find(el => el.type !== "hidden" && el.hasAttribute("readonly") === false);
+ if(firstErrorEl.length !== 0) {
+ firstErrorEl.focus();
+ }
+ }
+ }
+ },
+
/**
* @ngdoc function
* @name umbraco.services.formHelper#submitForm
@@ -76,32 +101,18 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
*
* @description
* Called by controllers when a form has been successfully submitted, this ensures the correct events are raised.
- *
+ *
* @param {object} args An object containing arguments for form submission
*/
resetForm: function (args) {
-
- var currentForm;
-
if (!args) {
throw "args cannot be null";
}
if (!args.scope) {
throw "args.scope cannot be null";
}
- if (!args.formCtrl) {
- //try to get the closest form controller
- currentForm = angularHelper.getRequiredCurrentForm(args.scope);
- }
- else {
- currentForm = args.formCtrl;
- }
- // Set the form state to pristine
- currentForm.$setPristine();
- currentForm.$setUntouched();
-
- args.scope.$broadcast(args.hasErrors ? "formSubmittedValidationFailed" : "formSubmitted", { scope: args.scope });
+ args.scope.$broadcast("formSubmitted", { scope: args.scope });
},
showNotifications: function (args) {
@@ -126,7 +137,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
* @description
* Needs to be called when a form submission fails, this will wire up all server validation errors in ModelState and
* add the correct messages to the notifications. If a server error has occurred this will show a ysod.
- *
+ *
* @param {object} err The error object returned from the http promise
*/
handleError: function (err) {
@@ -165,7 +176,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
*
* @description
* This wires up all of the server validation model state so that valServer and valServerField directives work
- *
+ *
* @param {object} err The error object returned from the http promise
*/
handleServerValidation: function (modelState) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
index 0fa2d0df1a..0d0135fff8 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js
@@ -3,7 +3,7 @@
* @name umbraco.services.iconHelper
* @description A helper service for dealing with icons, mostly dealing with legacy tree icons
**/
-function iconHelper($q, $timeout) {
+function iconHelper($http, $q, $sce, $timeout, umbRequestHelper) {
var converter = [
{ oldIcon: ".sprNew", newIcon: "add" },
@@ -85,11 +85,15 @@ function iconHelper($q, $timeout) {
{ oldIcon: ".sprTreeDeveloperPython", newIcon: "icon-linux" }
];
+ var collectedIcons;
+
var imageConverter = [
{oldImage: "contour.png", newIcon: "icon-umb-contour"}
];
- var collectedIcons;
+ var iconCache = [];
+ var liveRequests = [];
+ var allIconsRequested = false;
return {
@@ -154,9 +158,110 @@ function iconHelper($q, $timeout) {
return false;
},
- /** Return a list of icons, optionally filter them */
+ /** Converts the icon from legacy to a new one if an old one is detected */
+ convertFromLegacyIcon: function (icon) {
+ if (this.isLegacyIcon(icon)) {
+ //its legacy so convert it if we can
+ var found = _.find(converter, function (item) {
+ return item.oldIcon.toLowerCase() === icon.toLowerCase();
+ });
+ return (found ? found.newIcon : icon);
+ }
+ return icon;
+ },
+
+ convertFromLegacyImage: function (icon) {
+ var found = _.find(imageConverter, function (item) {
+ return item.oldImage.toLowerCase() === icon.toLowerCase();
+ });
+ return (found ? found.newIcon : undefined);
+ },
+
+ /** If we detect that the tree node has legacy icons that can be converted, this will convert them */
+ convertFromLegacyTreeNodeIcon: function (treeNode) {
+ if (this.isLegacyTreeNodeIcon(treeNode)) {
+ return this.convertFromLegacyIcon(treeNode.icon);
+ }
+ return treeNode.icon;
+ },
+
+ /** Gets a single IconModel */
+ getIcon: function(iconName) {
+ return $q((resolve, reject) => {
+ var icon = this._getIconFromCache(iconName);
+
+ if(icon !== undefined) {
+ resolve(icon);
+ } else {
+ var iconRequestPath = Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetIcon?iconName=' + iconName;
+
+ // If the current icon is being requested, wait a bit so that we don't have to make another http request and can instead get the icon from the cache.
+ // This is a bit rough and ready and could probably be improved used an event based system
+ if(liveRequests.indexOf(iconRequestPath) >= 0) {
+ setTimeout(() => {
+ resolve(this.getIcon(iconName));
+ }, 10);
+ } else {
+ liveRequests.push(iconRequestPath);
+ // TODO - fix bug where Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl is undefinied when help icon
+ umbRequestHelper.resourcePromise(
+ $http.get(iconRequestPath)
+ ,'Failed to retrieve icon: ' + iconName)
+ .then(icon => {
+ if(icon) {
+ var trustedIcon = {
+ name: icon.Name,
+ svgString: $sce.trustAsHtml(icon.SvgString)
+ };
+ this._cacheIcon(trustedIcon);
+
+ liveRequests = _.filter(liveRequests, iconRequestPath);
+
+ resolve(trustedIcon);
+ }
+ })
+ .catch(err => {
+ console.warn(err);
+ });
+ };
+
+ }
+ });
+ },
+
+ /** Gets all the available icons in the backoffice icon folder and returns them as an array of IconModels */
+ getAllIcons: function() {
+ return $q((resolve, reject) => {
+ if(allIconsRequested === false) {
+ allIconsRequested = true;
+
+ umbRequestHelper.resourcePromise(
+ $http.get(Umbraco.Sys.ServerVariables.umbracoUrls.iconApiBaseUrl + 'GetAllIcons')
+ ,'Failed to retrieve icons')
+ .then(icons => {
+ icons.forEach(icon => {
+ var trustedIcon = {
+ name: icon.Name,
+ svgString: $sce.trustAsHtml(icon.SvgString)
+ };
+
+ this._cacheIcon(trustedIcon);
+ });
+
+ resolve(iconCache);
+ })
+ .catch(err => {
+ console.warn(err);
+ });;
+ } else {
+ resolve(iconCache);
+ }
+ });
+ },
+
+ /** LEGACY - Return a list of icons from icon fonts, optionally filter them */
/** It fetches them directly from the active stylesheets in the browser */
- getIcons: function(){
+ getLegacyIcons: function(){
var deferred = $q.defer();
$timeout(function(){
if(collectedIcons){
@@ -188,8 +293,13 @@ function iconHelper($q, $timeout) {
s = s.substring(0, hasPseudo);
}
- if(collectedIcons.indexOf(s) < 0){
- collectedIcons.push(s);
+ var icon = {
+ name: s,
+ svgString: undefined
+ };
+
+ if(collectedIcons.indexOf(icon) < 0 && s !== "icon-chevron-up" && s !== "icon-chevron-down"){
+ collectedIcons.push(icon);
}
}
}
@@ -198,35 +308,20 @@ function iconHelper($q, $timeout) {
deferred.resolve(collectedIcons);
}
}, 100);
-
+
return deferred.promise;
},
- /** Converts the icon from legacy to a new one if an old one is detected */
- convertFromLegacyIcon: function (icon) {
- if (this.isLegacyIcon(icon)) {
- //its legacy so convert it if we can
- var found = _.find(converter, function (item) {
- return item.oldIcon.toLowerCase() === icon.toLowerCase();
- });
- return (found ? found.newIcon : icon);
- }
- return icon;
+ /** A simple cache to ensure that the icon is only requested from the server if is isn't already in memory */
+ _cacheIcon: function(icon) {
+ if(_.find(iconCache, {name: icon.name}) === undefined) {
+ iconCache = _.union(iconCache, [icon]);
+ }
},
- convertFromLegacyImage: function (icon) {
- var found = _.find(imageConverter, function (item) {
- return item.oldImage.toLowerCase() === icon.toLowerCase();
- });
- return (found ? found.newIcon : undefined);
- },
-
- /** If we detect that the tree node has legacy icons that can be converted, this will convert them */
- convertFromLegacyTreeNodeIcon: function (treeNode) {
- if (this.isLegacyTreeNodeIcon(treeNode)) {
- return this.convertFromLegacyIcon(treeNode.icon);
- }
- return treeNode.icon;
+ /** Returns the cached icon or undefined */
+ _getIconFromCache: function(iconName) {
+ return _.find(iconCache, {name: iconName});
}
};
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 75c9dccc30..6e5ee82ec7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -435,11 +435,16 @@ function mediaHelper(umbRequestHelper, $http, $log) {
imagePath,
animationProcessMode: options.animationProcessMode,
cacheBusterValue: options.cacheBusterValue,
- focalPoint: options.focalPoint,
+ focalPointLeft: options.focalPoint.left,
+ focalPointTop: options.focalPoint.top,
height: options.height,
mode: options.mode,
upscale: options.upscale || false,
- width: options.width
+ width: options.width,
+ cropX1: options.crop.x1,
+ cropX2: options.crop.x2,
+ cropY1: options.crop.y1,
+ cropY2: options.crop.y2
})),
"Failed to retrieve processed image URL for image: " + imagePath);
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index f903c44ad5..2a5d182a59 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -169,7 +169,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
//if the routing parameter keys are the same, we'll compare their values to see if any have changed and if so then the routing will be allowed.
if (diff1.length === 0 && diff2.length === 0) {
var partsChanged = 0;
- _.each(currRoutingKeys, function (k) {
+ currRoutingKeys.forEach(k => {
if (currUrlParams[k] != nextUrlParams[k]) {
partsChanged++;
}
@@ -206,7 +206,8 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
var toRetain = _.union(retainedQueryStrings, toRetain);
var currentSearch = $location.search();
$location.search('');
- _.each(toRetain, function (k) {
+
+ toRetain.forEach(k => {
if (currentSearch[k]) {
$location.search(k, currentSearch[k]);
}
@@ -240,7 +241,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
var toRetain = Utilities.copy(nextRouteParams);
var updated = false;
- _.each(retainedQueryStrings, function (r) {
+ retainedQueryStrings.forEach(r => {
// if mculture is set to null in nextRouteParams, the value will be undefined and we will not retain any query string that has a value of "null"
if (currRouteParams[r] && nextRouteParams[r] !== undefined && !nextRouteParams[r]) {
toRetain[r] = currRouteParams[r];
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
index 123845a63b..ea05dad4e7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js
@@ -8,14 +8,14 @@
(function () {
"use strict";
- function overlayService(eventsService, backdropService) {
+ function overlayService(eventsService, backdropService, focusLockService) {
var currentOverlay = null;
function open(newOverlay) {
// prevent two open overlays at the same time
- if(currentOverlay) {
+ if (currentOverlay) {
close();
}
@@ -23,32 +23,34 @@
var overlay = newOverlay;
// set the default overlay position to center
- if(!overlay.position) {
+ if (!overlay.position) {
overlay.position = "center";
}
// set the default overlay size to small
- if(!overlay.size) {
+ if (!overlay.size) {
overlay.size = "small";
}
// use a default empty view if nothing is set
- if(!overlay.view) {
+ if (!overlay.view) {
overlay.view = "views/common/overlays/default/default.html";
}
// option to disable backdrop clicks
- if(overlay.disableBackdropClick) {
+ if (overlay.disableBackdropClick) {
backdropOptions.disableEventsOnClick = true;
}
overlay.show = true;
+ focusLockService.addInertAttribute();
backdropService.open(backdropOptions);
currentOverlay = overlay;
eventsService.emit("appState.overlay", overlay);
}
function close() {
+ focusLockService.removeInertAttribute();
backdropService.close();
currentOverlay = null;
eventsService.emit("appState.overlay", null);
@@ -90,7 +92,6 @@
}
open(overlay);
-
}
function confirmDelete(overlay) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index fef286ec7e..803cd857b7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -21,8 +21,8 @@
*
*/
angular.module('umbraco.services')
- .factory('searchService', function ($q, $log, entityResource, contentResource, umbRequestHelper, $injector, searchResultFormatter) {
-
+ .factory('searchService', function (entityResource, $injector, searchResultFormatter) {
+
return {
/**
@@ -42,12 +42,11 @@ angular.module('umbraco.services')
throw "args.term is required";
}
- return entityResource.search(args.term, "Member", args.searchFrom).then(function (data) {
- _.each(data, function (item) {
- searchResultFormatter.configureMemberResult(item);
+ return entityResource.search(args.term, "Member", args.searchFrom)
+ .then(data => {
+ data.forEach(item => searchResultFormatter.configureMemberResult(item));
+ return data;
});
- return data;
- });
},
/**
@@ -67,12 +66,11 @@ angular.module('umbraco.services')
throw "args.term is required";
}
- return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
+ return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey)
_.each(data, function (item) {
- searchResultFormatter.configureContentResult(item);
+ data.forEach(item => searchResultFormatter.configureContentResult(item));
+ return data;
});
- return data;
- });
},
/**
@@ -92,12 +90,11 @@ angular.module('umbraco.services')
throw "args.term is required";
}
- return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) {
- _.each(data, function (item) {
- searchResultFormatter.configureMediaResult(item);
+ return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey)
+ .then(data => {
+ data.forEach(item => searchResultFormatter.configureMediaResult(item));
+ return data;
});
- return data;
- });
},
/**
@@ -117,10 +114,8 @@ angular.module('umbraco.services')
throw "args.term is required";
}
- return entityResource.searchAll(args.term, args.canceler).then(function (data) {
-
- _.each(data, function (resultByType) {
-
+ return entityResource.searchAll(args.term, args.canceler).then(data => {
+ Object.values(data).forEach(resultByType => {
//we need to format the search result data to include things like the subtitle, urls, etc...
// this is done with registered angular services as part of the SearchableTreeAttribute, if that
// is not found, than we format with the default formatter
@@ -140,7 +135,7 @@ angular.module('umbraco.services')
}
}
//now apply the formatter for each result
- _.each(resultByType.results, function (item) {
+ resultByType.results.forEach(item => {
formatterMethod.apply(this, [item, resultByType.treeAlias, resultByType.appAlias]);
});
@@ -148,12 +143,10 @@ angular.module('umbraco.services')
return data;
});
-
},
// TODO: This doesn't do anything!
setCurrent: function (sectionAlias) {
-
var currentSection = sectionAlias;
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 9945396262..5d6b4646a3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -1372,6 +1372,9 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
// throw "args.model.value is required";
//}
+ // force TinyMCE to load plugins/themes from minified files (see http://archive.tinymce.com/wiki.php/api4:property.tinymce.suffix.static)
+ args.editor.suffix = ".min";
+
var unwatch = null;
//Starts a watch on the model value so that we can update TinyMCE if the model changes behind the scenes or from the server
@@ -1516,6 +1519,8 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
});
args.editor.on('Dirty', function (e) {
+ syncContent(); // Set model.value to the RTE's content
+
//make the form dirty manually so that the track changes works, setting our model doesn't trigger
// the angular bits because tinymce replaces the textarea.
if (args.currentForm) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
index 0d6216f7cc..37485ea7eb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
@@ -54,7 +54,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
//take the last child
var childPath = this.getPath(node.children[node.children.length - 1]).join(",");
//check if this already exists, if so exit
- if (expandedPaths.indexOf(childPath) !== -1) {
+ if (expandedPaths.includes(childPath)) {
return;
}
@@ -65,18 +65,18 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
var clonedPaths = expandedPaths.slice(0); //make a copy to iterate over so we can modify the original in the iteration
- _.each(clonedPaths, function (p) {
+ clonedPaths.forEach(p => {
if (childPath.startsWith(p + ",")) {
//this means that the node's path supercedes this path stored so we can remove the current 'p' and replace it with node.path
expandedPaths.splice(expandedPaths.indexOf(p), 1); //remove it
- if (expandedPaths.indexOf(childPath) === -1) {
+ if (expandedPaths.includes(childPath) === false) {
expandedPaths.push(childPath); //replace it
}
}
else if (p.startsWith(childPath + ",")) {
//this means we've already tracked a deeper node so we shouldn't track this one
}
- else if (expandedPaths.indexOf(childPath) === -1) {
+ else if (expandedPaths.includes(childPath) === false) {
expandedPaths.push(childPath); //track it
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index 90125e7de6..78c8b5fa88 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -264,9 +264,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
//reset the tabs and set the active one
if (response.data.tabs && response.data.tabs.length > 0) {
- _.each(response.data.tabs, function (item) {
- item.active = false;
- });
+ response.data.tabs.forEach(item => item.active = false);
response.data.tabs[activeTabIndex].active = true;
}
@@ -327,7 +325,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
if (!jsonData) { throw "jsonData cannot be null"; }
if (Utilities.isArray(jsonData)) {
- _.each(jsonData, function (item) {
+ jsonData.forEach(item => {
if (!item.key || !item.value) { throw "jsonData array item must have both a key and a value property"; }
});
}
@@ -345,7 +343,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
var formData = new FormData();
//add the json data
if (Utilities.isArray(data)) {
- _.each(data, function(item) {
+ data.forEach(item => {
formData.append(item.key, !Utilities.isString(item.value) ? Utilities.toJson(item.value) : item.value);
});
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
index 1bda86c3b3..e6450798fb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js
@@ -12,36 +12,23 @@
{ "value": 4, "name": "Inactive", "key": "Inactive", "color": "warning" }
];
- localizationService.localizeMany(_.map(userStates, function (userState) {
- return "user_state" + userState.key;
- })).then(function (data) {
- var reg = /^\[[\S\s]*]$/g;
- _.each(data, function (value, index) {
- if (!reg.test(value)) {
- // Only translate if key exists
- userStates[index].name = value;
- }
+ localizationService.localizeMany(userStates.map(userState => "user_state" + userState.key))
+ .then(data => {
+ var reg = /^\[[\S\s]*]$/g;
+ data.forEach((value, index) => {
+ if (!reg.test(value)) {
+ // Only translate if key exists
+ userStates[index].name = value;
+ }
+ });
});
- });
- function getUserStateFromValue(value) {
- var foundUserState;
- angular.forEach(userStates, function (userState) {
- if(userState.value === value) {
- foundUserState = userState;
- }
- });
- return foundUserState;
+ function getUserStateFromValue(value) {
+ return userStates.find(userState => userState.value === value);
}
function getUserStateByKey(key) {
- var foundUserState;
- angular.forEach(userStates, function (userState) {
- if(userState.key === key) {
- foundUserState = userState;
- }
- });
- return foundUserState;
+ return userStates.find(userState => userState.key === key);
}
function getUserStatesFilter(userStatesObject) {
@@ -49,7 +36,7 @@
var userStatesFilter = [];
for (var key in userStatesObject) {
- if (userStatesObject.hasOwnProperty(key)) {
+ if (hasOwnProperty.call(userStatesObject, key)) {
var userState = getUserStateByKey(key);
if(userState) {
userState.count = userStatesObject[key];
@@ -59,7 +46,6 @@
}
return userStatesFilter;
-
}
////////////
@@ -71,10 +57,7 @@
};
return service;
-
}
angular.module('umbraco.services').factory('usersHelper', usersHelperService);
-
-
})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
index 82353df744..1fb5884d4c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
@@ -173,9 +173,9 @@ function umbModelMapper() {
/** This converts the source model to a basic entity model, it will throw an exception if there isn't enough data to create the model */
convertToEntityBasic: function (source) {
var required = ["id", "name", "icon", "parentId", "path"];
- _.each(required, function (k) {
- if (!_.has(source, k)) {
- throw "The source object does not contain the property " + k;
+ required.forEach(k => {
+ if (!hasOwnProperty.call(source, k)) {
+ throw `The source object does not contain the property ${k}`;
}
});
var optional = ["metaData", "key", "alias"];
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
index fc870858cf..cfe0940aa2 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
@@ -1,118 +1,121 @@
-
Configure your database
-- Enter connection and authentication details for the database you want to install Umbraco on -
+Configure your database
++ Enter connection and authentication details for the database you want to install Umbraco on +
-
-
+
+
+
-
-
- @@ -68,20 +69,17 @@
-
-
- - + ng-class="{'-disabled': compositeContentType.allowed === false || compositeContentType.inherited, '-selected': compositeContentType.selected}"> +++-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
index a6d1383640..6310545b20 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
@@ -202,7 +202,7 @@
var match = false;
// find and show if a match from the list has been chosen
- angular.forEach(vm.validationTypes, function (validationType, index) {
+ vm.validationTypes.forEach(function (validationType, index) {
if ($scope.model.property.validation.pattern === validationType.pattern) {
vm.selectedValidationType = vm.validationTypes[index];
vm.showValidationPattern = true;
@@ -212,7 +212,7 @@
// if there is no match - choose the custom validation option.
if (!match) {
- angular.forEach(vm.validationTypes, function (validationType) {
+ vm.validationTypes.forEach(function (validationType) {
if (validationType.key === "custom") {
vm.selectedValidationType = validationType;
vm.showValidationPattern = true;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
index 37a0d41207..05ebc56083 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
@@ -71,7 +71,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![{{model.target.name}}]()
+
+
+
+ Preview
+
+
+
+
+
+
+
+
+
+ Crop section
+
+
+
+
+
+
+
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
index 8e075e1ab4..b11ae02e4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.controller.js
@@ -46,9 +46,9 @@
function preSelect(selection) {
- angular.forEach(selection, function(selected){
-
- angular.forEach(vm.userGroups, function(userGroup){
+ selection.forEach(function (selected) {
+
+ vm.userGroups.forEach(function(userGroup){
if(selected.id === userGroup.id) {
userGroup.selected = true;
}
@@ -66,7 +66,7 @@
} else {
- angular.forEach($scope.model.selection, function(selectedUserGroup, index){
+ $scope.model.selection.forEach(function(selectedUserGroup, index){
if(selectedUserGroup.id === userGroup.id) {
userGroup.selected = false;
$scope.model.selection.splice(index, 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
index 2bd73a5558..a7021b2867 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
@@ -1,7 +1,7 @@
(function () {
"use strict";
- function UserPickerController($scope, usersResource, localizationService) {
+ function UserPickerController($scope, usersResource, localizationService, eventsService) {
var vm = this;
@@ -15,15 +15,18 @@
vm.submit = submit;
vm.close = close;
- //////////
+ vm.multiPicker = $scope.model.multiPicker === false ? false : true;
function onInit() {
vm.loading = true;
// set default title
- if(!$scope.model.title) {
- localizationService.localize("defaultdialogs_selectUsers").then(function(value){
+ if (!$scope.model.title) {
+
+ var labelKey = vm.multiPicker ? "defaultdialogs_selectUsers" : "defaultdialogs_selectUser";
+
+ localizationService.localize(labelKey).then(function(value){
$scope.model.title = value;
});
}
@@ -35,12 +38,11 @@
// get users
getUsers();
-
}
function preSelect(selection, users) {
- angular.forEach(selection, function(selected){
- angular.forEach(users, function(user){
+ Utilities.forEach(selection, function(selected){
+ Utilities.forEach(users, function(user){
if(selected.id === user.id) {
user.selected = true;
}
@@ -50,22 +52,39 @@
function selectUser(user) {
- if(!user.selected) {
-
+ if (!user.selected) {
user.selected = true;
$scope.model.selection.push(user);
-
} else {
- angular.forEach($scope.model.selection, function(selectedUser, index){
- if(selectedUser.id === user.id) {
- user.selected = false;
- $scope.model.selection.splice(index, 1);
+ if (user.selected) {
+ Utilities.forEach($scope.model.selection, function (selectedUser, index) {
+ if (selectedUser.id === user.id) {
+ user.selected = false;
+ $scope.model.selection.splice(index, 1);
+ }
+ });
+ } else {
+ if (!vm.multiPicker) {
+ deselectAllUsers($scope.model.selection);
}
- });
-
+ eventsService.emit("dialogs.userPicker.select", user);
+ user.selected = true;
+ $scope.model.selection.push(user);
+ }
}
+ if (!vm.multiPicker) {
+ submit($scope.model);
+ }
+ }
+
+ function deselectAllUsers(users) {
+ for (var i = 0; i < users.length; i++) {
+ var user = users[i];
+ user.selected = false;
+ }
+ users.length = 0;
}
var search = _.debounce(function () {
@@ -95,7 +114,6 @@
preSelect($scope.model.selection, vm.users);
vm.loading = false;
-
});
}
@@ -105,14 +123,14 @@
}
function submit(model) {
- if($scope.model.submit) {
+ if ($scope.model.submit) {
$scope.model.submit(model);
}
}
function close() {
- if($scope.model.close) {
- $scope.model.close();
+ if ($scope.model.close) {
+ $scope.model.close();
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
index e39d693b47..5536ce38c2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.html
@@ -19,7 +19,7 @@
-
+
{{vm.selectedLanguage.name}}
-
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
index c06a9400e7..ca8a2d7a47 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
@@ -24,13 +24,11 @@ function ItemPickerOverlay($scope, localizationService) {
event: null
};
- $scope.showTooltip = function(item, $event) {
+ $scope.showTooltip = function (item, $event) {
if (!item.tooltip) {
- if($scope.mouseLeave) {
- $scope.mouseLeave();
- }
return;
}
+
$scope.tooltip = {
show: true,
event: $event,
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
index ca5514c23d..405ca1d470 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
@@ -1,7 +1,6 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
index 88a67aaf18..9e628464b2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/create.html
@@ -1,7 +1,7 @@
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg
deleted file mode 100644
index 22ae3653e2..0000000000
Binary files a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.jpg and /dev/null differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png
new file mode 100644
index 0000000000..173d2f36d0
Binary files /dev/null and b/src/Umbraco.Web.UI.Client/src/views/dashboard/default/umbracotv.png differ
diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
index 26fa0cb72f..1d735e540f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagementresults.html
@@ -33,6 +33,7 @@
type="button"
button-style="link"
label-key="general_close"
+ shortcut="esc"
action="model.close()">
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html
index 1fc9a2adfd..e27433c739 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dataTypes/delete.html
@@ -106,9 +106,7 @@
-
-
+
-
+
Paste from clipboard
- -
+
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
index c133d5d38b..53a8ffae4b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
@@ -15,7 +15,7 @@
{{selectedLanguage.name}}
-
+
Change password
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
index c6c4f98e25..984ac9337a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-app-header.html
@@ -45,12 +45,4 @@
-
+
Create an item under {{currentNode.name}}
+ Create an item under {{currentNode.name}}
@@ -9,8 +9,10 @@
ng-submit="vm.createItem()"
val-form-manager>
-
-
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
index 2be4e522c3..716d994809 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js
@@ -11,7 +11,6 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig
var vm = this;
vm.itemKey = "";
-
vm.createItem = createItem;
function createItem() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
index 83daa6b243..e55dfd44a1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js
@@ -19,7 +19,7 @@ function DictionaryListController($scope, $location, dictionaryResource, localiz
dictionaryResource.getList()
.then(function (data) {
vm.items = data;
- angular.forEach(vm.items, function(item){
+ vm.items.forEach(function(item){
item.style = { "paddingLeft": item.level * 10 };
});
vm.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
index e467588219..452248b3ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
@@ -23,7 +23,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
index dfb126cc8e..2102ae0b28 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
@@ -24,6 +24,7 @@
+
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
index f0745e7f82..07346c5366 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
@@ -9,10 +9,10 @@
(function () {
"use strict";
- function MediaTypesEditController($scope, $routeParams, mediaTypeResource,
- dataTypeResource, editorState, contentEditingHelper, formHelper,
- navigationService, iconHelper, contentTypeHelper, notificationsService,
- $q, localizationService, overlayHelper, eventsService, angularHelper) {
+ function MediaTypesEditController($scope, $routeParams, $q,
+ mediaTypeResource, dataTypeResource, editorState, contentEditingHelper,
+ navigationService, iconHelper, contentTypeHelper, notificationsService,
+ localizationService, overlayHelper, eventsService, angularHelper) {
var vm = this;
var evts = [];
@@ -248,6 +248,7 @@
});
if (create) {
+
vm.page.loading = true;
//we are creating so get an empty data type item
@@ -370,18 +371,6 @@
function init(contentType) {
- // set all tab to inactive
- if (contentType.groups.length !== 0) {
- angular.forEach(contentType.groups, function (group) {
-
- angular.forEach(group.properties, function (property) {
- // get data type details for each property
- getDataTypeDetails(property);
- });
-
- });
- }
-
// convert icons for content type
convertLegacyIcons(contentType);
@@ -405,18 +394,6 @@
contentType.icon = contentTypeArray[0].icon;
}
- function getDataTypeDetails(property) {
- if (property.propertyState !== "init") {
-
- dataTypeResource.getById(property.dataTypeId)
- .then(function(dataType) {
- property.dataTypeIcon = dataType.icon;
- property.dataTypeName = dataType.name;
- });
- }
- }
-
-
/** Syncs the content type to it's tree node - this occurs on first load and after saving */
function syncTreeNode(dt, path, initialLoad) {
navigationService.syncTree({ tree: "mediatypes", path: path.split(","), forceReload: initialLoad !== true }).then(function(syncArgs) {
@@ -425,7 +402,7 @@
}
function close() {
- if(infiniteMode && $scope.model.close) {
+ if (infiniteMode && $scope.model.close) {
$scope.model.close();
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js
index 53a098a26e..7ff4793272 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/views/permissions/permissions.controller.js
@@ -6,7 +6,6 @@
/* ----------- SCOPE VARIABLES ----------- */
var vm = this;
- var childNodeSelectorOverlayTitle = "";
vm.mediaTypes = [];
vm.selectedChildren = [];
@@ -22,10 +21,6 @@
function init() {
- localizationService.localize("contentTypeEditor_chooseChildNode").then(function(value){
- childNodeSelectorOverlayTitle = value;
- });
-
mediaTypeResource.getAll().then(function(mediaTypes){
vm.mediaTypes = mediaTypes;
@@ -44,23 +39,29 @@
}
function addChild($event) {
- var childNodeSelectorOverlay = {
+
+ var dialog = {
view: "itempicker",
- title: childNodeSelectorOverlayTitle,
availableItems: vm.mediaTypes,
selectedItems: vm.selectedChildren,
position: "target",
event: $event,
- submit: function(model) {
- vm.selectedChildren.push(model.selectedItem);
- $scope.model.allowedContentTypes.push(model.selectedItem.id);
+ submit: function (model) {
+ if (model.selectedItem) {
+ vm.selectedChildren.push(model.selectedItem);
+ $scope.model.allowedContentTypes.push(model.selectedItem.id);
+ }
overlayService.close();
},
close: function() {
overlayService.close();
}
};
- overlayService.open(childNodeSelectorOverlay);
+
+ localizationService.localize("contentTypeEditor_chooseChildNode").then(value => {
+ dialog.title = value;
+ overlayService.open(dialog);
+ });
}
function removeChild(selectedChild, index) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
index 635c536816..a2b38ee9bf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.controller.js
@@ -5,6 +5,14 @@
var vm = this;
+ vm.hideSystemProperties = function (property) {
+ // hide some specific, known properties by alias
+ if (property.alias === "_umb_id" || property.alias === "_umb_doctype") {
+ return false;
+ }
+ // hide all label properties with the alias prefix "umbracoMember" (e.g. "umbracoMemberFailedPasswordAttempts")
+ return property.view !== "readonlyvalue" || property.alias.startsWith('umbracoMember') === false;
+ }
}
angular.module("umbraco").controller("Umbraco.Editors.Member.Apps.ContentController", MemberAppContentController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
index 29df5ba638..1256c2d234 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
@@ -7,7 +7,7 @@
| - {{item.name}} - | +||
| + {{item.name}} + |
-
-
+
+
+ |
|
|
|
-
-
+
Search With Google
-
+
Search With Bing
-
+
Search Our Umbraco
-
+
Search Our Umbraco with Google
-
+
Search Umbraco Source
-
+
Search Umbraco Issues
@@ -232,7 +238,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index c5d35ad241..97e9f8e0de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -6,10 +6,10 @@
* @description
* The controller for the media editor
*/
-function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
+function mediaEditController($scope, $routeParams, $location, $http, $q, appState, mediaResource,
entityResource, navigationService, notificationsService, localizationService,
serverValidationManager, contentEditingHelper, fileManager, formHelper,
- editorState, umbRequestHelper, $http, eventsService, $location) {
+ editorState, umbRequestHelper, eventsService) {
var evts = [];
var nodeId = null;
@@ -104,12 +104,10 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
content.apps[0].active = true;
$scope.appChanged(content.apps[0]);
}
-
editorState.set($scope.content);
bindEvents();
-
}
function bindEvents() {
@@ -261,7 +259,6 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
$scope.page.loading = false;
$q.resolve($scope.content);
-
});
}
@@ -283,7 +280,7 @@ function mediaEditController($scope, $routeParams, $q, appState, mediaResource,
$scope.showBack = function () {
return !infiniteMode && !!$scope.page.listViewPath;
- }
+ };
/** Callback for when user clicks the back-icon */
$scope.onBack = function() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html
index fb0c4c3a52..de41b6a21f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/delete.html
@@ -24,8 +24,7 @@
-
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
index b70ae2cbf1..0f49c7f322 100644
--- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
@@ -6,9 +6,15 @@
* @description
* The controller for the member editor
*/
-function MemberEditController($scope, $routeParams, $location, appState, memberResource, entityResource, navigationService, notificationsService, localizationService, serverValidationManager, contentEditingHelper, fileManager, formHelper, editorState, umbRequestHelper, $http) {
+function MemberEditController($scope, $routeParams, $location, $http, $q, appState, memberResource,
+ entityResource, navigationService, notificationsService, localizationService,
+ serverValidationManager, contentEditingHelper, fileManager, formHelper,
+ editorState, umbRequestHelper, eventsService) {
+
+ var evts = [];
var infiniteMode = $scope.model && $scope.model.infiniteMode;
+
var id = infiniteMode ? $scope.model.id : $routeParams.id;
var create = infiniteMode ? $scope.model.create : $routeParams.create;
var listName = infiniteMode ? $scope.model.listname : $routeParams.listName;
@@ -66,53 +72,11 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
}
else {
- //so, we usually refernce all editors with the Int ID, but with members we have
- //a different pattern, adding a route-redirect here to handle this just in case.
- //(isNumber doesnt work here since its seen as a string)
- //The reason this might be an INT is due to the routing used for the member list view
- //but this is now configured to use the key, so this is just a fail safe
-
- if (id && id.length < 9) {
-
- entityResource.getById(id, "Member").then(function(entity) {
- $location.path("/member/member/edit/" + entity.key);
+ $scope.page.loading = true;
+ loadMember()
+ .then(function () {
+ $scope.page.loading = false;
});
- }
- else {
-
- //we are editing so get the content item from the server
- memberResource.getByKey(id)
- .then(function(data) {
-
- $scope.content = data;
-
- init();
-
- if (!infiniteMode) {
- var path = buildTreePath(data);
-
- //sync the tree (only for ui purposes)
- navigationService.syncTree({ tree: "member", path: path.split(",") });
- }
- //it's the initial load of the editor, we need to get the tree node
- // from the server so that we can load in the actions menu.
- umbRequestHelper.resourcePromise(
- $http.get(data.treeNodeUrl),
- 'Failed to retrieve data for child node ' + data.key).then(function (node) {
- $scope.page.menu.currentNode = node;
- });
-
- //in one particular special case, after we've created a new item we redirect back to the edit
- // route but there might be server validation errors in the collection which we need to display
- // after the redirect, so we will bind all subscriptions which will show the server validation errors
- // if there are any and then clear them so the collection no longer persists them.
- serverValidationManager.notifyAndClearAllSubscriptions();
-
- $scope.page.loading = false;
-
- });
- }
-
}
function init() {
@@ -157,6 +121,51 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
editorState.set($scope.content);
+ bindEvents();
+ }
+
+ function bindEvents() {
+ //bindEvents can be called more than once and we don't want to have multiple bound events
+ for (var e in evts) {
+ eventsService.unsubscribe(evts[e]);
+ }
+
+ evts.push(eventsService.on("editors.memberType.saved", function (name, args) {
+ // if this member item uses the updated member type we need to reload the member item
+ if (args && args.memberType && args.memberType.key.replace(/-/g, '') === $scope.content.contentType.key) {
+ $scope.page.loading = true;
+ loadMember().then(function () {
+ $scope.page.loading = false;
+ });
+ }
+ }));
+ }
+
+ /** Syncs the content item to it's tree node - this occurs on first load and after saving */
+ function syncTreeNode(content, path, initialLoad) {
+
+ if (infiniteMode) {
+ return;
+ }
+
+ if (!$scope.content.isChildOfListView) {
+ navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
+ $scope.page.menu.currentNode = syncArgs.node;
+ });
+ }
+ else if (initialLoad === true) {
+
+ //it's a child item, just sync the ui node to the parent
+ navigationService.syncTree({ tree: "member", path: path.substring(0, path.lastIndexOf(",")).split(","), forceReload: initialLoad !== true });
+
+ //if this is a child of a list view and it's the initial load of the editor, we need to get the tree node
+ // from the server so that we can load in the actions menu.
+ umbRequestHelper.resourcePromise(
+ $http.get(content.treeNodeUrl),
+ 'Failed to retrieve data for child node ' + content.id).then(function (node) {
+ $scope.page.menu.currentNode = node;
+ });
+ }
}
/** Just shows a simple notification that there are client side validation issues to be fixed */
@@ -184,24 +193,35 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
formHelper.resetForm({ scope: $scope });
- contentEditingHelper.handleSuccessfulSave({
- scope: $scope,
- savedContent: data,
- //specify a custom id to redirect to since we want to use the GUID
- redirectId: data.key,
- rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
- });
+ // close the editor if it's infinite mode
+ // submit function manages rebinding changes
+ if (infiniteMode && $scope.model.submit) {
+ $scope.model.memberNode = $scope.content;
+ $scope.model.submit($scope.model);
+ } else {
+ // if not infinite mode, rebind changed props etc
+ contentEditingHelper.handleSuccessfulSave({
+ scope: $scope,
+ savedContent: data,
+ //specify a custom id to redirect to since we want to use the GUID
+ redirectId: data.key,
+ rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
+ });
- editorState.set($scope.content);
- $scope.page.saveButtonState = "success";
+ editorState.set($scope.content);
- var path = buildTreePath(data);
+ var path = buildTreePath(data);
- //sync the tree (only for ui purposes)
- navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
+ navigationService.syncTree({ tree: "member", path: path.split(",") });
+ //syncTreeNode($scope.content, data.path);
+
+ $scope.page.saveButtonState = "success";
+
+ init();
+ }
+
+ }, function(err) {
- }, function (err) {
- formHelper.resetForm({ scope: $scope, hasErrors: true });
contentEditingHelper.handleSaveError({
err: err,
rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, err.data)
@@ -218,6 +238,69 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
};
+ function loadMember() {
+
+ var deferred = $q.defer();
+
+ //so, we usually reference all editors with the Int ID, but with members we have
+ //a different pattern, adding a route-redirect here to handle this just in case.
+ //(isNumber doesnt work here since its seen as a string)
+ //The reason this might be an INT is due to the routing used for the member list view
+ //but this is now configured to use the key, so this is just a fail safe
+
+ if (id && id.length < 9) {
+
+ entityResource.getById(id, "Member").then(function (entity) {
+ $location.path("/member/member/edit/" + entity.key);
+
+ deferred.resolve($scope.content);
+ }, function () {
+ deferred.reject();
+ });
+ }
+ else {
+
+ //we are editing so get the content item from the server
+ memberResource.getByKey(id)
+ .then(function (data) {
+
+ $scope.content = data;
+
+ if (!infiniteMode) {
+ var path = buildTreePath(data);
+
+ navigationService.syncTree({ tree: "member", path: path.split(","), forceReload: true });
+ //syncTreeNode($scope.content, data.path, true);
+ }
+
+ //it's the initial load of the editor, we need to get the tree node
+ // from the server so that we can load in the actions menu.
+ umbRequestHelper.resourcePromise(
+ $http.get(data.treeNodeUrl),
+ 'Failed to retrieve data for child node ' + data.key).then(function (node) {
+ $scope.page.menu.currentNode = node;
+ });
+
+ //in one particular special case, after we've created a new item we redirect back to the edit
+ // route but there might be server validation errors in the collection which we need to display
+ // after the redirect, so we will bind all subscriptions which will show the server validation errors
+ // if there are any and then clear them so the collection no longer persists them.
+ serverValidationManager.notifyAndClearAllSubscriptions();
+
+ init();
+
+ $scope.page.loading = false;
+
+ deferred.resolve($scope.content);
+
+ }, function () {
+ deferred.reject();
+ });
+ }
+
+ return deferred.promise;
+ }
+
$scope.appChanged = function (app) {
$scope.app = app;
@@ -228,8 +311,8 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
}
$scope.showBack = function () {
- return !!listName;
- }
+ return !infiniteMode && !!listName;
+ };
/** Callback for when user clicks the back-icon */
$scope.onBack = function () {
@@ -240,11 +323,17 @@ function MemberEditController($scope, $routeParams, $location, appState, memberR
}
};
- $scope.export = function() {
+ $scope.export = function () {
var memberKey = $scope.content.key;
memberResource.exportMemberData(memberKey);
- }
+ };
+ //ensure to unregister from all events!
+ $scope.$on('$destroy', function () {
+ for (var e in evts) {
+ eventsService.unsubscribe(evts[e]);
+ }
+ });
}
angular.module("umbraco").controller("Umbraco.Editors.Member.EditController", MemberEditController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html
index d87b6737f4..1939b9e659 100644
--- a/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/memberTypes/delete.html
@@ -13,8 +13,7 @@
-
@@ -105,7 +105,7 @@
Package Content
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index e693801495..865b59506b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -6,7 +6,6 @@
-
@@ -208,7 +208,7 @@
Package Files
-
+
-
+
+
@@ -267,7 +267,7 @@
Package Actions
-
+
@@ -44,26 +44,29 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index ab1b84db97..2fb2aab352 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -15,12 +15,11 @@
@@ -14,7 +14,7 @@
-
+
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
index 4064df6a24..69de132715 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
@@ -15,14 +15,14 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
//ensure this is a bool, old data could store zeros/ones or string versions
$scope.model.config.multiple = Object.toBoolean($scope.model.config.multiple);
-
+
//ensure when form is saved that we don't store [] or [null] as string values in the database when no items are selected
$scope.$on("formSubmitting", function () {
- if ($scope.model.value && ($scope.model.value.length === 0 || $scope.model.value[0] === null)) {
+ if ($scope.model.value !== null && ($scope.model.value.length === 0 || $scope.model.value[0] === null)) {
$scope.model.value = null;
}
});
-
+
function convertArrayToDictionaryArray(model){
//now we need to format the items in the dictionary because we always want to have an array
var newItems = [];
@@ -41,7 +41,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
var keys = _.keys($scope.model.config.items);
for (var i = 0; i < vals.length; i++) {
- var label = vals[i].value ? vals[i].value : vals[i];
+ var label = vals[i].value ? vals[i].value : vals[i];
newItems.push({ id: keys[i], sortOrder: vals[i].sortOrder, value: label });
}
@@ -65,7 +65,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
else {
throw "The items property must be either an array or a dictionary";
}
-
+
//sort the values
$scope.model.config.items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
@@ -80,7 +80,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.DropdownFlexibleCo
$scope.model.value = "";
}
}
-
+
// if we run in single mode we'll store the value in a local variable
// so we can pass an array as the model as our PropertyValueEditor expects that
$scope.model.singleDropdownValue = "";
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
index e56bc67a49..969f675139 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.controller.js
@@ -1,10 +1,66 @@
-function EditConfigController($scope) {
+function EditConfigController($scope, angularHelper) {
var vm = this;
-
+
vm.submit = submit;
vm.close = close;
+ vm.aceOption = {
+ mode: "json",
+ theme: "chrome",
+ showPrintMargin: false,
+ advanced: {
+ fontSize: '14px',
+ enableSnippets: true,
+ enableBasicAutocompletion: true,
+ enableLiveAutocompletion: false
+ },
+ onLoad: function (_editor) {
+ vm.editor = _editor;
+
+ vm.configJson = Utilities.toJson($scope.model.config, true);
+
+ vm.editor.setValue(vm.configJson);
+
+ vm.editor.on("blur", blurAceEditor);
+ }
+ };
+
+ function blurAceEditor(event, _editor) {
+ const code = _editor.getValue();
+
+ //var form = angularHelper.getCurrentForm($scope);
+ var form = vm.gridConfigEditor;
+ var isValid = isValidJson(code);
+
+ if (isValid) {
+ $scope.model.config = Utilities.fromJson(code);
+
+ setValid(form);
+ }
+ else {
+ setInvalid(form);
+ }
+ }
+
+ function isValidJson(model) {
+ var flag = true;
+ try {
+ Utilities.fromJson(model)
+ } catch (err) {
+ flag = false;
+ }
+ return flag;
+ }
+
+ function setValid(form) {
+ form.$setValidity('json', true);
+ }
+
+ function setInvalid(form) {
+ form.$setValidity('json', false);
+ }
+
function submit() {
if ($scope.model && $scope.model.submit) {
$scope.model.submit($scope.model);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
index 9fed19d4d9..4470c50274 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/editconfig.html
@@ -16,16 +16,18 @@
{{model.name}}
Settings will only save if the entered json configuration is valid
- -
+
+
+
+
This configuration is not valid json, and will not be saved.
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
index 876e4cf8f3..cf201976ad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
@@ -2,17 +2,29 @@ angular.module("umbraco")
.controller("Umbraco.PropertyEditors.GridPrevalueEditor.LayoutConfigController",
function ($scope, localizationService) {
+ var vm = this;
+
+ vm.labels = {};
function init() {
- setTitle();
+
+ var labelKeys = [
+ "grid_addGridLayout",
+ "grid_allowAllRowConfigurations"
+ ];
+
+ localizationService.localizeMany(labelKeys).then(function (data) {
+
+ vm.labels.title = data[0];
+ vm.labels.allowAllRowConfigurations = data[1];
+
+ setTitle(vm.labels.title);
+ });
}
- function setTitle() {
+ function setTitle(value) {
if (!$scope.model.title) {
- localizationService.localize("grid_addGridLayout")
- .then(function(data){
- $scope.model.title = data;
- });
+ $scope.model.title = value;
}
}
@@ -56,13 +68,15 @@ angular.module("umbraco")
};
$scope.toggleAllowed = function (section) {
+ section.allowAll = !section.allowAll;
+
if (section.allowed) {
delete section.allowed;
}
else {
section.allowed = [];
}
- }
+ };
$scope.deleteSection = function(section, template) {
if ($scope.currentSection === section) {
@@ -71,19 +85,32 @@ angular.module("umbraco")
var index = template.sections.indexOf(section)
template.sections.splice(index, 1);
};
-
+
+ $scope.selectRow = function (section, row) {
+ section.allowed = section.allowed || [];
+
+ var index = section.allowed.indexOf(row.name);
+ if (row.allowed === true) {
+ if (index === -1) {
+ section.allowed.push(row.name);
+ }
+ }
+ else {
+ section.allowed.splice(index, 1);
+ }
+ };
$scope.close = function() {
- if($scope.model.close) {
+ if ($scope.model.close) {
$scope.model.close();
}
- }
+ };
$scope.submit = function () {
if ($scope.model.submit) {
$scope.model.submit($scope.currentLayout);
}
- }
+ };
$scope.$watch("currentLayout", function(layout){
if(layout){
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
index 06afaa6b45..49e478a10b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
@@ -1,166 +1,165 @@
-
-
-
-
+
+
-
+
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
index 263e7c0d9a..83a9fd5394 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
@@ -1,22 +1,34 @@
function RowConfigController($scope, localizationService) {
+ var vm = this;
+
+ vm.labels = {};
+
function init() {
- setTitle();
+
+ var labelKeys = [
+ "grid_addRowConfiguration",
+ "grid_allowAllEditors"
+ ];
+
+ localizationService.localizeMany(labelKeys).then(function (data) {
+
+ vm.labels.title = data[0];
+ vm.labels.allowAllEditors = data[1];
+
+ setTitle(vm.labels.title);
+ });
}
- function setTitle() {
+ function setTitle(value) {
if (!$scope.model.title) {
- localizationService.localize("grid_addRowConfiguration")
- .then(function(data){
- $scope.model.title = data;
- });
+ $scope.model.title = value;
}
}
-
$scope.currentRow = $scope.model.currentRow;
- $scope.editors = $scope.model.editors;
$scope.columns = $scope.model.columns;
+ $scope.editors = $scope.model.editors;
$scope.scaleUp = function(section, max, overflow) {
var add = 1;
@@ -44,7 +56,7 @@ function RowConfigController($scope, localizationService) {
delete $scope.currentCell;
}
else {
- if (cell === undefined) {
+ if (cell === null) {
var available = $scope.availableRowSpace;
var space = 4;
@@ -58,43 +70,64 @@ function RowConfigController($scope, localizationService) {
row.areas.push(cell);
}
+
+ cell.allowed = cell.allowed || [];
+
+ $scope.editors.forEach(function (e) { e.allowed = cell.allowed.indexOf(e.alias) !== -1 });
+
$scope.currentCell = cell;
$scope.currentCell.allowAll = cell.allowAll || !cell.allowed || !cell.allowed.length;
}
};
$scope.toggleAllowed = function (cell) {
+ cell.allowAll = !cell.allowAll;
+
if (cell.allowed) {
delete cell.allowed;
}
else {
cell.allowed = [];
}
- }
+ };
$scope.deleteArea = function (cell, row) {
if ($scope.currentCell === cell) {
- $scope.currentCell = undefined;
+ $scope.currentCell = null;
}
var index = row.areas.indexOf(cell)
row.areas.splice(index, 1);
};
$scope.closeArea = function() {
- $scope.currentCell = undefined;
+ $scope.currentCell = null;
+ };
+
+ $scope.selectEditor = function (cell, editor) {
+ cell.allowed = cell.allowed || [];
+
+ var index = cell.allowed.indexOf(editor.alias);
+ if (editor.allowed === true) {
+ if (index === -1) {
+ cell.allowed.push(editor.alias);
+ }
+ }
+ else {
+ cell.allowed.splice(index, 1);
+ }
};
- $scope.close = function() {
- if($scope.model.close) {
+ $scope.close = function () {
+ if ($scope.model.close) {
$scope.model.close();
}
- }
+ };
$scope.submit = function () {
if ($scope.model.submit) {
$scope.model.submit($scope.currentRow);
}
- }
+ };
$scope.nameChanged = false;
var originalName = $scope.currentRow.name;
@@ -118,11 +151,8 @@ function RowConfigController($scope, localizationService) {
}
}
}, true);
-
init();
-
-
}
angular.module("umbraco").controller("Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController", RowConfigController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index 9e7034688b..b74ef6bf09 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -1,10 +1,8 @@
-
+
+
-
-
-
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
index 7c98fbfc5e..0d558e166c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
@@ -20,7 +20,16 @@ angular.module("umbraco")
$scope.setImage = function () {
var startNodeId = $scope.model.config && $scope.model.config.startNodeId ? $scope.model.config.startNodeId : undefined;
var startNodeIsVirtual = startNodeId ? $scope.model.config.startNodeIsVirtual : undefined;
-
+ var value = $scope.control.value;
+ var target = value
+ ? {
+ udi: value.udi,
+ url: value.image,
+ image: value.image,
+ focalPoint: value.focalPoint,
+ coordinates: value.coordinates
+ }
+ : null;
var mediaPicker = {
startNodeId: startNodeId,
startNodeIsVirtual: startNodeIsVirtual,
@@ -29,11 +38,13 @@ angular.module("umbraco")
disableFolderSelect: true,
onlyImages: true,
dataTypeKey: $scope.model.dataTypeKey,
+ currentTarget: target,
submit: function (model) {
var selectedImage = model.selection[0];
$scope.control.value = {
focalPoint: selectedImage.focalPoint,
+ coordinates: selectedImage.coordinates,
id: selectedImage.id,
udi: selectedImage.udi,
image: selectedImage.image,
@@ -69,25 +80,46 @@ angular.module("umbraco")
}
else {
if ($scope.control.editor.config && $scope.control.editor.config.size) {
+ if ($scope.control.value.coordinates) {
+ // New way, crop by percent must come before width/height.
+ imageOptions.crop = $scope.control.value.coordinates;
+ imageOptions.mode = "percentage"
+ } else {
+ // Here in order not to break existing content where focalPoint were used.
+ // For some reason width/height have to come first when mode=crop.
+ if ($scope.control.value.focalPoint) {
+ imageOptions.focalPoint = {
+ left: $scope.control.value.focalPoint.left,
+ top: $scope.control.value.focalPoint.top
+ }
+ imageOptions.mode = "crop";
+ } else {
+ // Prevent black padding and no crop when focal point not set / changed from default
+ imageOptions.focalPoint = {
+ left: 0.5,
+ top: 0.5
+ }
+ imageOptions.mode = "crop";
+ }
+ }
imageOptions.animationprocessmode = "first";
imageOptions.height = $scope.control.editor.config.size.height;
imageOptions.width = $scope.control.editor.config.size.width;
}
- if ($scope.control.value.focalPoint) {
- imageOptions.focalPoint = {
- left: $scope.control.value.focalPoint.left,
- top: $scope.control.value.focalPoint.top
- }
- imageOptions.mode = "crop";
- }
+ // set default size if no crop present (moved from the view)
+ if (url.indexOf('?') == -1)
+ {
+ imageOptions.width = 800;
+ imageOptions.upscale = false;
+ imageOptions.animationprocessmode = false;
}
-
- mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
- .then(function (url) {
- $scope.thumbnailUrl = url;
- });
}
- };
+ mediaHelper.getProcessedImageUrl($scope.control.value.image, imageOptions)
+ .then(function (url) {
+ $scope.thumbnailUrl = url;
+ });
+ }
+ };
- });
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
index 184f707ebf..fa32821917 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html
@@ -1,16 +1,16 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index a0826f7a96..6d3383c51e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -405,14 +405,16 @@ angular.module("umbraco")
eventsService.emit("grid.rowAdded", { scope: $scope, element: $element, row: row });
- // TODO: find a nicer way to do this without relying on setTimeout
- setTimeout(function () {
- var newRowEl = $element.find("[data-rowid='" + row.$uniqueId + "']");
+ if (!isInit) {
+ // TODO: find a nicer way to do this without relying on setTimeout
+ setTimeout(function () {
+ var newRowEl = $element.find("[data-rowid='" + row.$uniqueId + "']");
- if (newRowEl !== null) {
- newRowEl.focus();
- }
- }, 0);
+ if (newRowEl !== null) {
+ newRowEl.focus();
+ }
+ }, 0);
+ }
};
@@ -953,7 +955,7 @@ angular.module("umbraco")
$scope.availableEditors = response.data;
//Localize the grid editor names
- angular.forEach($scope.availableEditors, function (value, key) {
+ $scope.availableEditors.forEach(function (value) {
//If no translation is provided, keep using the editor name from the manifest
localizationService.localize("grid_" + value.alias, undefined, value.name).then(function (v) {
value.name = v;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index 0628766638..afb754a0ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -22,7 +22,7 @@
-
+
-
+
Click to insert image
-
+
- ![]()
+
+ ![]()
-
+
-
@@ -95,10 +95,10 @@
{{row.label || row.name}}
-
-
@@ -138,24 +138,27 @@
-
+
-
-
-
+
@@ -163,8 +166,10 @@
@@ -196,13 +201,17 @@
-
+
-
-
@@ -226,7 +235,7 @@
@@ -266,7 +275,7 @@
-
+
-