From de35a3e341dfe440febaf3cad80f8dde0a6da3a6 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 6 Oct 2010 15:09:14 -0500 Subject: Displaying AJAX URL in error message. The ipa_error_handler() has been modified to display the AJAX URL that is having a problem. The ipa_cmd() error handler is now invoked using call() to pass 'this' object which contains the URL. --- install/static/ipa.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'install/static/ipa.js') diff --git a/install/static/ipa.js b/install/static/ipa.js index 31c91204..74fde929 100644 --- a/install/static/ipa.js +++ b/install/static/ipa.js @@ -80,18 +80,18 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname) var error_thrown = { name: 'HTTP Error '+xhr.status, message: data ? xhr.statusText : "No response" - } - ipa_error_handler(xhr, text_status, error_thrown); + }; + ipa_error_handler.call(this, xhr, text_status, error_thrown); } else if (data.error) { var error_thrown = { name: 'IPA Error '+data.error.code, message: data.error.message - } - ipa_error_handler(xhr, text_status, error_thrown); + }; + ipa_error_handler.call(this, xhr, text_status, error_thrown); } else if (win_callback) { - win_callback(data, text_status, xhr); + win_callback.call(this, data, text_status, xhr); } } @@ -99,10 +99,13 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname) ipa_dialog.empty(); ipa_dialog.attr('title', 'Error: '+error_thrown.name); + ipa_dialog.append('

URL: '+this.url+'

'); if (error_thrown.message) { ipa_dialog.append('

'+error_thrown.message+'

'); } + var that = this; + ipa_dialog.dialog({ modal: true, width: 400, @@ -113,13 +116,13 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname) }, 'Cancel': function() { ipa_dialog.dialog('close'); - fail_callback(xhr, text_status, error_thrown); + fail_callback.call(that, xhr, text_status, error_thrown); } } }); - }; + } - id = ipa_jsonrpc_id++; + var id = ipa_jsonrpc_id++; var method_name = name; -- cgit