diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
index 740a038a23..94b51ed10d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
@@ -31,476 +31,492 @@
angular.module('umbraco.services')
.factory('dialogService', function ($rootScope, $compile, $http, $timeout, $q, $templateCache, appState, eventsService) {
- var dialogs = [];
-
- /** Internal method that removes all dialogs */
- function removeAllDialogs(args) {
- for (var i = 0; i < dialogs.length; i++) {
- var dialog = dialogs[i];
- dialog.close(args);
- dialogs.splice(i, 1);
- }
- }
+ var dialogs = [];
- /** Internal method that handles opening all dialogs */
- function openDialog(options) {
- var defaults = {
- container: $("body"),
- animation: "fade",
- modalClass: "umb-modal",
- width: "100%",
- inline: false,
- iframe: false,
- show: true,
- template: "views/common/notfound.html",
- callback: undefined,
- closeCallback: undefined,
- element: undefined,
- //this allows us to pass in data to the dialog if required which can be used to configure the dialog
- //and re-use it for different purposes. It will set on to the $scope.dialogData if it is defined.
- dialogData: undefined
- };
-
- var dialog = angular.extend(defaults, options);
- var scope = options.scope || $rootScope.$new();
-
- //Modal dom obj and unique id
- dialog.element = $('');
- var id = dialog.template.replace('.html', '').replace('.aspx', '').replace(/[\/|\.|:\&\?\=]/g, "-") + '-' + scope.$id;
+ /** Internal method that removes all dialogs */
+ function removeAllDialogs(args) {
+ for (var i = 0; i < dialogs.length; i++) {
+ var dialog = dialogs[i];
+ dialog.close(args);
+ dialogs.splice(i, 1);
+ }
+ }
- if (options.inline) {
- dialog.animation = "";
- }
- else {
- dialog.element.addClass("modal");
- dialog.element.addClass("hide");
- }
+ /** Internal method that handles opening all dialogs */
+ function openDialog(options) {
+ var defaults = {
+ container: $("body"),
+ animation: "fade",
+ modalClass: "umb-modal",
+ width: "100%",
+ inline: false,
+ iframe: false,
+ show: true,
+ template: "views/common/notfound.html",
+ callback: undefined,
+ closeCallback: undefined,
+ element: undefined,
+ //this allows us to pass in data to the dialog if required which can be used to configure the dialog
+ //and re-use it for different purposes. It will set on to the $scope.dialogData if it is defined.
+ dialogData: undefined
+ };
- //set the id and add classes
- dialog.element
- .attr('id', id)
- .addClass(dialog.animation)
- .addClass(dialog.modalClass);
+ var dialog = angular.extend(defaults, options);
+ var scope = options.scope || $rootScope.$new();
- //push the modal into the global modal collection
- //we halt the .push because a link click will trigger a closeAll right away
- $timeout(function () {
- dialogs.push(dialog);
- }, 500);
-
+ //Modal dom obj and unique id
+ dialog.element = $('');
+ var id = dialog.template.replace('.html', '').replace('.aspx', '').replace(/[\/|\.|:\&\?\=]/g, "-") + '-' + scope.$id;
- dialog.close = function(data) {
- if (dialog.closeCallback) {
- dialog.closeCallback(data);
- }
+ if (options.inline) {
+ dialog.animation = "";
+ }
+ else {
+ dialog.element.addClass("modal");
+ dialog.element.addClass("hide");
+ }
- if(dialog.element){
- dialog.element.modal('hide');
+ //set the id and add classes
+ dialog.element
+ .attr('id', id)
+ .addClass(dialog.animation)
+ .addClass(dialog.modalClass);
- //this is not entirely enough since the damn
- //webforms scriploader still complains
- if(dialog.iframe){
+ //push the modal into the global modal collection
+ //we halt the .push because a link click will trigger a closeAll right away
+ $timeout(function () {
+ dialogs.push(dialog);
+ }, 500);
+
+
+ dialog.close = function (data) {
+ if (dialog.closeCallback) {
+ dialog.closeCallback(data);
+ }
+
+ if (dialog.element) {
+ dialog.element.modal('hide');
+
+ //this is not entirely enough since the damn
+ //webforms scriploader still complains
+ if (dialog.iframe) {
dialog.element.find("iframe").attr("src", "about:blank");
- $timeout(function(){
- dialog.element.remove();
- }, 1000);
- }else{
+ $timeout(function () {
+ //we need to do more than just remove the element, this will not destroy the
+ // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
+ // take care of this ourselves we have memory leaks.
+ dialog.element.remove();
+ dialog.scope.$destroy();
+ }, 1000);
+ } else {
+ //we need to do more than just remove the element, this will not destroy the
+ // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
+ // take care of this ourselves we have memory leaks.
dialog.element.remove();
- }
- }
- };
+ dialog.scope.$destroy();
+ }
+ }
+ };
- //if iframe is enabled, inject that instead of a template
- if (dialog.iframe) {
- var html = $("");
- dialog.element.html(html);
-
- //append to body or whatever element is passed in as options.containerElement
- dialog.container.append(dialog.element);
+ //if iframe is enabled, inject that instead of a template
+ if (dialog.iframe) {
+ var html = $("");
+ dialog.element.html(html);
- // Compile modal content
- $timeout(function () {
- $compile(dialog.element)(dialog.scope);
- });
+ //append to body or whatever element is passed in as options.containerElement
+ dialog.container.append(dialog.element);
- dialog.element.css("width", dialog.width);
+ // Compile modal content
+ $timeout(function () {
+ $compile(dialog.element)(dialog.scope);
+ });
- //Autoshow
- if (dialog.show) {
- dialog.element.modal('show');
- }
+ dialog.element.css("width", dialog.width);
- dialog.scope = scope;
- return dialog;
- }
- else {
-
- //We need to load the template with an httpget and once it's loaded we'll compile and assign the result to the container
- // object. However since the result could be a promise or just data we need to use a $q.when. We still need to return the
- // $modal object so we'll actually return the modal object synchronously without waiting for the promise. Otherwise this openDialog
- // method will always need to return a promise which gets nasty because of promises in promises plus the result just needs a reference
- // to the $modal object which will not change (only it's contents will change).
- $q.when($templateCache.get(dialog.template) || $http.get(dialog.template, { cache: true }).then(function(res) { return res.data; }))
- .then(function onSuccess(template) {
+ //Autoshow
+ if (dialog.show) {
+ dialog.element.modal('show');
+ }
- // Build modal object
- dialog.element.html(template);
+ dialog.scope = scope;
+ return dialog;
+ }
+ else {
- //append to body or other container element
- dialog.container.append(dialog.element);
-
- // Compile modal content
- $timeout(function() {
- $compile(dialog.element)(scope);
- });
+ //We need to load the template with an httpget and once it's loaded we'll compile and assign the result to the container
+ // object. However since the result could be a promise or just data we need to use a $q.when. We still need to return the
+ // $modal object so we'll actually return the modal object synchronously without waiting for the promise. Otherwise this openDialog
+ // method will always need to return a promise which gets nasty because of promises in promises plus the result just needs a reference
+ // to the $modal object which will not change (only it's contents will change).
+ $q.when($templateCache.get(dialog.template) || $http.get(dialog.template, { cache: true }).then(function (res) { return res.data; }))
+ .then(function onSuccess(template) {
- scope.dialogOptions = dialog;
-
- //Scope to handle data from the modal form
- scope.dialogData = dialog.dialogData ? dialog.dialogData : {};
- scope.dialogData.selection = [];
+ // Build modal object
+ dialog.element.html(template);
- // Provide scope display functions
- //this passes the modal to the current scope
- scope.$modal = function(name) {
- dialog.element.modal(name);
- };
+ //append to body or other container element
+ dialog.container.append(dialog.element);
- scope.swipeHide = function(e){
- if(appState.getGlobalState("touchDevice")){
+ // Compile modal content
+ $timeout(function () {
+ $compile(dialog.element)(scope);
+ });
+
+ scope.dialogOptions = dialog;
+
+ //Scope to handle data from the modal form
+ scope.dialogData = dialog.dialogData ? dialog.dialogData : {};
+ scope.dialogData.selection = [];
+
+ // Provide scope display functions
+ //this passes the modal to the current scope
+ scope.$modal = function (name) {
+ dialog.element.modal(name);
+ };
+
+ scope.swipeHide = function (e) {
+ if (appState.getGlobalState("touchDevice")) {
var selection = window.getSelection();
- if(selection.type !== "Range"){
- scope.hide();
+ if (selection.type !== "Range") {
+ scope.hide();
}
}
- };
+ };
- scope.hide = function() {
- dialog.element.modal('hide');
+ scope.hide = function () {
+ dialog.element.modal('hide');
- dialog.element.remove();
- $("#" + dialog.element.attr("id")).remove();
- };
+ dialog.element.remove();
+ $("#" + dialog.element.attr("id")).remove();
+ //we need to do more than just remove the element, this will not destroy the
+ // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
+ // take care of this ourselves we have memory leaks.
+ dialog.scope.$destroy();
+ };
- //basic events for submitting and closing
- scope.submit = function(data) {
- if (dialog.callback) {
- dialog.callback(data);
- }
+ //basic events for submitting and closing
+ scope.submit = function (data) {
+ if (dialog.callback) {
+ dialog.callback(data);
+ }
- dialog.element.modal('hide');
- dialog.element.remove();
- $("#" + dialog.element.attr("id")).remove();
- };
+ dialog.element.modal('hide');
+ dialog.element.remove();
+ $("#" + dialog.element.attr("id")).remove();
+ //we need to do more than just remove the element, this will not destroy the
+ // scope in angular 1.1x, in angular 1.2x this is taken care of but if we dont
+ // take care of this ourselves we have memory leaks.
+ dialog.scope.$destroy();
+ };
- scope.close = function(data) {
+ scope.close = function (data) {
dialog.close(data);
- };
+ };
- scope.show = function() {
- dialog.element.modal('show');
- };
+ scope.show = function () {
+ dialog.element.modal('show');
+ };
- scope.select = function(item) {
+ scope.select = function (item) {
var i = scope.dialogData.selection.indexOf(item);
- if (i < 0) {
- scope.dialogData.selection.push(item);
- }else{
+ if (i < 0) {
+ scope.dialogData.selection.push(item);
+ } else {
scope.dialogData.selection.splice(i, 1);
- }
- };
+ }
+ };
- scope.dismiss = scope.hide;
+ scope.dismiss = scope.hide;
- // Emit modal events
- angular.forEach(['show', 'shown', 'hide', 'hidden'], function(name) {
- dialog.element.on(name, function(ev) {
- scope.$emit('modal-' + name, ev);
- });
- });
+ // Emit modal events
+ angular.forEach(['show', 'shown', 'hide', 'hidden'], function (name) {
+ dialog.element.on(name, function (ev) {
+ scope.$emit('modal-' + name, ev);
+ });
+ });
- // Support autofocus attribute
- dialog.element.on('shown', function(event) {
- $('input[autofocus]', dialog.element).first().trigger('focus');
- });
+ // Support autofocus attribute
+ dialog.element.on('shown', function (event) {
+ $('input[autofocus]', dialog.element).first().trigger('focus');
+ });
- //Autoshow
- if (dialog.show) {
- dialog.element.modal('show');
- }
+ //Autoshow
+ if (dialog.show) {
+ dialog.element.modal('show');
+ }
- dialog.scope = scope;
- });
-
- //Return the modal object outside of the promise!
- return dialog;
- }
- }
+ dialog.scope = scope;
+ });
- /** Handles the closeDialogs event */
- eventsService.on("app.closeDialogs", function (evt, args) {
- removeAllDialogs(args);
- });
+ //Return the modal object outside of the promise!
+ return dialog;
+ }
+ }
- return {
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#open
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a modal rendering a given template url.
- *
- * @param {Object} options rendering options
- * @param {DomElement} options.container the DOM element to inject the modal into, by default set to body
- * @param {Function} options.callback function called when the modal is submitted
- * @param {String} options.template the url of the template
- * @param {String} options.animation animation csss class, by default set to "fade"
- * @param {String} options.modalClass modal css class, by default "umb-modal"
- * @param {Bool} options.show show the modal instantly
- * @param {Object} options.scope scope to attach the modal to, by default rootScope.new()
- * @param {Bool} options.iframe load template in an iframe, only needed for serverside templates
- * @param {Int} options.width set a width on the modal, only needed for iframes
- * @param {Bool} options.inline strips the modal from any animation and wrappers, used when you want to inject a dialog into an existing container
- * @returns {Object} modal object
- */
- open: function (options) {
- return openDialog(options);
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#close
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Closes a specific dialog
- * @param {Object} dialog the dialog object to close
- * @param {Object} args if specified this object will be sent to any callbacks registered on the dialogs.
- */
- close: function (dialog, args) {
- if(dialog){
- dialog.close(args);
- }
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#closeAll
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Closes all dialogs
- * @param {Object} args if specified this object will be sent to any callbacks registered on the dialogs.
- */
- closeAll: function(args) {
- removeAllDialogs(args);
- },
+ /** Handles the closeDialogs event */
+ eventsService.on("app.closeDialogs", function (evt, args) {
+ removeAllDialogs(args);
+ });
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#mediaPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a media picker in a modal, the callback returns an array of selected media items
- * @param {Object} options mediapicker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {Boolean} options.onlyImages Only display files that have an image file-extension
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- mediaPicker: function (options) {
+ return {
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#open
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a modal rendering a given template url.
+ *
+ * @param {Object} options rendering options
+ * @param {DomElement} options.container the DOM element to inject the modal into, by default set to body
+ * @param {Function} options.callback function called when the modal is submitted
+ * @param {String} options.template the url of the template
+ * @param {String} options.animation animation csss class, by default set to "fade"
+ * @param {String} options.modalClass modal css class, by default "umb-modal"
+ * @param {Bool} options.show show the modal instantly
+ * @param {Object} options.scope scope to attach the modal to, by default rootScope.new()
+ * @param {Bool} options.iframe load template in an iframe, only needed for serverside templates
+ * @param {Int} options.width set a width on the modal, only needed for iframes
+ * @param {Bool} options.inline strips the modal from any animation and wrappers, used when you want to inject a dialog into an existing container
+ * @returns {Object} modal object
+ */
+ open: function (options) {
+ return openDialog(options);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#close
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Closes a specific dialog
+ * @param {Object} dialog the dialog object to close
+ * @param {Object} args if specified this object will be sent to any callbacks registered on the dialogs.
+ */
+ close: function (dialog, args) {
+ if (dialog) {
+ dialog.close(args);
+ }
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#closeAll
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Closes all dialogs
+ * @param {Object} args if specified this object will be sent to any callbacks registered on the dialogs.
+ */
+ closeAll: function (args) {
+ removeAllDialogs(args);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#mediaPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a media picker in a modal, the callback returns an array of selected media items
+ * @param {Object} options mediapicker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {Boolean} options.onlyImages Only display files that have an image file-extension
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ mediaPicker: function (options) {
options.template = 'views/common/dialogs/mediaPicker.html';
options.show = true;
return openDialog(options);
- },
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#contentPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a content picker tree in a modal, the callback returns an array of selected documents
- * @param {Object} options content picker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {$scope} options.multipicker should the picker return one or multiple items
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- contentPicker: function (options) {
- options.template = 'views/common/dialogs/contentPicker.html';
- options.show = true;
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#contentPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a content picker tree in a modal, the callback returns an array of selected documents
+ * @param {Object} options content picker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {$scope} options.multipicker should the picker return one or multiple items
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ contentPicker: function (options) {
+ options.template = 'views/common/dialogs/contentPicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#linkPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a link picker tree in a modal, the callback returns a single link
- * @param {Object} options content picker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- linkPicker: function (options) {
- options.template = 'views/common/dialogs/linkPicker.html';
- options.show = true;
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#linkPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a link picker tree in a modal, the callback returns a single link
+ * @param {Object} options content picker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ linkPicker: function (options) {
+ options.template = 'views/common/dialogs/linkPicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#macroPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a mcaro picker in a modal, the callback returns a object representing the macro and it's parameters
- * @param {Object} options macropicker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- macroPicker: function (options) {
- options.template = 'views/common/dialogs/insertmacro.html';
- options.show = true;
- options.modalClass = "span7 umb-modal";
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#macroPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a mcaro picker in a modal, the callback returns a object representing the macro and it's parameters
+ * @param {Object} options macropicker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ macroPicker: function (options) {
+ options.template = 'views/common/dialogs/insertmacro.html';
+ options.show = true;
+ options.modalClass = "span7 umb-modal";
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#memberPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a member picker in a modal, the callback returns a object representing the selected member
- * @param {Object} options member picker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {$scope} options.multiPicker should the tree pick one or multiple members before returning
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- memberPicker: function (options) {
- options.template = 'views/common/dialogs/memberPicker.html';
- options.show = true;
- return openDialog(options);
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#memberGroupPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a member group picker in a modal, the callback returns a object representing the selected member
- * @param {Object} options member group picker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {$scope} options.multiPicker should the tree pick one or multiple members before returning
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- memberGroupPicker: function (options) {
- options.template = 'views/common/dialogs/memberGroupPicker.html';
- options.show = true;
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#memberPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a member picker in a modal, the callback returns a object representing the selected member
+ * @param {Object} options member picker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {$scope} options.multiPicker should the tree pick one or multiple members before returning
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ memberPicker: function (options) {
+ options.template = 'views/common/dialogs/memberPicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#iconPicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a icon picker in a modal, the callback returns a object representing the selected icon
- * @param {Object} options iconpicker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- iconPicker: function (options) {
- options.template = 'views/common/dialogs/iconPicker.html';
- options.show = true;
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#memberGroupPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a member group picker in a modal, the callback returns a object representing the selected member
+ * @param {Object} options member group picker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {$scope} options.multiPicker should the tree pick one or multiple members before returning
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ memberGroupPicker: function (options) {
+ options.template = 'views/common/dialogs/memberGroupPicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#treePicker
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a tree picker in a modal, the callback returns a object representing the selected tree item
- * @param {Object} options iconpicker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {$scope} options.section tree section to display
- * @param {$scope} options.treeAlias specific tree to display
- * @param {$scope} options.multiPicker should the tree pick one or multiple items before returning
- * @param {Function} options.callback callback function
- * @returns {Object} modal object
- */
- treePicker: function (options) {
- options.template = 'views/common/dialogs/treePicker.html';
- options.show = true;
- return openDialog(options);
- },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#iconPicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a icon picker in a modal, the callback returns a object representing the selected icon
+ * @param {Object} options iconpicker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ iconPicker: function (options) {
+ options.template = 'views/common/dialogs/iconPicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#propertyDialog
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a dialog with a chosen property editor in, a value can be passed to the modal, and this value is returned in the callback
- * @param {Object} options mediapicker dialog options object
- * @param {$scope} options.scope dialog scope
- * @param {Function} options.callback callback function
- * @param {String} editor editor to use to edit a given value and return on callback
- * @param {Object} value value sent to the property editor
- * @returns {Object} modal object
- */
- propertyDialog: function (options) {
- options.template = 'views/common/dialogs/property.html';
- options.show = true;
- return openDialog(options);
- },
-
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#ysodDialog
- * @methodOf umbraco.services.dialogService
- * @description
- * Opens a dialog to an embed dialog
- */
- embedDialog: function (options) {
- options.template = 'views/common/dialogs/rteembed.html';
- options.show = true;
- return openDialog(options);
- },
- /**
- * @ngdoc method
- * @name umbraco.services.dialogService#ysodDialog
- * @methodOf umbraco.services.dialogService
- *
- * @description
- * Opens a dialog to show a custom YSOD
- */
- ysodDialog: function (ysodError) {
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#treePicker
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a tree picker in a modal, the callback returns a object representing the selected tree item
+ * @param {Object} options iconpicker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {$scope} options.section tree section to display
+ * @param {$scope} options.treeAlias specific tree to display
+ * @param {$scope} options.multiPicker should the tree pick one or multiple items before returning
+ * @param {Function} options.callback callback function
+ * @returns {Object} modal object
+ */
+ treePicker: function (options) {
+ options.template = 'views/common/dialogs/treePicker.html';
+ options.show = true;
+ return openDialog(options);
+ },
- var newScope = $rootScope.$new();
- newScope.error = ysodError;
- return openDialog({
- modalClass: "umb-modal wide",
- scope: newScope,
- //callback: options.callback,
- template: 'views/common/dialogs/ysod.html',
- show: true
- });
- }
- };
- });
\ No newline at end of file
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#propertyDialog
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a dialog with a chosen property editor in, a value can be passed to the modal, and this value is returned in the callback
+ * @param {Object} options mediapicker dialog options object
+ * @param {$scope} options.scope dialog scope
+ * @param {Function} options.callback callback function
+ * @param {String} editor editor to use to edit a given value and return on callback
+ * @param {Object} value value sent to the property editor
+ * @returns {Object} modal object
+ */
+ propertyDialog: function (options) {
+ options.template = 'views/common/dialogs/property.html';
+ options.show = true;
+ return openDialog(options);
+ },
+
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#ysodDialog
+ * @methodOf umbraco.services.dialogService
+ * @description
+ * Opens a dialog to an embed dialog
+ */
+ embedDialog: function (options) {
+ options.template = 'views/common/dialogs/rteembed.html';
+ options.show = true;
+ return openDialog(options);
+ },
+ /**
+ * @ngdoc method
+ * @name umbraco.services.dialogService#ysodDialog
+ * @methodOf umbraco.services.dialogService
+ *
+ * @description
+ * Opens a dialog to show a custom YSOD
+ */
+ ysodDialog: function (ysodError) {
+
+ var newScope = $rootScope.$new();
+ newScope.error = ysodError;
+ return openDialog({
+ modalClass: "umb-modal wide",
+ scope: newScope,
+ //callback: options.callback,
+ template: 'views/common/dialogs/ysod.html',
+ show: true
+ });
+ }
+ };
+});
\ No newline at end of file