Merge pull request #561 from iquiw/master

Use protocol relative URLs for Google hosted libraries
This commit is contained in:
Michael Snoyman 2013-06-08 23:52:44 -07:00
commit d377b48510

View File

@ -24,7 +24,7 @@ import Data.Monoid (mconcat)
-- | Gets the Google hosted jQuery UI 1.8 CSS file with the given theme. -- | Gets the Google hosted jQuery UI 1.8 CSS file with the given theme.
googleHostedJqueryUiCss :: Text -> Text googleHostedJqueryUiCss :: Text -> Text
googleHostedJqueryUiCss theme = mconcat googleHostedJqueryUiCss theme = mconcat
[ "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/" [ "//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/"
, theme , theme
, "/jquery-ui.css" , "/jquery-ui.css"
] ]
@ -38,11 +38,11 @@ class YesodJquery a where
-- --
-- Currently, the default value is jQuery 1.7 from Google\'s CDN. -- Currently, the default value is jQuery 1.7 from Google\'s CDN.
urlJqueryJs :: a -> Either (Route a) Text urlJqueryJs :: a -> Either (Route a) Text
urlJqueryJs _ = Right "http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js" urlJqueryJs _ = Right "//ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"
-- | The jQuery UI 1.8 Javascript file. -- | The jQuery UI 1.8 Javascript file.
urlJqueryUiJs :: a -> Either (Route a) Text urlJqueryUiJs :: a -> Either (Route a) Text
urlJqueryUiJs _ = Right "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js" urlJqueryUiJs _ = Right "//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"
-- | The jQuery UI 1.8 CSS file; defaults to cupertino theme. -- | The jQuery UI 1.8 CSS file; defaults to cupertino theme.
urlJqueryUiCss :: a -> Either (Route a) Text urlJqueryUiCss :: a -> Either (Route a) Text