From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 21 Mar 2005 16:16:39 +0000 (+0000)
Subject: added support for extra attrs
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dae347ce4d7032a250d3734a29c4bb388986a913;p=sope

added support for extra attrs
added type binding
do not generate language attribute


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@684 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 86240c9a..14384e2b 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-21  Helge Hess  <helge.hess@skyrix.com>
+
+	* DynamicElements/WOJavaScript.m: added support for extra attributes,
+	  generate script 'type' field as 'text/javascript' instead of
+	  'language', as suggested by Mont (v4.5.140)
+
 2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
 
 	* v4.5.139
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
index 16fa7982..e70fa0de 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
@@ -30,6 +30,8 @@
   WOAssociation *scriptString;
   WOAssociation *scriptSource;
   WOAssociation *hideInComment;
+  
+  WOAssociation *type;
 }
 
 @end /* WOJavaScript */
@@ -50,11 +52,13 @@
     self->scriptString  = OWGetProperty(_config, @"scriptString");
     self->scriptSource  = OWGetProperty(_config, @"scriptSource");
     self->hideInComment = OWGetProperty(_config, @"hideInComment");
+    self->type          = OWGetProperty(_config, @"type");
   }
   return self;
 }
 
 - (void)dealloc {
+  [self->type          release];
   [self->scriptFile    release];
   [self->scriptString  release];
   [self->scriptSource  release];
@@ -113,6 +117,7 @@
 
 - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
   WOComponent *sComponent;
+  NSString *st;
   BOOL hide;
   
   if ([[_ctx request] isFromClientComponent])
@@ -121,17 +126,27 @@
   sComponent = [_ctx component];
   hide = [self->hideInComment boolValueInComponent:sComponent];
   
-  WOResponse_AddCString(_response, "<script language=\"JavaScript\" ");
-
+  WOResponse_AddCString(_response, "<script");
+  
+  if ((st = [self->type stringValueInComponent:sComponent]) != nil) {
+    WOResponse_AddCString(_response, " type=\"");
+    [_response appendContentHTMLAttributeValue:st];
+    WOResponse_AddCString(_response, "\"");
+  }
+  else {
+    WOResponse_AddCString(_response, " type=\"text/javascript\"");
+  }
+  
   /* add URL to script */
   if (self->scriptSource) {
+    st = [self->scriptSource stringValueInComponent:sComponent];
     WOResponse_AddCString(_response, " src=\"");
-    [_response appendContentHTMLAttributeValue:
-                 [self->scriptSource stringValueInComponent:sComponent]];
+    [_response appendContentHTMLAttributeValue:st];
     WOResponse_AddCString(_response, "\"");
   }
-    
-  if (self->otherTagString) {
+  
+  [self appendExtraAttributesToResponse:_response inContext:_ctx];
+  if (self->otherTagString != nil) {
     WOResponse_AddChar(_response, ' ');
     WOResponse_AddString(_response,
                          [self->otherTagString stringValueInComponent:
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 39200753..83b1bd76 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=139
+SUBMINOR_VERSION:=140
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134