On Fri, Oct 12, 2012 at 02:45:25PM -0400, Matt Wagner wrote: > On Fri, Oct 12, 2012 at 10:27:22AM -0400, Brian McLaughlin wrote: > > --- > > src/app/views/layouts/application.html.haml | 2 +- > > src/app/views/user_sessions/new.html.haml | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/app/views/layouts/application.html.haml > > b/src/app/views/layouts/application.html.haml > > index 26ad06f..1a00936 100644 > > --- a/src/app/views/layouts/application.html.haml > > +++ b/src/app/views/layouts/application.html.haml > > @@ -6,7 +6,7 @@ > > = stylesheet_link_tag '/stylesheets/compiled/layout.css' > > = stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css' > > /[if lt IE 9] > > - = javascript_include_tag > > 'http://html5shiv.googlecode.com/svn/trunk/html5.js' > > + = javascript_include_tag > > 'https://html5shiv.googlecode.com/svn/trunk/html5.js' > > We actually did one better and put this into converge-ui: > https://github.com/Katello/converge-ui/blob/master/javascripts/vendor/html5shiv.js > > It's pulled in from the MIT-licensed Google repo, and allows us to > function without requiring external Internet access for this. But > serving it ourselves would fix this issue too. > > This hasn't been pulled into Conductor yet, but it's in the version of > converge-ui we use. I'll send a quick patch adding this instead, if you > don't object.
Oh, drat. That won't work on 1.1, which is using an older converge-ui. I'm going to go ahead and ACK your patch. It works a heck of a lot better on 1.1. O:-) In theory we can tackle this differently upstream, but let's not worry about that now. I'll push this momentarily. -- Matt
