yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normaliize dialogservice method signature

Browse Source
This commit is contained in:
perploug
2013-09-05 11:14:24 +02:00
parent d2df96e2e0
commit b30bcec390
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js
View File

@@ -48,10 +48,12 @@ angular.module('umbraco.services')
//if there's arguments passed in then check if there's a callback registered in the current modal then call it.
//this occurs when the "closeDialogs" event is triggered with arguments.
/* PP: I've commented this out again, because I dont believe a modal should
submit data on exit, only on submit
if (args && dialog.data("modalCb") != null && angular.isFunction(dialog.data("modalCb"))) {
var cb = dialog.data("modalCb");
cb.apply(dialog, [args]);
}
}*/
dialog.modal("hide");
@@ -290,14 +292,12 @@ angular.module('umbraco.services')
* @returns {Object} modal object
*/
mediaPicker: function (options) {
return openDialog({
scope: options.scope,
callback: options.callback,
template: 'views/common/dialogs/mediaPicker.html',
show: true
});
options.template = 'views/common/dialogs/mediaPicker.html';
options.show = true;
return openDialog(options);
},
/**
* @ngdoc method
* @name umbraco.services.dialogService#contentPicker
@@ -312,13 +312,9 @@ angular.module('umbraco.services')
* @returns {Object} modal object
*/
contentPicker: function (options) {
return openDialog({
scope: options.scope,
callback: options.callback,
multipicker: options.multipicker,
template: 'views/common/dialogs/contentPicker.html',
show: true
});
options.template = 'views/common/dialogs/contentPicker.html';
options.show = true;
return openDialog(options);
},
/**
@@ -334,12 +330,9 @@ angular.module('umbraco.services')
* @returns {Object} modal object
*/
macroPicker: function (options) {
return openDialog({
scope: options.scope,
callback: options.callback,
template: 'views/common/dialogs/macroPicker.html',
show: true
});
options.template = 'views/common/dialogs/macroPicker.html';
options.show = true;
return openDialog(options);
},
/**
@@ -356,14 +349,11 @@ angular.module('umbraco.services')
* @param {Object} value value sent to the property editor
* @returns {Object} modal object
*/
propertyDialog: function (options) {
return openDialog({
scope: options.scope,
callback: options.callback,
template: 'views/common/dialogs/property.html',
show: true
});
},
propertyDialog: function (options) {
options.template = 'views/common/dialogs/property.html';
options.show = true;
return openDialog(options);
},
/**
* @ngdoc method