fixed stylesheet helper not to enforce a media attribute

mojolicious · Sep 14, 2013 · 48aca03 · 48aca03
1 parent ea6fe49
commit 48aca03
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,7 +1,8 @@
 
-4.38  2013-09-14
+4.38  2013-09-15
   - Added is_binary method to Mojo::Loader.
   - Fixed support for binary files in inflate command.
+  - Fixed stylesheet helper not to enforce a media attribute.
 
 4.37  2013-09-13
   - Improved design of built-in templates.

diff --git a/lib/Mojolicious/Plugin/TagHelpers.pm b/lib/Mojolicious/Plugin/TagHelpers.pm
@@ -178,7 +178,7 @@ sub _stylesheet {
   # "link" or "style" tag
   my $href = @_ % 2 ? $self->url_for(shift) : undef;
   return $href
-    ? _tag('link', rel => 'stylesheet', href => $href, media => 'screen', @_)
+    ? _tag('link', rel => 'stylesheet', href => $href, @_)
     : _tag('style', @_, $cb);
 }
 
@@ -570,7 +570,7 @@ automatically get picked up and shown as default.
 
 Generate portable style or link tag for C<CSS> asset.
 
-  <link href="/path/to/foo.css" media="screen" rel="stylesheet" />
+  <link href="/path/to/foo.css" rel="stylesheet" />
   <style><![CDATA[
     body {color: #000}
   ]]></style>

diff --git a/t/mojolicious/rebased_lite_app.t b/t/mojolicious/rebased_lite_app.t
@@ -47,7 +47,7 @@ $t->get_ok('/')->status_is(200)->header_is('X-Route' => 'root')
 http://example.com/rebased/
 <script src="/rebased/mojo/jquery/jquery.js"></script>
 <img src="/rebased/images/test.png" />
-<link href="//example.com/base.css" media="screen" rel="stylesheet" />
+<link href="//example.com/base.css" rel="stylesheet" />
 <a href="mailto:sri@example.com">Contact</a>
 http://example.com/rebased
 http://example.com/rebased/foo
@@ -95,7 +95,7 @@ $t->get_ok('/baz')->status_is(200)->header_is('X-Route' => 'baz')
 http://example.com/rebased/
 <script src="/rebased/mojo/jquery/jquery.js"></script>
 <img src="/rebased/images/test.png" />
-<link href="//example.com/base.css" media="screen" rel="stylesheet" />
+<link href="//example.com/base.css" rel="stylesheet" />
 <a href="mailto:sri@example.com">Contact</a>
 http://example.com/rebased/baz
 http://example.com/rebased/foo

diff --git a/t/mojolicious/tag_helper_lite_app.t b/t/mojolicious/tag_helper_lite_app.t
@@ -99,7 +99,7 @@ EOF
 
 # Stylesheets
 $t->get_ok('/style')->status_is(200)->content_is(<<EOF);
-<link href="/foo.css" media="screen" rel="stylesheet" />
+<link href="/foo.css" rel="stylesheet" />
 <style>/*<![CDATA[*/
 
   body {color: #000}