[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/UI Page.cs, 1.84, 1.85

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28737/UI

Modified Files:
	Page.cs 
Log Message:
fixed SPRNET-723 (made Head control adhere to standards)

Index: Page.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/UI/Page.cs,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** Page.cs	25 Aug 2007 14:26:35 -0000	1.84
--- Page.cs	28 Nov 2007 23:26:10 -0000	1.85
***************
*** 893,897 ****
          public void RegisterHeadScriptBlock(string key, string script)
          {
!             RegisterHeadScriptBlock(key, Script.DefaultLanguage, script);
          }
  
--- 893,897 ----
          public void RegisterHeadScriptBlock(string key, string script)
          {
!             RegisterHeadScriptBlock(key, Script.DefaultType, script);
          }
  
***************
*** 902,905 ****
--- 902,906 ----
          /// <param name="language">Script language.</param>
          /// <param name="script">Script text.</param>
+         [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptBlock(string key, MimeMediaType type, string script) instead", false)]
          public void RegisterHeadScriptBlock(string key, string language, string script)
          {
***************
*** 908,911 ****
--- 909,923 ----
  
          /// <summary>
+         /// Registers script block that should be rendered within the <c>head</c> HTML element.
+         /// </summary>
+         /// <param name="key">Script key.</param>
+         /// <param name="type">Script language MIME type.</param>
+         /// <param name="script">Script text.</param>
+         public void RegisterHeadScriptBlock(string key, MimeMediaType type, string script)
+         {
+             headScripts[key] = new ScriptBlock(type, script);
+         }
+ 
+         /// <summary>
          /// Registers script file that should be referenced within the <c>head</c> HTML element.
          /// </summary>
***************
*** 914,918 ****
          public void RegisterHeadScriptFile(string key, string fileName)
          {
!             RegisterHeadScriptFile(key, Script.DefaultLanguage, fileName);
          }
  
--- 926,930 ----
          public void RegisterHeadScriptFile(string key, string fileName)
          {
!             RegisterHeadScriptFile(key, Script.DefaultType, fileName);
          }
  
***************
*** 923,926 ****
--- 935,939 ----
          /// <param name="language">Script language.</param>
          /// <param name="fileName">Script file name.</param>
+         [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptFile(string key, MimeMediaType type, string filename) instead", false)]
          public void RegisterHeadScriptFile(string key, string language, string fileName)
          {
***************
*** 929,932 ****
--- 942,956 ----
  
          /// <summary>
+         /// Registers script file that should be referenced within the <c>head</c> HTML element.
+         /// </summary>
+         /// <param name="key">Script key.</param>
+         /// <param name="type">Script language MIME type.</param>
+         /// <param name="fileName">Script file name.</param>
+         public void RegisterHeadScriptFile(string key, MimeMediaType type, string fileName)
+         {
+             headScripts[key] = new ScriptFile(type, fileName);
+         }
+ 
+         /// <summary>
          /// Registers script block that should be rendered within the <c>head</c> HTML element.
          /// </summary>
***************
*** 937,941 ****
          public void RegisterHeadScriptEvent(string key, string element, string eventName, string script)
          {
!             RegisterHeadScriptEvent(key, Script.DefaultLanguage, element, eventName, script);
          }
  
--- 961,965 ----
          public void RegisterHeadScriptEvent(string key, string element, string eventName, string script)
          {
!             RegisterHeadScriptEvent(key, Script.DefaultType, element, eventName, script);
          }
  
***************
*** 948,951 ****
--- 972,976 ----
          /// <param name="eventName">Name of the event to handle.</param>
          /// <param name="script">Script text.</param>
+         [Obsolete("The 'language' attribute is deprecated. Please use RegisterHeadScriptEvent(string key, MimeMediaType mimeType, string element, string eventName, string script) instead")]
          public void RegisterHeadScriptEvent(string key, string language, string element, string eventName, string script)
          {
***************
*** 954,957 ****
--- 979,995 ----
  
          /// <summary>
+         /// Registers script block that should be rendered within the <c>head</c> HTML element.
+         /// </summary>
+         /// <param name="key">Script key.</param>
+         /// <param name="mimeType">The scripting language's MIME type.</param>
+         /// <param name="element">Element ID of the event source.</param>
+         /// <param name="eventName">Name of the event to handle.</param>
+         /// <param name="script">Script text.</param>
+         public void RegisterHeadScriptEvent(string key, MimeMediaType mimeType, string element, string eventName, string script)
+         {
+             headScripts[key] = new ScriptEvent(mimeType, element, eventName, script);
+         }
+ 
+         /// <summary>
          /// Returns <c>True</c> if specified head script is registered, <c>False</c> otherwise.
          /// </summary>