From 5bcdd6727cc73da7eca98b5997a52fc6fc6f6e92 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 26 May 2014 09:37:46 +0200 Subject: Fixed regression in previous commit TCallback exposes no real object in the page DOM, so the new method to find the form introduced with the previous commit needs to have a proper fallback to the old method. --- framework/Web/Javascripts/source/prado/activecontrols/ajax3.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js index f0be5cb4..c42597f1 100644 --- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js +++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js @@ -156,7 +156,7 @@ Prado.CallbackRequest = jQuery.klass(Prado.PostBack, getForm: function() { - return jQuery('#'+this.options.ID).parents('form:first').get(0); + return jQuery('#'+this.options.ID).parents('form:first').get(0) || jQuery('#PRADO_PAGESTATE').get(0).form; }, /** @@ -165,7 +165,7 @@ Prado.CallbackRequest = jQuery.klass(Prado.PostBack, */ getCallbackUrl : function() { - return jQuery('#'+this.options.ID).parents('form:first').get(0).action; + return this.getForm().action; }, /** @@ -1120,8 +1120,8 @@ Prado.StyleSheetManagerClass = jQuery.klass(Prado.AssetManagerClass, { createStyleSheetCode: function(code) { var asset = document.createElement('style'); asset.setAttribute('type', 'text/css'); - - if(asset.styleSheet) + + if(asset.styleSheet) asset.styleSheet.cssText = code; // IE7+IE8 else { var cssCodeNode = document.createTextNode(code); -- cgit v1.2.3