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

better handling of closing dialogs

Browse Source
This commit is contained in:
perploug
2013-09-11 14:03:59 +02:00
parent c3e67a2144
commit 377d72b5da
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,13 +101,15 @@ angular.module('umbraco.services')
};
scope.close = function(data) {
if (dialog.closeCallback) {
if (dialog.closeCallback) {
dialog.closeCallback(data);
}
}
dialog.element.modal('hide');
dialog.element.remove();
$("#" + dialog.element.attr("id")).remove();
if(dialog.element){
dialog.element.modal('hide');
dialog.element.remove();
$("#" + dialog.element.attr("id")).remove();
}
};
//if iframe is enabled, inject that instead of a template
@@ -260,8 +262,10 @@ angular.module('umbraco.services')
* @param {Object} args if specified this object will be sent to any callbacks registered on the dialogs.
*/
close: function (dialog, args) {
dialog.scope.close();
if(dialog && dialog.scope){
dialog.scope.close();
}
//removeDialog(dialog, args);
},