").after(lnk);
- }
- };
-
- return directive;
-
- }
-
- angular.module('umbraco.directives').directive('umbPasswordToggle', PasswordToggleDirective);
-
-})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
index 0003658600..21a1f181a6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js
@@ -57,13 +57,13 @@ For extra details about options and events take a look here: https://refreshless
**/
-(function() {
- 'use strict';
+(function () {
+ 'use strict';
- var umbRangeSlider = {
+ var umbRangeSlider = {
template: '
',
- controller: UmbRangeSliderController,
- bindings: {
+ controller: UmbRangeSliderController,
+ bindings: {
ngModel: '<',
options: '<',
onSetup: '&?',
@@ -73,15 +73,15 @@ For extra details about options and events take a look here: https://refreshless
onChange: '&?',
onStart: '&?',
onEnd: '&?'
- }
+ }
};
-
- function UmbRangeSliderController($element, $timeout, $scope, assetsService) {
-
+
+ function UmbRangeSliderController($element, $timeout, $scope, assetsService) {
+
const ctrl = this;
let sliderInstance = null;
- ctrl.$onInit = function() {
+ ctrl.$onInit = function () {
// load css file for the date picker
assetsService.loadCss('lib/nouislider/nouislider.min.css', $scope);
@@ -94,13 +94,13 @@ For extra details about options and events take a look here: https://refreshless
};
- function grabElementAndRun() {
- $timeout(function() {
+ function grabElementAndRun() {
+ $timeout(function () {
const element = $element.find('.umb-range-slider')[0];
- setSlider(element);
- }, 0, true);
+ setSlider(element);
+ }, 0, true);
}
-
+
function setSlider(element) {
sliderInstance = element;
@@ -117,82 +117,82 @@ For extra details about options and events take a look here: https://refreshless
// create new slider
noUiSlider.create(sliderInstance, options);
-
- if (ctrl.onSetup) {
- ctrl.onSetup({
- slider: sliderInstance
- });
+
+ if (ctrl.onSetup) {
+ ctrl.onSetup({
+ slider: sliderInstance
+ });
}
// If has ngModel set the date
- if (ctrl.ngModel) {
+ if (ctrl.ngModel) {
sliderInstance.noUiSlider.set(ctrl.ngModel);
}
// destroy the slider instance when the dom element is removed
- angular.element(element).on('$destroy', function() {
+ $(element).on('$destroy', function () {
sliderInstance.noUiSlider.off();
});
setUpCallbacks();
- // Refresh the scope
- $scope.$applyAsync();
+ // Refresh the scope
+ $scope.$applyAsync();
}
-
+
function setUpCallbacks() {
- if(sliderInstance) {
+ if (sliderInstance) {
// bind hook for update
- if(ctrl.onUpdate) {
- sliderInstance.noUiSlider.on('update', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onUpdate({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onUpdate) {
+ sliderInstance.noUiSlider.on('update', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onUpdate({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
// bind hook for slide
- if(ctrl.onSlide) {
- sliderInstance.noUiSlider.on('slide', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onSlide({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onSlide) {
+ sliderInstance.noUiSlider.on('slide', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onSlide({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
// bind hook for set
- if(ctrl.onSet) {
- sliderInstance.noUiSlider.on('set', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onSet({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onSet) {
+ sliderInstance.noUiSlider.on('set', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onSet({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
// bind hook for change
- if(ctrl.onChange) {
- sliderInstance.noUiSlider.on('change', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onChange({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onChange) {
+ sliderInstance.noUiSlider.on('change', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onChange({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
// bind hook for start
- if(ctrl.onStart) {
- sliderInstance.noUiSlider.on('start', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onStart({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onStart) {
+ sliderInstance.noUiSlider.on('start', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onStart({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
// bind hook for end
- if(ctrl.onEnd) {
- sliderInstance.noUiSlider.on('end', function (values, handle, unencoded, tap, positions) {
- $timeout(function() {
- ctrl.onEnd({values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions});
+ if (ctrl.onEnd) {
+ sliderInstance.noUiSlider.on('end', function (values, handle, unencoded, tap, positions) {
+ $timeout(function () {
+ ctrl.onEnd({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions });
});
});
}
@@ -201,7 +201,7 @@ For extra details about options and events take a look here: https://refreshless
}
}
-
+
angular.module('umbraco.directives').component('umbRangeSlider', umbRangeSlider);
-
+
})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
index 97eb2bf708..8cbdabbf75 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/users/changepassword.directive.js
@@ -56,7 +56,7 @@
}
//set the model defaults
- if (!angular.isObject(vm.passwordValues)) {
+ if (!Utilities.isObject(vm.passwordValues)) {
//if it's not an object then just create a new one
vm.passwordValues = {
newPassword: null,
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js
index 029a4e420f..023692be86 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/autoscale.directive.js
@@ -21,7 +21,7 @@ angular.module("umbraco.directives")
var totalOffset = 0;
var offsety = parseInt(attrs.autoScale, 10);
- var window = angular.element($window);
+ var window = $($window);
if (offsety !== undefined) {
totalOffset += offsety;
}
@@ -34,7 +34,7 @@ angular.module("umbraco.directives")
el.height(window.height() - (el.offset().top + totalOffset));
}
- var resizeCallback = function() {
+ var resizeCallback = function () {
setElementSize();
};
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js
index 759d05df71..d43282715e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js
@@ -1,46 +1,46 @@
angular.module("umbraco.directives")
.directive('disableTabindex', function (tabbableService) {
- return {
- restrict: 'A', //Can only be used as an attribute,
- scope: {
- "disableTabindex": "<"
- },
- link: function (scope, element, attrs) {
+ return {
+ restrict: 'A', //Can only be used as an attribute,
+ scope: {
+ "disableTabindex": "<"
+ },
+ link: function (scope, element, attrs) {
- if(scope.disableTabindex) {
- //Select the node that will be observed for mutations (native DOM element not jQLite version)
- var targetNode = element[0];
+ if (scope.disableTabindex) {
+ //Select the node that will be observed for mutations (native DOM element not jQLite version)
+ var targetNode = element[0];
- //Watch for DOM changes - so when the property editor subview loads in
- //We can be notified its updated the child elements inside the DIV we are watching
- var observer = new MutationObserver(domChange);
+ //Watch for DOM changes - so when the property editor subview loads in
+ //We can be notified its updated the child elements inside the DIV we are watching
+ var observer = new MutationObserver(domChange);
- // Options for the observer (which mutations to observe)
- var config = { attributes: true, childList: true, subtree: true };
+ // Options for the observer (which mutations to observe)
+ var config = { attributes: true, childList: true, subtree: true };
- function domChange(mutationsList, observer) {
- for(var mutation of mutationsList) {
+ function domChange(mutationsList, observer) {
+ for (var mutation of mutationsList) {
- //DOM items have been added or removed
- if (mutation.type == 'childList') {
+ //DOM items have been added or removed
+ if (mutation.type == 'childList') {
- //Check if any child items in mutation.target contain an input
- var childInputs = tabbableService.tabbable(mutation.target);
+ //Check if any child items in mutation.target contain an input
+ var childInputs = tabbableService.tabbable(mutation.target);
- //For each item in childInputs - override or set HTML attribute tabindex="-1"
- angular.forEach(childInputs, function(element){
- angular.element(element).attr('tabindex', '-1');
- });
+ //For each item in childInputs - override or set HTML attribute tabindex="-1"
+ angular.forEach(childInputs, function (element) {
+ $(element).attr('tabindex', '-1');
+ });
+ }
}
}
+
+ // Start observing the target node for configured mutations
+ //GO GO GO
+ observer.observe(targetNode, config);
}
- // Start observing the target node for configured mutations
- //GO GO GO
- observer.observe(targetNode, config);
}
-
- }
- };
-});
+ };
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
index 149c2b5087..30d3530efb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
@@ -38,7 +38,8 @@ function valPropertyMsg(serverValidationManager, localizationService) {
var currentProperty = umbPropCtrl.property;
scope.currentProperty = currentProperty;
- var currentCulture = currentProperty.culture;
+ var currentCulture = currentProperty.culture;
+ var currentSegment = currentProperty.segment;
// validation object won't exist when editor loads outside the content form (ie in settings section when modifying a content type)
var isMandatory = currentProperty.validation ? currentProperty.validation.mandatory : undefined;
@@ -54,7 +55,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
var currentVariant = umbVariantCtrl.editor.content;
// Lets check if we have variants and we are on the default language then ...
- if (umbVariantCtrl.content.variants.length > 1 && !currentVariant.language.isDefault && !currentCulture && !currentProperty.unlockInvariantValue) {
+ if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
//This property is locked cause its a invariant property shown on a non-default language.
//Therefor do not validate this field.
return;
@@ -70,7 +71,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
//this can be null if no property was assigned
if (scope.currentProperty) {
//first try to get the error msg from the server collection
- var err = serverValidationManager.getPropertyError(scope.currentProperty.alias, null, "");
+ var err = serverValidationManager.getPropertyError(scope.currentProperty.alias, null, "", null);
//if there's an error message use it
if (err && err.errorMsg) {
return err.errorMsg;
@@ -101,7 +102,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
var errCount = 0;
for (var e in formCtrl.$error) {
- if (angular.isArray(formCtrl.$error[e])) {
+ if (Utilities.isArray(formCtrl.$error[e])) {
errCount++;
}
}
@@ -111,8 +112,8 @@ function valPropertyMsg(serverValidationManager, localizationService) {
// is the only one, then we'll clear.
if (errCount === 0
- || (errCount === 1 && angular.isArray(formCtrl.$error.valPropertyMsg))
- || (formCtrl.$invalid && angular.isArray(formCtrl.$error.valServer))) {
+ || (errCount === 1 && Utilities.isArray(formCtrl.$error.valPropertyMsg))
+ || (formCtrl.$invalid && Utilities.isArray(formCtrl.$error.valServer))) {
scope.errorMsg = "";
formCtrl.$setValidity('valPropertyMsg', true);
} else if (showValidation && scope.errorMsg === "") {
@@ -221,25 +222,31 @@ function valPropertyMsg(serverValidationManager, localizationService) {
// the correct field validation in their property editors.
if (scope.currentProperty) { //this can be null if no property was assigned
+
+ function serverValidationManagerCallback(isValid, propertyErrors, allErrors) {
+ hasError = !isValid;
+ if (hasError) {
+ //set the error message to the server message
+ scope.errorMsg = propertyErrors[0].errorMsg;
+ //flag that the current validator is invalid
+ formCtrl.$setValidity('valPropertyMsg', false);
+ startWatch();
+ }
+ else {
+ scope.errorMsg = "";
+ //flag that the current validator is valid
+ formCtrl.$setValidity('valPropertyMsg', true);
+ stopWatch();
+ }
+ }
+
unsubscribe.push(serverValidationManager.subscribe(scope.currentProperty.alias,
currentCulture,
"",
- function(isValid, propertyErrors, allErrors) {
- hasError = !isValid;
- if (hasError) {
- //set the error message to the server message
- scope.errorMsg = propertyErrors[0].errorMsg;
- //flag that the current validator is invalid
- formCtrl.$setValidity('valPropertyMsg', false);
- startWatch();
- }
- else {
- scope.errorMsg = "";
- //flag that the current validator is valid
- formCtrl.$setValidity('valPropertyMsg', true);
- stopWatch();
- }
- }));
+ serverValidationManagerCallback,
+ currentSegment
+ )
+ );
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
index a0cc7e3033..3fa9220f7b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valserver.directive.js
@@ -24,6 +24,7 @@ function valServer(serverValidationManager) {
var currentProperty = umbPropCtrl.property;
var currentCulture = currentProperty.culture;
+ var currentSegment = currentProperty.segment;
if (umbVariantCtrl) {
//if we are inside of an umbVariantContent directive
@@ -31,7 +32,7 @@ function valServer(serverValidationManager) {
var currentVariant = umbVariantCtrl.editor.content;
// Lets check if we have variants and we are on the default language then ...
- if (umbVariantCtrl.content.variants.length > 1 && !currentVariant.language.isDefault && !currentCulture && !currentProperty.unlockInvariantValue) {
+ if (umbVariantCtrl.content.variants.length > 1 && (!currentVariant.language || !currentVariant.language.isDefault) && !currentCulture && !currentSegment && !currentProperty.unlockInvariantValue) {
//This property is locked cause its a invariant property shown on a non-default language.
//Therefor do not validate this field.
return;
@@ -75,7 +76,7 @@ function valServer(serverValidationManager) {
if (modelCtrl.$invalid) {
modelCtrl.$setValidity('valServer', true);
//clear the server validation entry
- serverValidationManager.removePropertyError(currentProperty.alias, currentCulture, fieldName);
+ serverValidationManager.removePropertyError(currentProperty.alias, currentCulture, fieldName, currentSegment);
stopWatch();
}
}, true);
@@ -90,23 +91,26 @@ function valServer(serverValidationManager) {
}
//subscribe to the server validation changes
+ function serverValidationManagerCallback(isValid, propertyErrors, allErrors) {
+ if (!isValid) {
+ modelCtrl.$setValidity('valServer', false);
+ //assign an error msg property to the current validator
+ modelCtrl.errorMsg = propertyErrors[0].errorMsg;
+ startWatch();
+ }
+ else {
+ modelCtrl.$setValidity('valServer', true);
+ //reset the error message
+ modelCtrl.errorMsg = "";
+ stopWatch();
+ }
+ }
unsubscribe.push(serverValidationManager.subscribe(currentProperty.alias,
currentCulture,
fieldName,
- function(isValid, propertyErrors, allErrors) {
- if (!isValid) {
- modelCtrl.$setValidity('valServer', false);
- //assign an error msg property to the current validator
- modelCtrl.errorMsg = propertyErrors[0].errorMsg;
- startWatch();
- }
- else {
- modelCtrl.$setValidity('valServer', true);
- //reset the error message
- modelCtrl.errorMsg = "";
- stopWatch();
- }
- }));
+ serverValidationManagerCallback,
+ currentSegment)
+ );
scope.$on('$destroy', function () {
stopWatch();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
index 524b5f7efe..1f5aaaa1c2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
@@ -40,7 +40,7 @@
function link(scope, el, attr, ctrl) {
//if there are no containing form or valFormManager controllers, then we do nothing
- if (!ctrl || !angular.isArray(ctrl) || ctrl.length !== 2 || !ctrl[0] || !ctrl[1]) {
+ if (!ctrl || !Utilities.isArray(ctrl) || ctrl.length !== 2 || !ctrl[0] || !ctrl[1]) {
return;
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
index de340bab27..a519f81054 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsJoinArray.filter.js
@@ -1,6 +1,6 @@
/**
* @ngdoc filter
- * @name umbraco.filters.filter:CMS_joinArray
+ * @name umbraco.filters.filter:umbCmsJoinArray
* @namespace umbCmsJoinArray
*
* param {array} array of string or objects, if an object use the third argument to specify which prop to list.
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js
new file mode 100644
index 0000000000..8d2c233655
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/umbCmsTitleCase.filter.js
@@ -0,0 +1,19 @@
+/**
+ * @ngdoc filter
+ * @name umbraco.filters.filter:umbCmsTitleCase
+ * @namespace umbCmsTitleCase
+ *
+ * param {string} the text turned into title case.
+ *
+ * @description
+ * Transforms text to title case. Capitalizes the first letter of each word, and transforms the rest of the word to lower case.
+ *
+ */
+angular.module("umbraco.filters").filter('umbCmsTitleCase', function() {
+ return function (str) {
+ return str.replace(
+ /\w\S*/g,
+ txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase()
+ );
+ }
+});
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
index c02624409f..93f0bddc96 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/umbwordlimit.filter.js
@@ -13,7 +13,7 @@
function umbWordLimitFilter() {
return function (collection, property) {
- if (!angular.isString(collection)) {
+ if (!Utilities.isString(collection)) {
return collection;
}
@@ -35,4 +35,4 @@
angular.module('umbraco.filters').filter('umbWordLimit', umbWordLimitFilter);
-})();
\ No newline at end of file
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js
index 186f3accf0..283a2a7ae9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/culturerequest.interceptor.js
@@ -24,6 +24,7 @@
if ($routeParams) {
// it's an API request, add the current client culture as a header value
config.headers["X-UMB-CULTURE"] = $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture;
+ config.headers["X-UMB-SEGMENT"] = $routeParams.csegment ? $routeParams.csegment : null;
}
return config;
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
index 03373089d7..f3dd60bdce 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/donotpostdollarvariablesrequest.interceptor.js
@@ -1,40 +1,40 @@
-(function() {
- 'use strict';
-
+(function () {
+ 'use strict';
+
function removeProperty(obj, propertyPrefix) {
for (var property in obj) {
if (obj.hasOwnProperty(property)) {
-
+
if (property.startsWith(propertyPrefix) && obj[property] !== undefined) {
obj[property] = undefined;
}
-
+
if (typeof obj[property] === "object") {
removeProperty(obj[property], propertyPrefix);
}
}
}
-
+
}
-
- function transform(data){
+
+ function transform(data) {
removeProperty(data, "$");
}
-
+
function doNotPostDollarVariablesRequestInterceptor($q, urlHelper) {
return {
//dealing with requests:
- 'request': function(config) {
- if(config.method === "POST"){
- var clone = angular.copy(config);
+ 'request': function (config) {
+ if (config.method === "POST") {
+ var clone = Utilities.copy(config);
transform(clone.data);
return clone;
}
-
+
return config;
}
};
- }
+ }
angular.module('umbraco.interceptors').factory('doNotPostDollarVariablesOnPostRequestInterceptor', doNotPostDollarVariablesRequestInterceptor);
})();
diff --git a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js b/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
index 30daaf5837..bf748975a1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
+++ b/src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
@@ -44,7 +44,7 @@
var headers = config.headers ? config.headers : {};
//Here we'll check if we should ignore the error (either based on the original header set or the request configuration)
- if (headers["x-umb-ignore-error"] === "ignore" || config.umbIgnoreErrors === true || (angular.isArray(config.umbIgnoreStatus) && config.umbIgnoreStatus.indexOf(rejection.status) !== -1)) {
+ if (headers["x-umb-ignore-error"] === "ignore" || config.umbIgnoreErrors === true || (Utilities.isArray(config.umbIgnoreStatus) && config.umbIgnoreStatus.indexOf(rejection.status) !== -1)) {
//exit/ignore
return $q.reject(rejection);
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
index 6e6eb00da7..f07a2a441c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
@@ -90,7 +90,7 @@ angular.module('umbraco.mocks').
name: "1 column layout",
sections: [
{
- grid: 12,
+ grid: 12
}
]
},
@@ -98,7 +98,7 @@ angular.module('umbraco.mocks').
name: "2 column layout",
sections: [
{
- grid: 4,
+ grid: 4
},
{
grid: 8
@@ -139,7 +139,7 @@ angular.module('umbraco.mocks').
}
}
- },
+ }
]
},
{
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js
index 054f0aa66d..e70f483bf4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/datatype.mocks.js
@@ -1,113 +1,113 @@
angular.module('umbraco.mocks').
- factory('dataTypeMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
- 'use strict';
-
- function returnById(status, data, headers) {
+ factory('dataTypeMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
+ 'use strict';
- if (!mocksUtils.checkAuth()) {
- return [401, null, null];
- }
+ function returnById(status, data, headers) {
- var id = mocksUtils.getParameterByName(data, "id") || 1234;
+ if (!mocksUtils.checkAuth()) {
+ return [401, null, null];
+ }
- var selectedId = String.CreateGuid();
+ var id = mocksUtils.getParameterByName(data, "id") || 1234;
- var dataType = mocksUtils.getMockDataType(id, selectedId);
-
- return [200, dataType, null];
- }
-
- function returnEmpty(status, data, headers) {
+ var selectedId = String.CreateGuid();
- if (!mocksUtils.checkAuth()) {
- return [401, null, null];
- }
+ var dataType = mocksUtils.getMockDataType(id, selectedId);
- var response = returnById(200, "", null);
- var node = response[1];
+ return [200, dataType, null];
+ }
- node.name = "";
- node.selectedEditor = "";
- node.id = 0;
- node.preValues = [];
+ function returnEmpty(status, data, headers) {
- return response;
- }
-
- function returnPreValues(status, data, headers) {
+ if (!mocksUtils.checkAuth()) {
+ return [401, null, null];
+ }
- if (!mocksUtils.checkAuth()) {
- return [401, null, null];
- }
+ var response = returnById(200, "", null);
+ var node = response[1];
- var editorId = mocksUtils.getParameterByName(data, "editorId") || "83E9AD36-51A7-4440-8C07-8A5623AC6979";
+ node.name = "";
+ node.selectedEditor = "";
+ node.id = 0;
+ node.preValues = [];
- var preValues = [
- {
- label: "Custom pre value 1 for editor " + editorId,
- description: "Enter a value for this pre-value",
- key: "myPreVal",
- view: "requiredfield",
- validation: [
- {
- type: "Required"
- }
- ]
- },
- {
- label: "Custom pre value 2 for editor " + editorId,
- description: "Enter a value for this pre-value",
- key: "myPreVal",
- view: "requiredfield",
- validation: [
- {
- type: "Required"
- }
- ]
- }
- ];
- return [200, preValues, null];
- }
-
- function returnSave(status, data, headers) {
- if (!mocksUtils.checkAuth()) {
- return [401, null, null];
- }
+ return response;
+ }
- var postedData = angular.fromJson(headers);
+ function returnPreValues(status, data, headers) {
- var dataType = mocksUtils.getMockDataType(postedData.id, postedData.selectedEditor);
- dataType.notifications = [{
- header: "Saved",
- message: "Data type saved",
- type: 0
- }];
+ if (!mocksUtils.checkAuth()) {
+ return [401, null, null];
+ }
- return [200, dataType, null];
- }
+ var editorId = mocksUtils.getParameterByName(data, "editorId") || "83E9AD36-51A7-4440-8C07-8A5623AC6979";
- return {
- register: function() {
-
- $httpBackend
- .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/PostSave'))
- .respond(returnSave);
-
- $httpBackend
- .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'))
- .respond(returnById);
-
- $httpBackend
- .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetEmpty'))
- .respond(returnEmpty);
-
- $httpBackend
- .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetPreValues'))
- .respond(returnPreValues);
- },
- expectGetById: function() {
- $httpBackend
- .expectGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'));
- }
- };
- }]);
+ var preValues = [
+ {
+ label: "Custom pre value 1 for editor " + editorId,
+ description: "Enter a value for this pre-value",
+ key: "myPreVal",
+ view: "requiredfield",
+ validation: [
+ {
+ type: "Required"
+ }
+ ]
+ },
+ {
+ label: "Custom pre value 2 for editor " + editorId,
+ description: "Enter a value for this pre-value",
+ key: "myPreVal",
+ view: "requiredfield",
+ validation: [
+ {
+ type: "Required"
+ }
+ ]
+ }
+ ];
+ return [200, preValues, null];
+ }
+
+ function returnSave(status, data, headers) {
+ if (!mocksUtils.checkAuth()) {
+ return [401, null, null];
+ }
+
+ var postedData = JSON.parse(headers);
+
+ var dataType = mocksUtils.getMockDataType(postedData.id, postedData.selectedEditor);
+ dataType.notifications = [{
+ header: "Saved",
+ message: "Data type saved",
+ type: 0
+ }];
+
+ return [200, dataType, null];
+ }
+
+ return {
+ register: function () {
+
+ $httpBackend
+ .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/PostSave'))
+ .respond(returnSave);
+
+ $httpBackend
+ .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'))
+ .respond(returnById);
+
+ $httpBackend
+ .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetEmpty'))
+ .respond(returnEmpty);
+
+ $httpBackend
+ .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetPreValues'))
+ .respond(returnPreValues);
+ },
+ expectGetById: function () {
+ $httpBackend
+ .expectGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/DataType/GetById'));
+ }
+ };
+ }]);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
index 678cffe42e..936f69e738 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
@@ -30,7 +30,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
umbRequestHelper.getApiUrl(
"authenticationApiBaseUrl",
"PostSend2FACode"),
- angular.toJson(provider)),
+ Utilities.toJson(provider)),
'Could not send code');
},
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 d714ea4938..7bc2a9d2c8 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
@@ -610,10 +610,10 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
//converts the value to a js bool
function toBool(v) {
- if (angular.isNumber(v)) {
+ if (Utilities.isNumber(v)) {
return v > 0;
}
- if (angular.isString(v)) {
+ if (Utilities.isString(v)) {
return v === "true";
}
if (typeof v === "boolean") {
@@ -1003,10 +1003,10 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
loginPageId: loginPageId,
errorPageId: errorPageId
};
- if (angular.isArray(groups) && groups.length) {
+ if (Utilities.isArray(groups) && groups.length) {
publicAccess.groups = groups;
}
- else if (angular.isArray(usernames) && usernames.length) {
+ else if (Utilities.isArray(usernames) && usernames.length) {
publicAccess.usernames = usernames;
}
else {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
index e10837ceca..60b87e919f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
@@ -87,7 +87,7 @@ function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
umbRequestHelper.getApiUrl(
"currentUserApiBaseUrl",
"PostSetInvitedUserPassword"),
- angular.toJson(newPassword)),
+ Utilities.toJson(newPassword)),
'Failed to change password');
},
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 e4e3cc6f3f..e24f4786eb 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
@@ -348,10 +348,10 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
//converts the value to a js bool
function toBool(v) {
- if (angular.isNumber(v)) {
+ if (Utilities.isNumber(v)) {
return v > 0;
}
- if (angular.isString(v)) {
+ if (Utilities.isString(v)) {
return v === "true";
}
if (typeof v === "boolean") {
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
index d21edbbab8..c45e173a98 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/member.resource.js
@@ -53,10 +53,10 @@ function memberResource($q, $http, umbDataFormatter, umbRequestHelper) {
//converts the value to a js bool
function toBool(v) {
- if (angular.isNumber(v)) {
+ if (Utilities.isNumber(v)) {
return v > 0;
}
- if (angular.isString(v)) {
+ if (Utilities.isString(v)) {
return v === "true";
}
if (typeof v === "boolean") {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
index 455857c1e1..f2ff711ac9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
@@ -33,7 +33,7 @@ function angularHelper($q) {
//this is sequential promise chaining, it's not pretty but we need to do it this way.
//$q.all doesn't execute promises in sequence but that's what we want to do here.
- if (!angular.isArray(promises)) {
+ if (!Utilities.isArray(promises)) {
throw "promises must be an array";
}
@@ -178,11 +178,11 @@ function angularHelper($q) {
$valid: true,
$submitted: false,
$pending: undefined,
- $addControl: angular.noop,
- $removeControl: angular.noop,
- $setValidity: angular.noop,
- $setDirty: angular.noop,
- $setPristine: angular.noop,
+ $addControl: Utilities.noop,
+ $removeControl: Utilities.noop,
+ $setValidity: Utilities.noop,
+ $setDirty: Utilities.noop,
+ $setPristine: Utilities.noop,
$name: formName
};
}
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 6673002981..30e59e9a88 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
@@ -256,7 +256,7 @@ angular.module('umbraco.services')
load: function (pathArray, scope, defaultAssetType) {
var promise;
- if (!angular.isArray(pathArray)) {
+ if (!Utilities.isArray(pathArray)) {
throw "pathArray must be an array";
}
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 20a47ae32c..8f2aa1d22b 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
@@ -10,7 +10,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
function isValidIdentifier(id) {
//empty id <= 0
- if (angular.isNumber(id)) {
+ if (Utilities.isNumber(id)) {
if (id === 0) {
return false;
}
@@ -39,7 +39,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
/** Used by the content editor and mini content editor to perform saving operations */
contentEditorPerformSave: function (args) {
- if (!angular.isObject(args)) {
+ if (!Utilities.isObject(args)) {
throw "args must be an object";
}
if (!args.scope) {
@@ -152,7 +152,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
here we'll build the buttons according to the chars of the user. */
configureContentEditorButtons: function (args) {
- if (!angular.isObject(args)) {
+ if (!Utilities.isObject(args)) {
throw "args must be an object";
}
if (!args.content) {
@@ -698,7 +698,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
// /belle/#/content/edit/9876 (where 9876 is the new id)
//clear the query strings
- navigationService.clearSearch(["cculture"]);
+ navigationService.clearSearch(["cculture", "csegment"]);
if (softRedirect) {
navigationService.setSoftRedirect();
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
index 305e4a694d..1be66cc68f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
@@ -7,21 +7,21 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
var contentTypeHelperService = {
- createIdArray: function(array) {
+ createIdArray: function (array) {
- var newArray = [];
+ var newArray = [];
- angular.forEach(array, function(arrayItem){
+ angular.forEach(array, function (arrayItem) {
- if(angular.isObject(arrayItem)) {
- newArray.push(arrayItem.id);
- } else {
- newArray.push(arrayItem);
- }
+ if (Utilities.isObject(arrayItem)) {
+ newArray.push(arrayItem.id);
+ } else {
+ newArray.push(arrayItem);
+ }
- });
+ });
- return newArray;
+ return newArray;
},
@@ -30,18 +30,18 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
var modelsResource = $injector.has("modelsBuilderManagementResource") ? $injector.get("modelsBuilderManagementResource") : null;
var modelsBuilderEnabled = Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.enabled;
if (modelsBuilderEnabled && modelsResource) {
- modelsResource.buildModels().then(function(result) {
+ modelsResource.buildModels().then(function (result) {
deferred.resolve(result);
//just calling this to get the servar back to life
modelsResource.getModelsOutOfDateStatus();
- }, function(e) {
+ }, function (e) {
deferred.reject(e);
});
}
- else {
- deferred.resolve(false);
+ else {
+ deferred.resolve(false);
}
return deferred.promise;
},
@@ -49,10 +49,10 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
checkModelsBuilderStatus: function () {
var deferred = $q.defer();
var modelsResource = $injector.has("modelsBuilderManagementResource") ? $injector.get("modelsBuilderManagementResource") : null;
- var modelsBuilderEnabled = (Umbraco && Umbraco.Sys && Umbraco.Sys.ServerVariables && Umbraco.Sys.ServerVariables.umbracoPlugins && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.enabled === true);
-
+ var modelsBuilderEnabled = (Umbraco && Umbraco.Sys && Umbraco.Sys.ServerVariables && Umbraco.Sys.ServerVariables.umbracoPlugins && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.enabled === true);
+
if (modelsBuilderEnabled && modelsResource) {
- modelsResource.getModelsOutOfDateStatus().then(function(result) {
+ modelsResource.getModelsOutOfDateStatus().then(function (result) {
//Generate models buttons should be enabled if it is 0
deferred.resolve(result.status === 0);
});
@@ -64,37 +64,37 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
},
makeObjectArrayFromId: function (idArray, objectArray) {
- var newArray = [];
+ var newArray = [];
- for (var idIndex = 0; idArray.length > idIndex; idIndex++) {
- var id = idArray[idIndex];
+ for (var idIndex = 0; idArray.length > idIndex; idIndex++) {
+ var id = idArray[idIndex];
- for (var objectIndex = 0; objectArray.length > objectIndex; objectIndex++) {
- var object = objectArray[objectIndex];
- if (id === object.id) {
- newArray.push(object);
- }
- }
+ for (var objectIndex = 0; objectArray.length > objectIndex; objectIndex++) {
+ var object = objectArray[objectIndex];
+ if (id === object.id) {
+ newArray.push(object);
+ }
+ }
- }
+ }
- return newArray;
+ return newArray;
},
- validateAddingComposition: function(contentType, compositeContentType) {
+ validateAddingComposition: function (contentType, compositeContentType) {
//Validate that by adding this group that we are not adding duplicate property type aliases
- var propertiesAdding = _.flatten(_.map(compositeContentType.groups, function(g) {
- return _.map(g.properties, function(p) {
+ var propertiesAdding = _.flatten(_.map(compositeContentType.groups, function (g) {
+ return _.map(g.properties, function (p) {
return p.alias;
});
}));
- var propAliasesExisting = _.filter(_.flatten(_.map(contentType.groups, function(g) {
- return _.map(g.properties, function(p) {
+ var propAliasesExisting = _.filter(_.flatten(_.map(contentType.groups, function (g) {
+ return _.map(g.properties, function (p) {
return p.alias;
});
- })), function(f) {
+ })), function (f) {
return f !== null && f !== undefined;
});
@@ -108,7 +108,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
return [];
},
- mergeCompositeContentType: function(contentType, compositeContentType) {
+ mergeCompositeContentType: function (contentType, compositeContentType) {
//Validate that there are no overlapping aliases
var overlappingAliases = this.validateAddingComposition(contentType, compositeContentType);
@@ -116,107 +116,107 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
throw new Error("Cannot add this composition, these properties already exist on the content type: " + overlappingAliases.join());
}
- angular.forEach(compositeContentType.groups, function(compositionGroup) {
+ angular.forEach(compositeContentType.groups, function (compositionGroup) {
- // order composition groups based on sort order
- compositionGroup.properties = $filter('orderBy')(compositionGroup.properties, 'sortOrder');
+ // order composition groups based on sort order
+ compositionGroup.properties = $filter('orderBy')(compositionGroup.properties, 'sortOrder');
- // get data type details
- angular.forEach(compositionGroup.properties, function(property) {
- dataTypeResource.getById(property.dataTypeId)
- .then(function(dataType) {
- property.dataTypeIcon = dataType.icon;
- property.dataTypeName = dataType.name;
- });
- });
+ // get data type details
+ angular.forEach(compositionGroup.properties, function (property) {
+ dataTypeResource.getById(property.dataTypeId)
+ .then(function (dataType) {
+ property.dataTypeIcon = dataType.icon;
+ property.dataTypeName = dataType.name;
+ });
+ });
- // set inherited state on tab
- compositionGroup.inherited = true;
+ // set inherited state on tab
+ compositionGroup.inherited = true;
- // set inherited state on properties
- angular.forEach(compositionGroup.properties, function(compositionProperty) {
- compositionProperty.inherited = true;
- });
+ // set inherited state on properties
+ angular.forEach(compositionGroup.properties, function (compositionProperty) {
+ compositionProperty.inherited = true;
+ });
- // set tab state
- compositionGroup.tabState = "inActive";
+ // set tab state
+ compositionGroup.tabState = "inActive";
- // if groups are named the same - merge the groups
- angular.forEach(contentType.groups, function(contentTypeGroup) {
+ // if groups are named the same - merge the groups
+ angular.forEach(contentType.groups, function (contentTypeGroup) {
- if (contentTypeGroup.name === compositionGroup.name) {
+ if (contentTypeGroup.name === compositionGroup.name) {
- // set flag to show if properties has been merged into a tab
- compositionGroup.groupIsMerged = true;
+ // set flag to show if properties has been merged into a tab
+ compositionGroup.groupIsMerged = true;
- // make group inherited
- contentTypeGroup.inherited = true;
+ // make group inherited
+ contentTypeGroup.inherited = true;
- // add properties to the top of the array
- contentTypeGroup.properties = compositionGroup.properties.concat(contentTypeGroup.properties);
+ // add properties to the top of the array
+ contentTypeGroup.properties = compositionGroup.properties.concat(contentTypeGroup.properties);
- // update sort order on all properties in merged group
- contentTypeGroup.properties = contentTypeHelperService.updatePropertiesSortOrder(contentTypeGroup.properties);
+ // update sort order on all properties in merged group
+ contentTypeGroup.properties = contentTypeHelperService.updatePropertiesSortOrder(contentTypeGroup.properties);
+
+ // make parentTabContentTypeNames to an array so we can push values
+ if (contentTypeGroup.parentTabContentTypeNames === null || contentTypeGroup.parentTabContentTypeNames === undefined) {
+ contentTypeGroup.parentTabContentTypeNames = [];
+ }
+
+ // push name to array of merged composite content types
+ contentTypeGroup.parentTabContentTypeNames.push(compositeContentType.name);
+
+ // make parentTabContentTypes to an array so we can push values
+ if (contentTypeGroup.parentTabContentTypes === null || contentTypeGroup.parentTabContentTypes === undefined) {
+ contentTypeGroup.parentTabContentTypes = [];
+ }
+
+ // push id to array of merged composite content types
+ contentTypeGroup.parentTabContentTypes.push(compositeContentType.id);
+
+ // get sort order from composition
+ contentTypeGroup.sortOrder = compositionGroup.sortOrder;
+
+ // splice group to the top of the array
+ var contentTypeGroupCopy = Utilities.copy(contentTypeGroup);
+ var index = contentType.groups.indexOf(contentTypeGroup);
+ contentType.groups.splice(index, 1);
+ contentType.groups.unshift(contentTypeGroupCopy);
+
+ }
+
+ });
+
+ // if group is not merged - push it to the end of the array - before init tab
+ if (compositionGroup.groupIsMerged === false || compositionGroup.groupIsMerged === undefined) {
// make parentTabContentTypeNames to an array so we can push values
- if (contentTypeGroup.parentTabContentTypeNames === null || contentTypeGroup.parentTabContentTypeNames === undefined) {
- contentTypeGroup.parentTabContentTypeNames = [];
+ if (compositionGroup.parentTabContentTypeNames === null || compositionGroup.parentTabContentTypeNames === undefined) {
+ compositionGroup.parentTabContentTypeNames = [];
}
// push name to array of merged composite content types
- contentTypeGroup.parentTabContentTypeNames.push(compositeContentType.name);
+ compositionGroup.parentTabContentTypeNames.push(compositeContentType.name);
// make parentTabContentTypes to an array so we can push values
- if (contentTypeGroup.parentTabContentTypes === null || contentTypeGroup.parentTabContentTypes === undefined) {
- contentTypeGroup.parentTabContentTypes = [];
+ if (compositionGroup.parentTabContentTypes === null || compositionGroup.parentTabContentTypes === undefined) {
+ compositionGroup.parentTabContentTypes = [];
}
// push id to array of merged composite content types
- contentTypeGroup.parentTabContentTypes.push(compositeContentType.id);
+ compositionGroup.parentTabContentTypes.push(compositeContentType.id);
- // get sort order from composition
- contentTypeGroup.sortOrder = compositionGroup.sortOrder;
+ // push group before placeholder tab
+ contentType.groups.unshift(compositionGroup);
- // splice group to the top of the array
- var contentTypeGroupCopy = angular.copy(contentTypeGroup);
- var index = contentType.groups.indexOf(contentTypeGroup);
- contentType.groups.splice(index, 1);
- contentType.groups.unshift(contentTypeGroupCopy);
+ }
- }
+ });
- });
+ // sort all groups by sortOrder property
+ contentType.groups = $filter('orderBy')(contentType.groups, 'sortOrder');
- // if group is not merged - push it to the end of the array - before init tab
- if (compositionGroup.groupIsMerged === false || compositionGroup.groupIsMerged === undefined) {
-
- // make parentTabContentTypeNames to an array so we can push values
- if (compositionGroup.parentTabContentTypeNames === null || compositionGroup.parentTabContentTypeNames === undefined) {
- compositionGroup.parentTabContentTypeNames = [];
- }
-
- // push name to array of merged composite content types
- compositionGroup.parentTabContentTypeNames.push(compositeContentType.name);
-
- // make parentTabContentTypes to an array so we can push values
- if (compositionGroup.parentTabContentTypes === null || compositionGroup.parentTabContentTypes === undefined) {
- compositionGroup.parentTabContentTypes = [];
- }
-
- // push id to array of merged composite content types
- compositionGroup.parentTabContentTypes.push(compositeContentType.id);
-
- // push group before placeholder tab
- contentType.groups.unshift(compositionGroup);
-
- }
-
- });
-
- // sort all groups by sortOrder property
- contentType.groups = $filter('orderBy')(contentType.groups, 'sortOrder');
-
- return contentType;
+ return contentType;
},
@@ -224,22 +224,22 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
var groups = [];
- angular.forEach(contentType.groups, function(contentTypeGroup){
+ angular.forEach(contentType.groups, function (contentTypeGroup) {
- if( contentTypeGroup.tabState !== "init" ) {
+ if (contentTypeGroup.tabState !== "init") {
var idIndex = contentTypeGroup.parentTabContentTypes.indexOf(compositeContentType.id);
var nameIndex = contentTypeGroup.parentTabContentTypeNames.indexOf(compositeContentType.name);
var groupIndex = contentType.groups.indexOf(contentTypeGroup);
- if( idIndex !== -1 ) {
+ if (idIndex !== -1) {
var properties = [];
// remove all properties from composite content type
- angular.forEach(contentTypeGroup.properties, function(property){
- if(property.contentTypeId !== compositeContentType.id) {
+ angular.forEach(contentTypeGroup.properties, function (property) {
+ if (property.contentTypeId !== compositeContentType.id) {
properties.push(property);
}
});
@@ -252,22 +252,22 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
contentTypeGroup.parentTabContentTypeNames.splice(nameIndex, 1);
// remove inherited state if there are no inherited properties
- if(contentTypeGroup.parentTabContentTypes.length === 0) {
+ if (contentTypeGroup.parentTabContentTypes.length === 0) {
contentTypeGroup.inherited = false;
}
// remove group if there are no properties left
- if(contentTypeGroup.properties.length > 1) {
+ if (contentTypeGroup.properties.length > 1) {
//contentType.groups.splice(groupIndex, 1);
groups.push(contentTypeGroup);
}
} else {
- groups.push(contentTypeGroup);
+ groups.push(contentTypeGroup);
}
} else {
- groups.push(contentTypeGroup);
+ groups.push(contentTypeGroup);
}
// update sort order on properties
@@ -281,67 +281,67 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
updatePropertiesSortOrder: function (properties) {
- var sortOrder = 0;
+ var sortOrder = 0;
- angular.forEach(properties, function(property) {
- if( !property.inherited && property.propertyState !== "init") {
- property.sortOrder = sortOrder;
- }
- sortOrder++;
- });
+ angular.forEach(properties, function (property) {
+ if (!property.inherited && property.propertyState !== "init") {
+ property.sortOrder = sortOrder;
+ }
+ sortOrder++;
+ });
- return properties;
+ return properties;
},
- getTemplatePlaceholder: function() {
+ getTemplatePlaceholder: function () {
- var templatePlaceholder = {
- "name": "",
- "icon": "icon-layout",
- "alias": "templatePlaceholder",
- "placeholder": true
- };
+ var templatePlaceholder = {
+ "name": "",
+ "icon": "icon-layout",
+ "alias": "templatePlaceholder",
+ "placeholder": true
+ };
- return templatePlaceholder;
+ return templatePlaceholder;
},
- insertDefaultTemplatePlaceholder: function(defaultTemplate) {
+ insertDefaultTemplatePlaceholder: function (defaultTemplate) {
- // get template placeholder
- var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
+ // get template placeholder
+ var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
- // add as default template
- defaultTemplate = templatePlaceholder;
+ // add as default template
+ defaultTemplate = templatePlaceholder;
- return defaultTemplate;
+ return defaultTemplate;
},
- insertTemplatePlaceholder: function(array) {
+ insertTemplatePlaceholder: function (array) {
- // get template placeholder
- var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
+ // get template placeholder
+ var templatePlaceholder = contentTypeHelperService.getTemplatePlaceholder();
- // add as selected item
- array.push(templatePlaceholder);
+ // add as selected item
+ array.push(templatePlaceholder);
- return array;
+ return array;
- },
+ },
- insertChildNodePlaceholder: function (array, name, icon, id) {
+ insertChildNodePlaceholder: function (array, name, icon, id) {
- var placeholder = {
- "name": name,
- "icon": icon,
- "id": id
- };
+ var placeholder = {
+ "name": name,
+ "icon": icon,
+ "id": id
+ };
- array.push(placeholder);
+ array.push(placeholder);
- }
+ }
};
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 9c935086a0..538bd41ce0 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
@@ -164,14 +164,14 @@ When building a custom infinite editor view you can use the same components as a
"use strict";
function editorService(eventsService, keyboardService, $timeout) {
-
-
+
+
let editorsKeyboardShorcuts = [];
var editors = [];
var isEnabled = true;
var lastElementInFocus = null;
-
-
+
+
// events for backdrop
eventsService.on("appState.backdrop", function (name, args) {
if (args.show === true) {
@@ -180,7 +180,7 @@ When building a custom infinite editor view you can use the same components as a
focus();
}
});
-
+
/**
* @ngdoc method
@@ -205,7 +205,7 @@ When building a custom infinite editor view you can use the same components as a
function getNumberOfEditors() {
return editors.length;
};
-
+
/**
* @ngdoc method
* @name umbraco.services.editorService#blur
@@ -232,7 +232,7 @@ When building a custom infinite editor view you can use the same components as a
* Method to tell editors that they are gaining focus again.
*/
function focus() {
- if(isEnabled === false) {
+ if (isEnabled === false) {
/* keyboard shortcuts will be overwritten by the new infinite editor
so we need to store the shortcuts for the current editor so they can be rebound
when the infinite editor closes
@@ -241,7 +241,7 @@ When building a custom infinite editor view you can use the same components as a
isEnabled = true;
}
}
-
+
/**
* @ngdoc method
* @name umbraco.services.editorService#open
@@ -305,7 +305,7 @@ When building a custom infinite editor view you can use the same components as a
// delay required to map the properties to the correct editor due
// to another delay in the closing animation of the editor
- $timeout(function() {
+ $timeout(function () {
// rebind keyboard shortcuts for the new editor in focus
rebindKeyboardShortcuts();
@@ -651,7 +651,7 @@ When building a custom infinite editor view you can use the same components as a
editor.view = "views/mediatypes/edit.html";
open(editor);
}
-
+
/**
* @ngdoc method
* @name umbraco.services.editorService#memberTypeEditor
@@ -928,21 +928,21 @@ When building a custom infinite editor view you can use the same components as a
open(editor);
}
- /**
- * @ngdoc method
- * @name umbraco.services.editorService#memberPicker
- * @methodOf umbraco.services.editorService
- *
- * @description
- * Opens a member picker in infinite editing, the submit callback returns an array of selected items
- *
- * @param {Object} editor rendering options
- * @param {Boolean} editor.multiPicker Pick one or multiple items
- * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
- * @param {Function} editor.close Callback function when the close button is clicked.
- *
- * @returns {Object} editor object
- */
+ /**
+ * @ngdoc method
+ * @name umbraco.services.editorService#memberPicker
+ * @methodOf umbraco.services.editorService
+ *
+ * @description
+ * Opens a member picker in infinite editing, the submit callback returns an array of selected items
+ *
+ * @param {Object} editor rendering options
+ * @param {Boolean} editor.multiPicker Pick one or multiple items
+ * @param {Function} editor.submit Callback function when the submit button is clicked. Returns the editor model object
+ * @param {Function} editor.close Callback function when the close button is clicked.
+ *
+ * @returns {Object} editor object
+ */
function memberPicker(editor) {
editor.view = "views/common/infiniteeditors/treepicker/treepicker.html";
if (!editor.size) editor.size = "small";
@@ -985,7 +985,7 @@ When building a custom infinite editor view you can use the same components as a
*
*/
function unbindKeyboardShortcuts() {
- const shortcuts = angular.copy(keyboardService.keyboardEvent);
+ const shortcuts = Utilities.copy(keyboardService.keyboardEvent);
editorsKeyboardShorcuts.push(shortcuts);
// unbind the current shortcuts because we only want to
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
index 51f63e6787..965ac3d635 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/events.service.js
@@ -1,7 +1,7 @@
/** Used to broadcast and listen for global events and allow the ability to add async listeners to the callbacks */
/*
- Core app events:
+ Core app events:
app.ready
app.authenticated
@@ -12,9 +12,9 @@
*/
function eventsService($q, $rootScope) {
-
+
return {
-
+
/** raise an event with a given name */
emit: function (name, args) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js b/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
index 41614a3bee..9e0285d58d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/filemanager.service.js
@@ -27,10 +27,10 @@ function fileManager($rootScope) {
setFiles: function (args) {
//propertyAlias, files
- if (!angular.isString(args.propertyAlias)) {
+ if (!Utilities.isString(args.propertyAlias)) {
throw "args.propertyAlias must be a non empty string";
}
- if (!angular.isObject(args.files)) {
+ if (!Utilities.isObject(args.files)) {
throw "args.files must be an object";
}
@@ -40,7 +40,7 @@ function fileManager($rootScope) {
}
var metaData = [];
- if (angular.isArray(args.metaData)) {
+ if (Utilities.isArray(args.metaData)) {
metaData = args.metaData;
}
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 0555318bae..90fbd76ec9 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
@@ -83,7 +83,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
if (!args || !args.notifications) {
return false;
}
- if (angular.isArray(args.notifications)) {
+ if (Utilities.isArray(args.notifications)) {
for (var i = 0; i < args.notifications.length; i++) {
notificationsService.showNotification(args.notifications[i]);
}
@@ -159,9 +159,16 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
//the alias in model state can be in dot notation which indicates
// * the first part is the content property alias
// * the second part is the field to which the valiation msg is associated with
- //There will always be at least 3 parts for content properties since all model errors for properties are prefixed with "_Properties"
+ //There will always be at least 4 parts for content properties since all model errors for properties are prefixed with "_Properties"
//If it is not prefixed with "_Properties" that means the error is for a field of the object directly.
+ // Example: "_Properties.headerImage.en-US.mySegment.myField"
+ // * it's for a property since it has a _Properties prefix
+ // * it's for the headerImage property type
+ // * it's for the en-US culture
+ // * it's for the mySegment segment
+ // * it's for the myField html field (optional)
+
var parts = e.split(".");
//Check if this is for content properties - specific to content/media/member editors because those are special
@@ -179,16 +186,23 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
}
}
- //if it contains 3 '.' then we will wire it up to a property's html field
+ var segment = null;
if (parts.length > 3) {
- //add an error with a reference to the field for which the validation belongs too
- serverValidationManager.addPropertyError(propertyAlias, culture, parts[3], modelState[e][0]);
+ segment = parts[3];
+ //special check in case the string is formatted this way
+ if (segment === "null") {
+ segment = null;
+ }
}
- else {
- //add a generic error for the property, no reference to a specific html field
- serverValidationManager.addPropertyError(propertyAlias, culture, "", modelState[e][0]);
+
+ var htmlFieldReference = "";
+ if (parts.length > 4) {
+ htmlFieldReference = parts[4] || "";
}
+ // add a generic error for the property
+ serverValidationManager.addPropertyError(propertyAlias, culture, htmlFieldReference, modelState[e][0], segment);
+
} else {
//Everthing else is just a 'Field'... the field name could contain any level of 'parts' though, for example:
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
index 20d014ab0f..28156e70c3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js
@@ -332,14 +332,14 @@
selection.length = 0;
- if (angular.isArray(items)) {
+ if (Utilities.isArray(items)) {
for (i = 0; items.length > i; i++) {
var item = items[i];
item.selected = false;
}
}
- if(angular.isArray(folders)) {
+ if(Utilities.isArray(folders)) {
for (i = 0; folders.length > i; i++) {
var folder = folders[i];
folder.selected = false;
@@ -366,7 +366,7 @@
var checkbox = $event.target;
var clearSelection = false;
- if (!angular.isArray(items)) {
+ if (!Utilities.isArray(items)) {
return;
}
@@ -413,7 +413,7 @@
function selectAllItemsToggle(items, selection) {
- if (!angular.isArray(items)) {
+ if (!Utilities.isArray(items)) {
return;
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
index a91f9d51e4..5b79b9c327 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
@@ -62,12 +62,12 @@ function macroService() {
val = val ? val : "";
//need to detect if the val is a string or an object
var keyVal;
- if (angular.isString(val)) {
+ if (Utilities.isString(val)) {
keyVal = key + "=\"" + (val ? val : "") + "\" ";
}
else {
//if it's not a string we'll send it through the json serializer
- var json = angular.toJson(val);
+ var json = Utilities.toJson(val);
//then we need to url encode it so that it's safe
var encoded = encodeURIComponent(json);
keyVal = key + "=\"" + encoded + "\" ";
@@ -142,7 +142,7 @@ function macroService() {
if (item.value !== null && item.value !== undefined && !_.isString(item.value)) {
try {
- val = angular.toJson(val);
+ val = Utilities.toJson(val);
}
catch (e) {
// not json
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 2271f891ce..ce2a18c3c0 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
@@ -45,7 +45,7 @@ function mediaHelper(umbRequestHelper, $log) {
//this performs a simple check to see if we have a media file as value
//it doesnt catch everything, but better then nothing
- if (angular.isString(item.value) && item.value.indexOf(mediaRoot) === 0) {
+ if (Utilities.isString(item.value) && item.value.indexOf(mediaRoot) === 0) {
return true;
}
@@ -143,7 +143,7 @@ function mediaHelper(umbRequestHelper, $log) {
*/
resolveFileFromEntity: function (mediaEntity, thumbnail) {
- var mediaPath = angular.isObject(mediaEntity.metaData) ? mediaEntity.metaData.MediaPath : null;
+ var mediaPath = Utilities.isObject(mediaEntity.metaData) ? mediaEntity.metaData.MediaPath : null;
if (!mediaPath) {
//don't throw since this image legitimately might not contain a media path, but output a warning
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 8d1caab850..da784a1f9e 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
@@ -26,60 +26,60 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
navReadyPromise.resolve(mainTreeApi);
});
-
+
//A list of query strings defined that when changed will not cause a reload of the route
- var nonRoutingQueryStrings = ["mculture", "cculture", "lq", "sr"];
+ var nonRoutingQueryStrings = ["mculture", "cculture", "csegment", "lq", "sr"];
var retainedQueryStrings = ["mculture"];
-
+
function setMode(mode) {
switch (mode) {
- case 'tree':
- appState.setGlobalState("navMode", "tree");
- appState.setGlobalState("showNavigation", true);
- appState.setMenuState("showMenu", false);
- appState.setMenuState("showMenuDialog", false);
- appState.setGlobalState("stickyNavigation", false);
- appState.setGlobalState("showTray", false);
- break;
- case 'menu':
- appState.setGlobalState("navMode", "menu");
- appState.setGlobalState("showNavigation", true);
- appState.setMenuState("showMenu", true);
- appState.setMenuState("showMenuDialog", false);
- appState.setGlobalState("stickyNavigation", true);
- break;
- case 'dialog':
- appState.setGlobalState("navMode", "dialog");
- appState.setGlobalState("stickyNavigation", true);
- appState.setGlobalState("showNavigation", true);
- appState.setMenuState("showMenu", false);
- appState.setMenuState("showMenuDialog", true);
- appState.setMenuState("allowHideMenuDialog", true);
- break;
- case 'search':
- appState.setGlobalState("navMode", "search");
- appState.setGlobalState("stickyNavigation", false);
- appState.setGlobalState("showNavigation", true);
- appState.setMenuState("showMenu", false);
- appState.setSectionState("showSearchResults", true);
- appState.setMenuState("showMenuDialog", false);
- break;
- default:
- appState.setGlobalState("navMode", "default");
- appState.setMenuState("showMenu", false);
- appState.setMenuState("showMenuDialog", false);
- appState.setMenuState("allowHideMenuDialog", true);
- appState.setSectionState("showSearchResults", false);
- appState.setGlobalState("stickyNavigation", false);
- appState.setGlobalState("showTray", false);
- appState.setMenuState("currentNode", null);
+ case 'tree':
+ appState.setGlobalState("navMode", "tree");
+ appState.setGlobalState("showNavigation", true);
+ appState.setMenuState("showMenu", false);
+ appState.setMenuState("showMenuDialog", false);
+ appState.setGlobalState("stickyNavigation", false);
+ appState.setGlobalState("showTray", false);
+ break;
+ case 'menu':
+ appState.setGlobalState("navMode", "menu");
+ appState.setGlobalState("showNavigation", true);
+ appState.setMenuState("showMenu", true);
+ appState.setMenuState("showMenuDialog", false);
+ appState.setGlobalState("stickyNavigation", true);
+ break;
+ case 'dialog':
+ appState.setGlobalState("navMode", "dialog");
+ appState.setGlobalState("stickyNavigation", true);
+ appState.setGlobalState("showNavigation", true);
+ appState.setMenuState("showMenu", false);
+ appState.setMenuState("showMenuDialog", true);
+ appState.setMenuState("allowHideMenuDialog", true);
+ break;
+ case 'search':
+ appState.setGlobalState("navMode", "search");
+ appState.setGlobalState("stickyNavigation", false);
+ appState.setGlobalState("showNavigation", true);
+ appState.setMenuState("showMenu", false);
+ appState.setSectionState("showSearchResults", true);
+ appState.setMenuState("showMenuDialog", false);
+ break;
+ default:
+ appState.setGlobalState("navMode", "default");
+ appState.setMenuState("showMenu", false);
+ appState.setMenuState("showMenuDialog", false);
+ appState.setMenuState("allowHideMenuDialog", true);
+ appState.setSectionState("showSearchResults", false);
+ appState.setGlobalState("stickyNavigation", false);
+ appState.setGlobalState("showTray", false);
+ appState.setMenuState("currentNode", null);
- if (appState.getGlobalState("isTablet") === true) {
- appState.setGlobalState("showNavigation", false);
- }
+ if (appState.getGlobalState("isTablet") === true) {
+ appState.setGlobalState("showNavigation", false);
+ }
- break;
+ break;
}
}
@@ -88,7 +88,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @param {any} requestPath
*/
function pathToRouteParts(requestPath) {
- if (!angular.isString(requestPath)) {
+ if (!Utilities.isString(requestPath)) {
throw "The value for requestPath is not a string";
}
var pathAndQuery = requestPath.split("#")[1];
@@ -114,7 +114,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
}
var service = {
-
+
/**
* @ngdoc method
* @name umbraco.services.navigationService#isRouteChangingNavigation
@@ -130,11 +130,11 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
*/
isRouteChangingNavigation: function (currUrlParams, nextUrlParams) {
- if (angular.isString(currUrlParams)) {
+ if (Utilities.isString(currUrlParams)) {
currUrlParams = pathToRouteParts(currUrlParams);
}
- if (angular.isString(nextUrlParams)) {
+ if (Utilities.isString(nextUrlParams)) {
nextUrlParams = pathToRouteParts(nextUrlParams);
}
@@ -151,7 +151,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
var nextRoutingKeys = _.difference(_.keys(nextUrlParams), nonRoutingQueryStrings);
var diff1 = _.difference(currRoutingKeys, nextRoutingKeys);
var diff2 = _.difference(nextRoutingKeys, currRoutingKeys);
-
+
//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;
@@ -223,7 +223,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @param {Object} nextRouteParams The next route parameters
*/
retainQueryStrings: function (currRouteParams, nextRouteParams) {
- var toRetain = angular.copy(nextRouteParams);
+ var toRetain = Utilities.copy(nextRouteParams);
var updated = false;
_.each(retainedQueryStrings, function (r) {
@@ -260,7 +260,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* and load the dashboard related to the section
* @param {string} sectionAlias The alias of the section
*/
- changeSection: function(sectionAlias, force) {
+ changeSection: function (sectionAlias, force) {
setMode("default-opensection");
if (force && appState.getSectionState("currentSection") === sectionAlias) {
@@ -360,19 +360,19 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
TODO: Delete this if not required
*/
- _syncPath: function(path, forceReload) {
+ _syncPath: function (path, forceReload) {
return navReadyPromise.promise.then(function () {
return mainTreeApi.syncTree({ path: path, forceReload: forceReload });
});
},
-
- reloadNode: function(node) {
+
+ reloadNode: function (node) {
return navReadyPromise.promise.then(function () {
return mainTreeApi.reloadNode(node);
});
},
-
- reloadSection: function(sectionAlias) {
+
+ reloadSection: function (sectionAlias) {
return navReadyPromise.promise.then(function () {
treeService.clearCache({ section: sectionAlias });
return mainTreeApi.load(sectionAlias);
@@ -387,11 +387,11 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @description
* Hides the tree by hiding the containing dom element
*/
- hideTree: function() {
+ hideTree: function () {
if (appState.getGlobalState("isTablet") === true && !appState.getGlobalState("stickyNavigation")) {
//reset it to whatever is in the url
- appState.setSectionState("currentSection", $routeParams.section);
+ appState.setSectionState("currentSection", $routeParams.section);
setMode("default-hidesectiontree");
}
@@ -409,19 +409,19 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
*
* @param {Event} event the click event triggering the method, passed from the DOM element
*/
- showMenu: function(args) {
-
+ showMenu: function (args) {
+
var self = this;
return treeService.getMenu({ treeNode: args.node })
- .then(function(data) {
+ .then(function (data) {
//check for a default
//NOTE: event will be undefined when a call to hideDialog is made so it won't re-load the default again.
// but perhaps there's a better way to deal with with an additional parameter in the args ? it works though.
if (data.defaultAlias && !args.skipDefault) {
- var found = _.find(data.menuItems, function(item) {
+ var found = _.find(data.menuItems, function (item) {
return item.alias = data.defaultAlias;
});
@@ -450,7 +450,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
return $q.resolve();
});
-
+
},
/**
@@ -461,7 +461,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @description
* Hides the menu by hiding the containing dom element
*/
- hideMenu: function() {
+ hideMenu: function () {
//SD: Would we ever want to access the last action'd node instead of clearing it here?
appState.setMenuState("currentNode", null);
appState.setMenuState("menuActions", []);
@@ -483,14 +483,14 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
appState.setMenuState("currentNode", node);
- if (action.metaData && action.metaData["actionRoute"] && angular.isString(action.metaData["actionRoute"])) {
+ if (action.metaData && action.metaData["actionRoute"] && Utilities.isString(action.metaData["actionRoute"])) {
//first check if the menu item simply navigates to a route
var parts = action.metaData["actionRoute"].split("?");
$location.path(parts[0]).search(parts.length > 1 ? parts[1] : "");
this.hideNavigation();
return;
}
- else if (action.metaData && action.metaData["jsAction"] && angular.isString(action.metaData["jsAction"])) {
+ else if (action.metaData && action.metaData["jsAction"] && Utilities.isString(action.metaData["jsAction"])) {
//we'll try to get the jsAction from the injector
var menuAction = action.metaData["jsAction"].split('.');
@@ -532,7 +532,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
});
}
},
-
+
/**
* @ngdoc method
@@ -553,7 +553,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @param {Scope} args.scope current scope passed to the dialog
* @param {Object} args.action the clicked action containing `name` and `alias`
*/
- showDialog: function(args) {
+ showDialog: function (args) {
if (!args) {
throw "showDialog is missing the args parameter";
@@ -579,37 +579,44 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
templateUrl = args.action.metaData["actionView"];
}
else {
-
- //by convention we will look into the /views/{treetype}/{action}.html
- // for example: /views/content/create.html
-
- //we will also check for a 'packageName' for the current tree, if it exists then the convention will be:
- // for example: /App_Plugins/{mypackage}/backoffice/{treetype}/create.html
-
var treeAlias = treeService.getTreeAlias(args.node);
- var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
-
if (!treeAlias) {
throw "Could not get tree alias for node " + args.node.id;
}
-
- if (packageTreeFolder) {
- templateUrl = Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
- "/" + packageTreeFolder +
- "/backoffice/" + treeAlias + "/" + args.action.alias + ".html";
- }
- else {
- templateUrl = "views/" + treeAlias + "/" + args.action.alias + ".html";
- }
-
+ templateUrl = this.getTreeTemplateUrl(treeAlias, args.action.alias);
}
setMode("dialog");
- if(templateUrl) {
+ if (templateUrl) {
appState.setMenuState("dialogTemplateUrl", templateUrl);
}
-
+
+ },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.navigationService#getTreeTemplateUrl
+ * @methodOf umbraco.services.navigationService
+ *
+ * @param {string} treeAlias the alias of the tree to look up
+ * @param {string} action the view file name
+ * @description
+ * creates the templateUrl based on treeAlias and action
+ * by convention we will look into the /views/{treetype}/{action}.html
+ * for example: /views/content/create.html
+ * we will also check for a 'packageName' for the current tree, if it exists then the convention will be:
+ * for example: /App_Plugins/{mypackage}/backoffice/{treetype}/create.html
+ */
+ getTreeTemplateUrl: function (treeAlias, action) {
+ var packageTreeFolder = treeService.getTreePackageFolder(treeAlias);
+ if (packageTreeFolder) {
+ return Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
+ "/" + packageTreeFolder +
+ "/backoffice/" + treeAlias + "/" + action + ".html";
+ }
+ else {
+ return "views/" + treeAlias + "/" + action + ".html";
+ }
},
/**
@@ -654,7 +661,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @description
* shows the search pane
*/
- showSearch: function() {
+ showSearch: function () {
setMode("search");
},
/**
@@ -665,7 +672,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @description
* hides the search pane
*/
- hideSearch: function() {
+ hideSearch: function () {
setMode("default-hidesearch");
},
/**
@@ -676,7 +683,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService
* @description
* hides any open navigation panes and resets the tree, actions and the currently selected node
*/
- hideNavigation: function() {
+ hideNavigation: function () {
appState.setMenuState("menuActions", []);
setMode("default");
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
index e5701b9de0..196e0e3baa 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
@@ -245,7 +245,7 @@ angular.module('umbraco.services')
* @param {Int} index index where the notication should be removed from
*/
remove: function (index) {
- if(angular.isObject(index)){
+ if (Utilities.isObject(index)){
var i = nArray.indexOf(index);
angularHelper.safeApply($rootScope, function() {
nArray.splice(i, 1);
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
index b9bfa51122..718e44d66e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
@@ -13,19 +13,20 @@ function serverValidationManager($timeout) {
var callbacks = [];
/** calls the callback specified with the errors specified, used internally */
- function executeCallback(self, errorsForCallback, callback, culture) {
+ function executeCallback(self, errorsForCallback, callback, culture, segment) {
callback.apply(self, [
false, // pass in a value indicating it is invalid
errorsForCallback, // pass in the errors for this item
self.items, // pass in all errors in total
- culture // pass the culture that we are listing for.
+ culture, // pass the culture that we are listing for.
+ segment // pass the segment that we are listing for.
]
);
}
function getFieldErrors(self, fieldName) {
- if (!angular.isString(fieldName)) {
+ if (!Utilities.isString(fieldName)) {
throw "fieldName must be a string";
}
@@ -35,33 +36,40 @@ function serverValidationManager($timeout) {
});
}
- function getPropertyErrors(self, propertyAlias, culture, fieldName) {
- if (!angular.isString(propertyAlias)) {
+
+ function getPropertyErrors(self, propertyAlias, culture, segment, fieldName) {
+ if (!Utilities.isString(propertyAlias)) {
throw "propertyAlias must be a string";
}
- if (fieldName && !angular.isString(fieldName)) {
+ if (fieldName && !Utilities.isString(fieldName)) {
throw "fieldName must be a string";
}
if (!culture) {
culture = "invariant";
}
+ if (!segment) {
+ segment = null;
+ }
//find all errors for this property
return _.filter(self.items, function (item) {
- return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
}
- function getCultureErrors(self, culture) {
+ function getVariantErrors(self, culture, segment) {
if (!culture) {
culture = "invariant";
}
+ if (!segment) {
+ segment = null;
+ }
//find all errors for this property
return _.filter(self.items, function (item) {
- return (item.culture === culture);
+ return (item.culture === culture && item.segment === segment);
});
}
@@ -71,21 +79,21 @@ function serverValidationManager($timeout) {
//its a field error callback
var fieldErrors = getFieldErrors(self, callbacks[cb].fieldName);
if (fieldErrors.length > 0) {
- executeCallback(self, fieldErrors, callbacks[cb].callback, callbacks[cb].culture);
+ executeCallback(self, fieldErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
}
}
else if (callbacks[cb].propertyAlias != null) {
//its a property error
- var propErrors = getPropertyErrors(self, callbacks[cb].propertyAlias, callbacks[cb].culture, callbacks[cb].fieldName);
+ var propErrors = getPropertyErrors(self, callbacks[cb].propertyAlias, callbacks[cb].culture, callbacks[cb].segment, callbacks[cb].fieldName);
if (propErrors.length > 0) {
- executeCallback(self, propErrors, callbacks[cb].callback, callbacks[cb].culture);
+ executeCallback(self, propErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
}
}
else {
- //its a culture error
- var cultureErrors = getCultureErrors(self, callbacks[cb].culture);
- if (cultureErrors.length > 0) {
- executeCallback(self, cultureErrors, callbacks[cb].callback, callbacks[cb].culture);
+ //its a variant error
+ var variantErrors = getVariantErrors(self, callbacks[cb].culture, callbacks[cb].segment);
+ if (variantErrors.length > 0) {
+ executeCallback(self, variantErrors, callbacks[cb].callback, callbacks[cb].culture, callbacks[cb].segment);
}
}
}
@@ -150,20 +158,27 @@ function serverValidationManager($timeout) {
* field alias to listen for.
* If propertyAlias is null, then this subscription is for a field property (not a user defined property).
*/
- subscribe: function (propertyAlias, culture, fieldName, callback) {
+ subscribe: function (propertyAlias, culture, fieldName, callback, segment) {
if (!callback) {
return;
}
var id = String.CreateGuid();
+
+ //normalize culture to "invariant"
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
if (propertyAlias === null) {
callbacks.push({
propertyAlias: null,
culture: culture,
+ segment: segment,
fieldName: fieldName,
callback: callback,
id: id
@@ -175,6 +190,7 @@ function serverValidationManager($timeout) {
callbacks.push({
propertyAlias: propertyAlias,
culture: culture,
+ segment: segment,
fieldName: fieldName,
callback: callback,
id: id
@@ -199,25 +215,29 @@ function serverValidationManager($timeout) {
* @param {} fieldName
* @returns {}
*/
- unsubscribe: function (propertyAlias, culture, fieldName) {
+ unsubscribe: function (propertyAlias, culture, fieldName, segment) {
- //normalize culture to null
+ //normalize culture to "invariant"
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
if (propertyAlias === null) {
//remove all callbacks for the content field
callbacks = _.reject(callbacks, function (item) {
- return item.propertyAlias === null && item.culture === culture && item.fieldName === fieldName;
+ return item.propertyAlias === null && item.culture === culture && item.segment === segment && item.fieldName === fieldName;
});
}
else if (propertyAlias !== undefined) {
//remove all callbacks for the content property
callbacks = _.reject(callbacks, function (item) {
- return item.propertyAlias === propertyAlias && item.culture === culture &&
+ return item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment &&
(item.fieldName === fieldName ||
((item.fieldName === undefined || item.fieldName === "") && (fieldName === undefined || fieldName === "")));
});
@@ -236,16 +256,20 @@ function serverValidationManager($timeout) {
* This will always return any callbacks registered for just the property (i.e. field name is empty) and for ones with an
* explicit field name set.
*/
- getPropertyCallbacks: function (propertyAlias, culture, fieldName) {
+ getPropertyCallbacks: function (propertyAlias, culture, fieldName, segment) {
- //normalize culture to null
+ //normalize culture to "invariant"
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
var found = _.filter(callbacks, function (item) {
//returns any callback that have been registered directly against the field and for only the property
- return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (item.fieldName === undefined || item.fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (item.fieldName === undefined || item.fieldName === "")));
});
return found;
},
@@ -262,7 +286,7 @@ function serverValidationManager($timeout) {
getFieldCallbacks: function (fieldName) {
var found = _.filter(callbacks, function (item) {
//returns any callback that have been registered directly against the field
- return (item.propertyAlias === null && item.culture === "invariant" && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
});
return found;
},
@@ -274,12 +298,29 @@ function serverValidationManager($timeout) {
* @function
*
* @description
- * Gets all callbacks that has been registered using the subscribe method for the culture.
+ * Gets all callbacks that has been registered using the subscribe method for the culture. Not including segments.
*/
getCultureCallbacks: function (culture) {
var found = _.filter(callbacks, function (item) {
//returns any callback that have been registered directly/ONLY against the culture
- return (item.culture === culture && item.propertyAlias === null && item.fieldName === null);
+ return (item.culture === culture && item.segment === null && item.propertyAlias === null && item.fieldName === null);
+ });
+ return found;
+ },
+
+ /**
+ * @ngdoc function
+ * @name getVariantCallbacks
+ * @methodOf umbraco.services.serverValidationManager
+ * @function
+ *
+ * @description
+ * Gets all callbacks that has been registered using the subscribe method for the culture and segment.
+ */
+ getVariantCallbacks: function (culture, segment) {
+ var found = _.filter(callbacks, function (item) {
+ //returns any callback that have been registered directly against the given culture and given segment.
+ return (item.culture === culture && item.segment === segment && item.propertyAlias === null && item.fieldName === null);
});
return found;
},
@@ -303,6 +344,7 @@ function serverValidationManager($timeout) {
this.items.push({
propertyAlias: null,
culture: "invariant",
+ segment: null,
fieldName: fieldName,
errorMsg: errorMsg
});
@@ -314,7 +356,7 @@ function serverValidationManager($timeout) {
var cbs = this.getFieldCallbacks(fieldName);
//call each callback for this error
for (var cb in cbs) {
- executeCallback(this, errorsForCallback, cbs[cb].callback, null);
+ executeCallback(this, errorsForCallback, cbs[cb].callback, null, null);
}
},
@@ -327,7 +369,7 @@ function serverValidationManager($timeout) {
* @description
* Adds an error message for the content property
*/
- addPropertyError: function (propertyAlias, culture, fieldName, errorMsg) {
+ addPropertyError: function (propertyAlias, culture, fieldName, errorMsg, segment) {
if (!propertyAlias) {
return;
}
@@ -336,31 +378,36 @@ function serverValidationManager($timeout) {
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
//only add the item if it doesn't exist
- if (!this.hasPropertyError(propertyAlias, culture, fieldName)) {
+ if (!this.hasPropertyError(propertyAlias, culture, fieldName, segment)) {
this.items.push({
propertyAlias: propertyAlias,
culture: culture,
+ segment: segment,
fieldName: fieldName,
errorMsg: errorMsg
});
}
//find all errors for this item
- var errorsForCallback = getPropertyErrors(this, propertyAlias, culture, fieldName);
+ var errorsForCallback = getPropertyErrors(this, propertyAlias, culture, segment, fieldName);
//we should now call all of the call backs registered for this error
- var cbs = this.getPropertyCallbacks(propertyAlias, culture, fieldName);
+ var cbs = this.getPropertyCallbacks(propertyAlias, culture, fieldName, segment);
//call each callback for this error
for (var cb in cbs) {
- executeCallback(this, errorsForCallback, cbs[cb].callback, culture);
+ executeCallback(this, errorsForCallback, cbs[cb].callback, culture, segment);
}
- //execute culture specific callbacks here too when a propery error is added
- var cultureCbs = this.getCultureCallbacks(culture);
+ //execute variant specific callbacks here too when a propery error is added
+ var variantCbs = this.getVariantCallbacks(culture, segment);
//call each callback for this error
- for (var cb in cultureCbs) {
- executeCallback(this, errorsForCallback, cultureCbs[cb].callback, culture);
+ for (var cb in variantCbs) {
+ executeCallback(this, errorsForCallback, variantCbs[cb].callback, culture, segment);
}
},
@@ -373,7 +420,7 @@ function serverValidationManager($timeout) {
* @description
* Removes an error message for the content property
*/
- removePropertyError: function (propertyAlias, culture, fieldName) {
+ removePropertyError: function (propertyAlias, culture, fieldName, segment) {
if (!propertyAlias) {
return;
@@ -383,10 +430,14 @@ function serverValidationManager($timeout) {
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
//remove the item
this.items = _.reject(this.items, function (item) {
- return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
},
@@ -405,7 +456,10 @@ function serverValidationManager($timeout) {
callbacks[cb].callback.apply(this, [
true, //pass in a value indicating it is VALID
[], //pass in empty collection
- []]); //pass in empty collection
+ [],
+ null,
+ null]
+ );
}
},
@@ -431,16 +485,20 @@ function serverValidationManager($timeout) {
* @description
* Gets the error message for the content property
*/
- getPropertyError: function (propertyAlias, culture, fieldName) {
+ getPropertyError: function (propertyAlias, culture, fieldName, segment) {
- //normalize culture to null
+ //normalize culture to "invariant"
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
var err = _.find(this.items, function (item) {
//return true if the property alias matches and if an empty field name is specified or the field name matches
- return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
return err;
},
@@ -457,7 +515,7 @@ function serverValidationManager($timeout) {
getFieldError: function (fieldName) {
var err = _.find(this.items, function (item) {
//return true if the property alias matches and if an empty field name is specified or the field name matches
- return (item.propertyAlias === null && item.culture === "invariant" && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
});
return err;
},
@@ -471,16 +529,20 @@ function serverValidationManager($timeout) {
* @description
* Checks if the content property + culture + field name combo has an error
*/
- hasPropertyError: function (propertyAlias, culture, fieldName) {
+ hasPropertyError: function (propertyAlias, culture, fieldName, segment) {
//normalize culture to null
if (!culture) {
culture = "invariant";
}
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
var err = _.find(this.items, function (item) {
//return true if the property alias matches and if an empty field name is specified or the field name matches
- return (item.propertyAlias === propertyAlias && item.culture === culture && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
+ return (item.propertyAlias === propertyAlias && item.culture === culture && item.segment === segment && (item.fieldName === fieldName || (fieldName === undefined || fieldName === "")));
});
return err ? true : false;
},
@@ -497,12 +559,11 @@ function serverValidationManager($timeout) {
hasFieldError: function (fieldName) {
var err = _.find(this.items, function (item) {
//return true if the property alias matches and if an empty field name is specified or the field name matches
- return (item.propertyAlias === null && item.culture === "invariant" && item.fieldName === fieldName);
+ return (item.propertyAlias === null && item.culture === "invariant" && item.segment === null && item.fieldName === fieldName);
});
return err ? true : false;
},
-
/**
* @ngdoc function
* @name hasCultureError
@@ -513,14 +574,40 @@ function serverValidationManager($timeout) {
* Checks if the given culture has an error
*/
hasCultureError: function (culture) {
-
- //normalize culture to null
+
+ //normalize culture to "invariant"
if (!culture) {
culture = "invariant";
}
+
+ var err = _.find(this.items, function (item) {
+ return (item.culture === culture && item.segment === null);
+ });
+ return err ? true : false;
+ },
+
+ /**
+ * @ngdoc function
+ * @name hasVariantError
+ * @methodOf umbraco.services.serverValidationManager
+ * @function
+ *
+ * @description
+ * Checks if the given culture has an error
+ */
+ hasVariantError: function (culture, segment) {
+
+ //normalize culture to "invariant"
+ if (!culture) {
+ culture = "invariant";
+ }
+ //normalize segment to null
+ if (!segment) {
+ segment = null;
+ }
var err = _.find(this.items, function (item) {
- return item.culture === culture;
+ return (item.culture === culture && item.segment === segment);
});
return err ? true : false;
},
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 d2b91a3707..66f0b110bf 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
@@ -480,7 +480,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
//now we need to check if this custom config key is defined in our baseline, if it is we don't want to
//overwrite the baseline config item if it is an array, we want to concat the items in the array, otherwise
//if it's an object it will overwrite the baseline
- if (angular.isArray(config[i]) && angular.isArray(tinyMceConfig.customConfig[i])) {
+ if (Utilities.isArray(config[i]) && Utilities.isArray(tinyMceConfig.customConfig[i])) {
//concat it and below this concat'd array will overwrite the baseline in angular.extend
tinyMceConfig.customConfig[i] = config[i].concat(tinyMceConfig.customConfig[i]);
}
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
index 8fcab445b3..4166725c39 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
@@ -9,7 +9,7 @@
'use strict';
function tourService(eventsService, currentUserResource, $q, tourResource) {
-
+
var tours = [];
var currentTour = null;
@@ -18,14 +18,16 @@
*/
function registerAllTours() {
tours = [];
- return tourResource.getTours().then(function(tourFiles) {
- angular.forEach(tourFiles, function (tourFile) {
- angular.forEach(tourFile.tours, function(newTour) {
+ return tourResource.getTours().then(function (tourFiles) {
+ Utilities.forEach(tourFiles, tourFile => {
+
+ Utilities.forEach(tourFile.tours, newTour => {
validateTour(newTour);
validateTourRegistration(newTour);
- tours.push(newTour);
+ tours.push(newTour);
});
});
+
eventsService.emit("appState.tour.updatedTours", tours);
});
}
@@ -74,7 +76,7 @@
tour.disabled = true;
currentUserResource
.saveTourStatus({ alias: tour.alias, disabled: tour.disabled, completed: tour.completed }).then(
- function() {
+ function () {
eventsService.emit("appState.tour.end", tour);
currentTour = null;
deferred.resolve(tour);
@@ -96,7 +98,7 @@
tour.completed = true;
currentUserResource
.saveTourStatus({ alias: tour.alias, disabled: tour.disabled, completed: tour.completed }).then(
- function() {
+ function () {
eventsService.emit("appState.tour.complete", tour);
currentTour = null;
deferred.resolve(tour);
@@ -130,10 +132,10 @@
function getGroupedTours() {
var deferred = $q.defer();
var tours = getTours();
- setTourStatuses(tours).then(function() {
+ setTourStatuses(tours).then(function () {
var groupedTours = [];
tours.forEach(function (item) {
-
+
if (item.contentType === null || item.contentType === '') {
var groupExists = false;
var newGroup = {
@@ -149,9 +151,9 @@
}
groupExists = true;
- if(item.hidden === false){
- group.tours.push(item);
- }
+ if (item.hidden === false) {
+ group.tours.push(item);
+ }
}
});
@@ -162,7 +164,7 @@
newGroup.groupOrder = item.groupOrder;
}
- if(item.hidden === false){
+ if (item.hidden === false) {
newGroup.tours.push(item);
groupedTours.push(newGroup);
}
@@ -242,14 +244,14 @@
throw "Tour " + tour.alias + " is missing the required sections";
}
}
-
+
/**
* Validates a tour before it gets registered in the service
* @param {any} tour
*/
function validateTourRegistration(tour) {
// check for existing tours with the same alias
- angular.forEach(tours, function (existingTour) {
+ Utilities.forEach(tours, existingTour => {
if (existingTour.alias === tour.alias) {
throw "A tour with the alias " + tour.alias + " is already registered";
}
@@ -265,16 +267,17 @@
var deferred = $q.defer();
currentUserResource.getTours().then(function (storedTours) {
- angular.forEach(storedTours, function (storedTour) {
+ Utilities.forEach(storedTours, storedTour => {
+
if (storedTour.completed === true) {
- angular.forEach(tours, function (tour) {
+ Utilities.forEach(tours, tour => {
if (storedTour.alias === tour.alias) {
tour.completed = true;
}
});
}
if (storedTour.disabled === true) {
- angular.forEach(tours, function (tour) {
+ Utilities.forEach(tours, tour => {
if (storedTour.alias === tour.alias) {
tour.disabled = true;
}
@@ -296,7 +299,7 @@
getCurrentTour: getCurrentTour,
getGroupedTours: getGroupedTours,
getTourByAlias: getTourByAlias,
- getToursForDoctype : getToursForDoctype
+ getToursForDoctype: getToursForDoctype
};
return service;
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 3c9846fc43..0d6216f7cc 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
@@ -47,7 +47,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
/** Internal method to track expanded paths on a tree */
_trackExpandedPaths: function (node, expandedPaths) {
- if (!node.children || !angular.isArray(node.children) || node.children.length == 0) {
+ if (!node.children || !Utilities.isArray(node.children) || node.children.length == 0) {
return;
}
@@ -174,7 +174,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
//we determine this based on the server variables
if (Umbraco.Sys.ServerVariables.umbracoPlugins &&
Umbraco.Sys.ServerVariables.umbracoPlugins.trees &&
- angular.isArray(Umbraco.Sys.ServerVariables.umbracoPlugins.trees)) {
+ Utilities.isArray(Umbraco.Sys.ServerVariables.umbracoPlugins.trees)) {
var found = _.find(Umbraco.Sys.ServerVariables.umbracoPlugins.trees, function (item) {
return invariantEquals(item.alias, treeAlias);
@@ -473,7 +473,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
for (var i = 0; i < treeNode.children.length; i++) {
var child = treeNode.children[i];
- if (child.children && angular.isArray(child.children) && child.children.length > 0) {
+ if (child.children && Utilities.isArray(child.children) && child.children.length > 0) {
//recurse
found = this.getDescendantNode(child, id);
if (found) {
@@ -773,7 +773,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
if (!args.path) {
throw "No path defined on args object for syncTree";
}
- if (!angular.isArray(args.path)) {
+ if (!Utilities.isArray(args.path)) {
throw "Path must be an array";
}
if (args.path.length < 1) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
index d9aef1ddba..109fff0919 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
@@ -64,7 +64,7 @@
var saveModel = _.pick(displayModel,
'compositeContentTypes', 'isContainer', 'allowAsRoot', 'allowedTemplates', 'allowedContentTypes',
'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
- 'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
+ 'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'allowSegmentVariant', 'isElement');
// TODO: Map these
saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
@@ -83,7 +83,7 @@
});
var saveProperties = _.map(realProperties, function (p) {
- var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant');
+ var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant');
return saveProperty;
});
@@ -158,7 +158,7 @@
var currGroups = saveModel.userGroups;
var formattedGroups = [];
for (var i = 0; i < currGroups.length; i++) {
- if (!angular.isString(currGroups[i])) {
+ if (!Utilities.isString(currGroups[i])) {
formattedGroups.push(currGroups[i].alias);
}
else {
@@ -229,7 +229,7 @@
var currSections = saveModel.sections;
var formattedSections = [];
for (var i = 0; i < currSections.length; i++) {
- if (!angular.isString(currSections[i])) {
+ if (!Utilities.isString(currSections[i])) {
formattedSections.push(currSections[i].alias);
}
else {
@@ -242,7 +242,7 @@
var currUsers = saveModel.users;
var formattedUsers = [];
for (var j = 0; j < currUsers.length; j++) {
- if (!angular.isNumber(currUsers[j])) {
+ if (!Utilities.isNumber(currUsers[j])) {
formattedUsers.push(currUsers[j].id);
}
else {
@@ -367,6 +367,7 @@
name: v.name || "", //if its null/empty,we must pass up an empty string else we get json converter errors
properties: getContentProperties(v.tabs),
culture: v.language ? v.language.culture : null,
+ segment: v.segment,
publish: v.publish,
save: v.save,
releaseDate: v.releaseDate,
@@ -393,38 +394,59 @@
*/
formatContentGetData: function(displayModel) {
- //We need to check for invariant properties among the variant variants.
- //When we detect this, we want to make sure that the property object instance is the
- //same reference object between all variants instead of a copy (which it will be when
- //return from the JSON structure).
+ // We need to check for invariant properties among the variant variants,
+ // as the value of an invariant property is shared between different variants.
+ // A property can be culture invariant, segment invariant, or both.
+ // When we detect this, we want to make sure that the property object instance is the
+ // same reference object between all variants instead of a copy (which it will be when
+ // return from the JSON structure).
if (displayModel.variants && displayModel.variants.length > 1) {
+ // Collect all invariant properties from the variants that are either the
+ // default language variant or the default segment variant.
+ var defaultVariants = _.filter(displayModel.variants, function (variant) {
+ var isDefaultLanguage = variant.language && variant.language.isDefault;
+ var isDefaultSegment = variant.segment == null;
- var invariantProperties = [];
-
- //collect all invariant properties on the first first variant
- var firstVariant = displayModel.variants[0];
- _.each(firstVariant.tabs, function(tab, tabIndex) {
- _.each(tab.properties, function (property, propIndex) {
- //in theory if there's more than 1 variant, that means they would all have a language
- //but we'll do our safety checks anyways here
- if (firstVariant.language && !property.culture) {
- invariantProperties.push({
- tabIndex: tabIndex,
- propIndex: propIndex,
- property: property
- });
- }
- });
+ return isDefaultLanguage || isDefaultSegment;
});
+ if (defaultVariants.length > 0) {
+ _.each(defaultVariants, function (defaultVariant) {
+ var invariantProps = [];
- //now assign this same invariant property instance to the same index of the other variants property array
- for (var j = 1; j < displayModel.variants.length; j++) {
- var variant = displayModel.variants[j];
+ _.each(defaultVariant.tabs, function (tab, tabIndex) {
+ _.each(tab.properties, function (property, propIndex) {
+ // culture == null -> property is culture invariant
+ // segment == null -> property is *possibly* segment invariant
+ if (!property.culture || !property.segment) {
+ invariantProps.push({
+ tabIndex: tabIndex,
+ propIndex: propIndex,
+ property: property
+ });
+ }
+ });
+ });
- _.each(invariantProperties, function (invProp) {
- variant.tabs[invProp.tabIndex].properties[invProp.propIndex] = invProp.property;
+ var otherVariants = _.filter(displayModel.variants, function (variant) {
+ return variant !== defaultVariant;
+ });
+
+ // now assign this same invariant property instance to the same index of the other variants property array
+ _.each(otherVariants, function (variant) {
+ _.each(invariantProps, function (invProp) {
+ var tab = variant.tabs[invProp.tabIndex];
+ var prop = tab.properties[invProp.propIndex];
+
+ var inheritsCulture = prop.culture === invProp.property.culture && prop.segment == null && invProp.property.segment == null;
+ var inheritsSegment = prop.segment === invProp.property.segment && !prop.culture;
+
+ if (inheritsCulture || inheritsSegment) {
+ tab.properties[invProp.propIndex] = invProp.property;
+ }
+ });
+ });
});
}
}
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 6c765ee135..edf698c8a7 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
@@ -44,7 +44,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
*/
dictionaryToQueryString: function (queryStrings) {
- if (angular.isArray(queryStrings)) {
+ if (Utilities.isArray(queryStrings)) {
return _.map(queryStrings, function (item) {
var key = null;
var val = null;
@@ -59,7 +59,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
return encodeURIComponent(key) + "=" + encodeURIComponent(val);
}).join("&");
}
- else if (angular.isObject(queryStrings)) {
+ else if (Utilities.isObject(queryStrings)) {
//this allows for a normal object to be passed in (ie. a dictionary)
return decodeURIComponent($.param(queryStrings));
@@ -91,7 +91,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
}
return Umbraco.Sys.ServerVariables["umbracoUrls"][apiName] + actionName +
- (!queryStrings ? "" : "?" + (angular.isString(queryStrings) ? queryStrings : this.dictionaryToQueryString(queryStrings)));
+ (!queryStrings ? "" : "?" + (Utilities.isString(queryStrings) ? queryStrings : this.dictionaryToQueryString(queryStrings)));
},
@@ -129,7 +129,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
var err = {
//NOTE: the default error message here should never be used based on the above docs!
- errorMsg: (angular.isString(opts) ? opts : 'An error occurred!'),
+ errorMsg: (Utilities.isString(opts) ? opts : 'An error occurred!'),
data: data,
status: status
};
@@ -254,7 +254,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
// so we know which property it belongs to on the server side
var fileKey = "file_" + args.files[f].alias + "_" + (args.files[f].culture ? args.files[f].culture : "");
- if (angular.isArray(args.files[f].metaData) && args.files[f].metaData.length > 0) {
+ if (Utilities.isArray(args.files[f].metaData) && args.files[f].metaData.length > 0) {
fileKey += ("_" + args.files[f].metaData.join("_"));
}
formData.append(fileKey, args.files[f].file);
@@ -322,7 +322,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
//validate input, jsonData can be an array of key/value pairs or just one key/value pair.
if (!jsonData) { throw "jsonData cannot be null"; }
- if (angular.isArray(jsonData)) {
+ if (Utilities.isArray(jsonData)) {
_.each(jsonData, function (item) {
if (!item.key || !item.value) { throw "jsonData array item must have both a key and a value property"; }
});
@@ -340,13 +340,13 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
transformRequest: function(data) {
var formData = new FormData();
//add the json data
- if (angular.isArray(data)) {
+ if (Utilities.isArray(data)) {
_.each(data, function(item) {
- formData.append(item.key, !angular.isString(item.value) ? angular.toJson(item.value) : item.value);
+ formData.append(item.key, !Utilities.isString(item.value) ? Utilities.toJson(item.value) : item.value);
});
}
else {
- formData.append(data.key, !angular.isString(data.value) ? angular.toJson(data.value) : data.value);
+ formData.append(data.key, !Utilities.isString(data.value) ? Utilities.toJson(data.value) : data.value);
}
//call the callback
@@ -365,12 +365,23 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
},
/**
+ * @ngdoc method
+ * @name umbraco.resources.contentResource#downloadFile
+ * @methodOf umbraco.resources.contentResource
+ *
+ * @description
* Downloads a file to the client using AJAX/XHR
- * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
- * See https://stackoverflow.com/a/24129082/694494
+ *
+ * @param {string} httpPath the path (url) to the resource being downloaded
+ * @returns {Promise} http promise object.
*/
downloadFile : function (httpPath) {
+ /**
+ * Based on an implementation here: web.student.tuwien.ac.at/~e0427417/jsdownload.html
+ * See https://stackoverflow.com/a/24129082/694494
+ */
+
// Use an arraybuffer
return $http.get(httpPath, { responseType: 'arraybuffer' })
.then(function (response) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index afd7b606e7..de6fbaf782 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -128,7 +128,7 @@ angular.module('umbraco.services')
function setUserTimeoutInternal(newTimeout) {
var asNumber = parseFloat(newTimeout);
- if (!isNaN(asNumber) && currentUser && angular.isNumber(asNumber)) {
+ if (!isNaN(asNumber) && currentUser && Utilities.isNumber(asNumber)) {
currentUser.remainingAuthSeconds = newTimeout;
lastServerTimeoutSet = new Date();
}
@@ -185,7 +185,19 @@ angular.module('umbraco.services')
authenticate: function (login, password) {
return authResource.performLogin(login, password)
- .then(this.setAuthenticationSuccessful);
+ .then(function(data) {
+
+ // Check if user has a start node set.
+ if(data.startContentIds.length === 0 && data.startMediaIds.length === 0){
+ var errorMsg = "User has no start-nodes";
+ var result = { errorMsg: errorMsg, user: data, authenticated: false, lastUserId: lastUserId, loginType: "credentials" };
+ eventsService.emit("app.notAuthenticated", result);
+ throw result;
+ }
+
+ return data;
+
+ }).then(this.setAuthenticationSuccessful);
},
setAuthenticationSuccessful: function (data) {
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 a7ff9def21..82353df744 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
@@ -206,11 +206,11 @@ function umbSessionStorage($window) {
return {
get: function (key) {
- return angular.fromJson(storage["umb_" + key]);
+ return Utilities.fromJson(storage["umb_" + key]);
},
set: function (key, value) {
- storage["umb_" + key] = angular.toJson(value);
+ storage["umb_" + key] = Utilities.toJson(value);
}
};
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index d5c5166d21..ce824f63c0 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -34,7 +34,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
else {
const introTourShown = localStorageService.get("introTourShown");
- if(!introTourShown){
+ if (!introTourShown) {
// Go & show email marketing tour (ONLY when intro tour is completed or been dismissed)
tourService.getTourByAlias("umbEmailMarketing").then(function (emailMarketingTour) {
// Only show the email marketing tour one time - dismissing it or saying no will make sure it never appears again
@@ -45,7 +45,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
// Only show the email tour once per logged in session
// The localstorage key is removed on logout or user session timeout
const emailMarketingTourShown = localStorageService.get("emailMarketingTourShown");
- if(!emailMarketingTourShown){
+ if (!emailMarketingTourShown) {
tourService.startTour(emailMarketingTour);
localStorageService.set("emailMarketingTourShown", true);
}
@@ -89,7 +89,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
currentRouteParams = toRetain;
}
else {
- currentRouteParams = angular.copy(current.params);
+ currentRouteParams = Utilities.copy(current.params);
}
@@ -183,7 +183,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
currentRouteParams = toRetain;
}
else {
- currentRouteParams = angular.copy(next.params);
+ currentRouteParams = Utilities.copy(next.params);
}
//always clear the 'sr' query string (soft redirect) if it exists
@@ -191,7 +191,7 @@ app.run(['$rootScope', '$route', '$location', 'urlHelper', 'navigationService',
currentRouteParams.sr = null;
$route.updateParams(currentRouteParams);
}
-
+
}
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
index f6f162f04f..05c391c3e7 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js
@@ -2,17 +2,16 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
var _status = {
index: 0,
- current: undefined,
- steps: undefined,
+ current: null,
+ steps: null,
loading: true,
progress: "100%"
};
- var factTimer = undefined;
+ var factTimer;
var _installerModel = {
- installId: undefined,
- instructions: {
- }
+ installId: null,
+ instructions: {}
};
//add to umbraco installer facts here
@@ -304,7 +303,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
},
switchToFeedback : function(){
- service.status.current = undefined;
+ service.status.current = null;
service.status.loading = true;
service.status.configuring = false;
@@ -320,11 +319,11 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
switchToConfiguration : function(){
service.status.loading = false;
service.status.configuring = true;
- service.status.feedback = undefined;
- service.status.fact = undefined;
+ service.status.feedback = null;
+ service.status.fact = null;
- if(factTimer){
- clearInterval(factTimer);
+ if (factTimer) {
+ clearInterval(factTimer);
}
},
@@ -335,8 +334,8 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
service.status.feedback = "Redirecting you to Umbraco, please wait";
service.status.loading = false;
- if(factTimer){
- clearInterval(factTimer);
+ if (factTimer) {
+ clearInterval(factTimer);
}
$timeout(function(){
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
index e83c5114fc..687fce95ae 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
@@ -4,18 +4,19 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
$scope.invalidDbDns = false;
$scope.dbs = [
- { name: 'Microsoft SQL Server Compact (SQL CE)', id: 0},
- { name: 'Microsoft SQL Server', id: 1},
+ { name: 'Microsoft SQL Server Compact (SQL CE)', id: 0 },
+ { name: 'Microsoft SQL Server', id: 1 },
{ name: 'Microsoft SQL Azure', id: 3 },
- { name: 'Custom connection string', id: -1}
+ { name: 'Custom connection string', id: -1 }
];
- if ( installerService.status.current.model.dbType === undefined ) {
+ if (angular.isUndefined(installerService.status.current.model.dbType) || installerService.status.current.model.dbType === null) {
installerService.status.current.model.dbType = 0;
}
- $scope.validateAndForward = function(){
- if ( !$scope.checking && this.myForm.$valid ) {
+ $scope.validateAndForward = function() {
+ if (!$scope.checking && this.myForm.$valid)
+ {
$scope.checking = true;
$scope.invalidDbDns = false;
@@ -23,9 +24,9 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll
$http.post(
Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostValidateDatabaseConnection",
- model ).then( function( response ) {
+ model).then(function(response) {
- if ( response.data === true ) {
+ if (response.data === true) {
installerService.forward();
}
else {
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
index bdcef63d95..fdd2c65c1c 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/machinekey.controller.js
@@ -1,5 +1,4 @@
angular.module("umbraco.install").controller("Umbraco.Installer.MachineKeyController", function ($scope, installerService) {
-
$scope.continue = function () {
installerService.status.current.model = true;
@@ -11,4 +10,4 @@
installerService.forward();
};
-});
\ No newline at end of file
+});
diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
index cfb08744b2..92f5cc8d9d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
@@ -20,8 +20,9 @@
-
+
No thanks, I do not want to install a starter website
-
+