Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- More fixes for .NET 4 support.

  • Loading branch information...
commit 800cedacc9f6e89f5c61d7e8c88d4ced4c2aeb18 1 parent 0196c97
@Encosia authored
View
3  PostBackRitalin.js
@@ -179,7 +179,7 @@ PostBackRitalin.prototype = {
var sendingPanel = this._findContainingPanel(element);
// Check to make sure the item hasn't been removed during the postback.
- if (element !== null && this._isMonitoredRequest(sendingPanel)) {
+ if (element !== null && element !== undefined && this._isMonitoredRequest(sendingPanel)) {
element.disabled = false;
// Handles regular submit buttons.
@@ -192,6 +192,7 @@ PostBackRitalin.prototype = {
element.src = this._oldImage;
this._oldImage = null;
}
+ // Handles anchor elements.
else if (element.tagName == 'A') {
element.href = this._oldHref;
this._oldHref = null;
View
2  PostBackRitalin.min.js
@@ -14,7 +14,7 @@ return null;},_disableAllElements:function(panelID){var panel=$get(panelID);if(p
var anchors=panel.getElementsByTagName('a');for(var i=0;i<anchors.length;i++){if(anchors[i].href.match('javascript:__doPostBack')!==null){anchors[i].href='#';if(this._waitClass!==null){Sys.UI.DomElement.addCssClass(anchors[i],this._waitClass);}}}}},_beginRequest:function(sender,args){var element=args.get_postBackElement();var sendingPanel=this._findContainingPanel(element);if(element!==null&&this._isMonitoredRequest(sendingPanel)){if(element.type=='submit'||element.type=='button'){element.disabled=true;element.blur();this._oldText=element.value;var waitText=this.get_waitText(sendingPanel);if(waitText!==null){element.value=waitText;}}
else if(element.type=='image'){element.disabled=true;element.blur();this._oldImage=element.src;var waitImage=this.get_waitImage(sendingPanel);if(waitImage!==null){element.src=waitImage;}}
else if(element.tagName=='A'){this._oldHref=element.href;element.href='#';element.blur();if(this._waitClass!==null){Sys.UI.DomElement.addCssClass(element,this._waitClass);}}
-if(this._isDisableAllElementsPanel(sendingPanel)){this._disableAllElements(sendingPanel);}}},_endRequest:function(sender,args){var element=sender._postBackSettings.sourceElement;var sendingPanel=this._findContainingPanel(element);if(element!==null&&this._isMonitoredRequest(sendingPanel)){element.disabled=false;if(element.type=='submit'||element.type=='button'){element.value=this._oldText;this._oldText=null;}
+if(this._isDisableAllElementsPanel(sendingPanel)){this._disableAllElements(sendingPanel);}}},_endRequest:function(sender,args){var element=sender._postBackSettings.sourceElement;var sendingPanel=this._findContainingPanel(element);if(element!==null&&element!==undefined&&this._isMonitoredRequest(sendingPanel)){element.disabled=false;if(element.type=='submit'||element.type=='button'){element.value=this._oldText;this._oldText=null;}
else if(element.type=='image'){element.src=this._oldImage;this._oldImage=null;}
else if(element.tagName=='A'){element.href=this._oldHref;this._oldHref=null;if(this._waitClass!==null){Sys.UI.DomElement.removeCssClass(element,this._waitClass);}}}},_initialize:function(){this._pageRequestManager=Sys.WebForms.PageRequestManager.getInstance();this._beginRequestHandler=Function.createDelegate(this,this._beginRequest);this._pageRequestManager.add_beginRequest(this._beginRequestHandler);this._endRequestHandler=Function.createDelegate(this,this._endRequest);this._pageRequestManager.add_endRequest(this._endRequestHandler);if(this._preload){var image=new Image();if(this._waitImage!==null){image.src=this._waitImage;}
if(this._monitoredUpdatePanels!==null){for(var i=0;i<this._monitoredUpdatePanels.length;i++){if(this._monitoredUpdatePanels[i].WaitImage!==null){image.src=this._monitoredUpdatePanels[i].WaitImage;}}}}}};
View
2  PostBackRitalin.sln
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostBackRitalin", "PostBack
EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "PostBackRitalinTest", "..\..\Visual Studio Websites\PostBackRitalinTest\", "{A5B95E5E-E0F8-41D4-900C-25A6EF3F258E}"
ProjectSection(WebsiteProperties) = preProject
- TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5"
+ TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
ProjectReferences = "{C92CD4C3-7271-4AE6-8654-7734725F247F}|PostBackRitalin.dll;"
Debug.AspNetCompiler.VirtualPath = "/PostBackRitalinTest"
Debug.AspNetCompiler.PhysicalPath = "..\..\Visual Studio Websites\PostBackRitalinTest\"
View
4 Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("1.12.0")]
+[assembly: AssemblyFileVersion("1.12.0")]
[assembly: WebResource("PostBackRitalin.PostBackRitalin.js", "application/x-javascript")]
[assembly: WebResource("PostBackRitalin.PostBackRitalin.min.js", "application/x-javascript")]
Please sign in to comment.
Something went wrong with that request. Please try again.