Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allows https or http version of jquery to load preventing it from being blocked on https admin pages #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -373,7 +373,7 @@ JQUERY_URL

MarkItUp! requires the jQuery Javascript library. By default, django-markitup
links to jQuery 2.0.3 at ajax.googleapis.com (via the URL
``http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js``). If you
``//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js``). If you
wish to use a different version of jQuery, or host it yourself, set the
JQUERY_URL setting. For example::

Expand Down
2 changes: 1 addition & 1 deletion markitup/settings.py
Expand Up @@ -9,4 +9,4 @@
MARKITUP_SKIN = getattr(settings, 'MARKITUP_SKIN', 'markitup/skins/simple')
JQUERY_URL = getattr(
settings, 'JQUERY_URL',
'http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js')
'//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js')
2 changes: 1 addition & 1 deletion tests/tests.py
Expand Up @@ -311,7 +311,7 @@ def _get_js(self):
def _get_expected_media(self):
out = """<link href="%(prefix)s/markitup/skins/simple/style.css" type="text/css" media="screen" rel="stylesheet" />
<link href="%(prefix)s/markitup/sets/default/style.css" type="text/css" media="screen" rel="stylesheet" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script type="text/javascript" src="%(prefix)s/markitup/ajax_csrf.js"></script>
<script type="text/javascript" src="%(prefix)s/markitup/jquery.markitup.js"></script>
<script type="text/javascript" src="%(prefix)s/markitup/sets/default/set.js"></script>""" % {'prefix': self.prefix}
Expand Down