Author: michiel
Date: 2009-10-20 10:30:16 +0200 (Tue, 20 Oct 2009)
New Revision: 39234
Modified:
mmbase/trunk/base-webapp/src/main/webapp/mmbase/jquery/jquery.jspx
mmbase/trunk/base-webapp/src/main/webapp/mmbase/validation/javascript.jspxf
Log:
relaxed checks a bit
Modified: mmbase/trunk/base-webapp/src/main/webapp/mmbase/jquery/jquery.jspx
===================================================================
--- mmbase/trunk/base-webapp/src/main/webapp/mmbase/jquery/jquery.jspx
2009-10-20 08:19:29 UTC (rev 39233)
+++ mmbase/trunk/base-webapp/src/main/webapp/mmbase/jquery/jquery.jspx
2009-10-20 08:30:16 UTC (rev 39234)
@@ -5,11 +5,11 @@
<jsp:output omit-xml-declaration="true" />
<mm:context>
<mm:import id="__javascript" from="request" externid="org.mmbase.jquery" />
- <mm:notpresent referid="__javascript">
+ <mm:isempty referid="__javascript">
<mm:link page="/mmbase/jquery/jquery-1.3.2.min.js">
<script src="${_}" type="text/javascript"><!-- help msie --></script>
</mm:link>
<mm:write request="org.mmbase.jquery" value="yes" />
- </mm:notpresent>
+ </mm:isempty>
</mm:context>
</jsp:root>
Modified:
mmbase/trunk/base-webapp/src/main/webapp/mmbase/validation/javascript.jspxf
===================================================================
--- mmbase/trunk/base-webapp/src/main/webapp/mmbase/validation/javascript.jspxf
2009-10-20 08:19:29 UTC (rev 39233)
+++ mmbase/trunk/base-webapp/src/main/webapp/mmbase/validation/javascript.jspxf
2009-10-20 08:30:16 UTC (rev 39234)
@@ -5,11 +5,13 @@
<jsp:directive.include file="/mmbase/jquery/jquery.jspx" />
<mm:context>
<mm:import id="__javascript" from="request"
externid="org.mmbase.validation" />
- <mm:notpresent referid="__javascript">
+ <mm:log> JS ${__javascript}</mm:log>
+ <mm:isempty referid="__javascript">
+ <mm:log>SCHIJT</mm:log>
<mm:link page="/mmbase/validation/validation.js.jsp">
<script src="${_}" type="text/javascript"><!-- help IE --></script>
</mm:link>
<mm:write request="org.mmbase.validation" value="yes" />
- </mm:notpresent>
+ </mm:isempty>
</mm:context>
</jsp:root>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
