Repository: cloudstack Updated Branches: refs/heads/ui-template-uploader ed903e358 -> 2188e19ed
Fix callback handling Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2188e19e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2188e19e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2188e19e Branch: refs/heads/ui-template-uploader Commit: 2188e19ed6b9364148e2135062c5b54324c7dda4 Parents: ed903e3 Author: Brian Federle <[email protected]> Authored: Tue Jan 6 15:22:12 2015 -0800 Committer: Brian Federle <[email protected]> Committed: Tue Jan 6 15:22:12 2015 -0800 ---------------------------------------------------------------------- ui/scripts/templates.js | 2 +- ui/scripts/ui/dialog.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2188e19e/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 297eb61..51008cb 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -127,7 +127,7 @@ contentType: false, // jQuery will tell the server this is a query string request success: function(uploadData, textStatus, jqXHR) { // Files uploaded successfully; proceed to handle rest of action - args.response.succes({ data: uploadData }); + args.response.success({ data: uploadData }); }, error: function(error) { args.response.error('Error uploading files'); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2188e19e/ui/scripts/ui/dialog.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 98a9dfa..77bc3ff 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -689,9 +689,9 @@ $.each($form.data('files'), function(key, value) { formData.append(key, value); }); - args.form.fileUpload({ + args.form.fileUpload.action({ context: args.context, - uploadData: formData, + fileData: formData, response: { success: function(successArgs) { $form.find('.loading-overlay').remove();
