JavaScript Helper Creates Invalid JavaScript Tag

[sshaw]

The JS element cannot be empty:

%= javascript 'script.js' 

generates:

<script src="script.js" type="text/javascript" />

For JS blocks the CDATA tags needs to be commented out:

%=javascript begin
    alert('Wont see this'); 
%end

generates:

<script type="text/javascript"><![CDATA[
    alert('Wont see this'); 
]]></script>

The same problem arises with the stylesheet tag.

I fixed both, but I'm somewhat confused about the logic dealing with CODE ref arguments. This seems unnecessary:

  if (@_ % 2 ? ref $_[-1] ne 'CODE' : ref $_[-1] eq 'CODE') {

What's the point of the false branch? It would handle odd cases like:

%=javascript 'xxx', sub { "var y = 123" }, begin
    var x = 456;
%end

Generating:

<script src="xxx" type="text/javascript">var y = 123</script>

Which ignores the earlier attempt to wrap the code in CDATA. The same logic is used for the stylesheet helper.

Maybe I'm missing something because I haven't looked at the template parsing code?

I removed this logic from my JS fix but not in the stylesheet fix.

[sshaw]

Forgot to add newlines for inline blocks, see this commit: https://github.com/sshaw/mojo/commit/6a7fa10ccf1cee31a26822a4d7c8c5c4b01d242d

[kraih]

Thanks, applied.