fixed #2 use of secure URLs when request is secure

miguelgrinberg · Feb 13, 2014 · 0ee69da · 0ee69da
1 parent 71ae78f
commit 0ee69da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Step 2: In your `<head>` section of your base template add the following code:
         {{ moment.include_moment() }}
     </head>
 
-Note that jQuery is required. If you are already including it on your own then you can remove the `include_jquery()` line.
+Note that jQuery is required. If you are already including it on your own then you can remove the `include_jquery()` line. These inclusions are done of secure HTTP if the request under which they are executed is secure.
 
 Step 3: Render timestamps in your template. For example:
 

diff --git a/flask_moment.py b/flask_moment.py
@@ -1,13 +1,17 @@
 from datetime import datetime
 import json
 from jinja2 import Markup
-from flask import current_app
+from flask import current_app, request
 
 class _moment(object):
     @staticmethod
     def include_moment(version = '2.3.1'):
         if version is not None:
-            js = '<script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/%s/moment-with-langs.min.js"></script>\n' % version
+            if request.is_secure:
+                protocol = 'https'
+            else:
+                protocol = 'http'
+            js = '<script src="%s://cdnjs.cloudflare.com/ajax/libs/moment.js/%s/moment-with-langs.min.js"></script>\n' % (protocol, version)
         return Markup('''%s<script>
 function flask_moment_render(elem) {
     $(elem).text(eval('moment("' + $(elem).data('timestamp') + '").' + $(elem).data('format') + ';'));
@@ -28,7 +32,11 @@ def include_moment(version = '2.3.1'):
 
     @staticmethod
     def include_jquery(version = '1.10.1'):
-        return Markup('<script src="http://code.jquery.com/jquery-%s.min.js"></script>' % version)
+        if request.is_secure:
+            protocol = 'https'
+        else:
+            protocol = 'http'
+        return Markup('<script src="%s://code.jquery.com/jquery-%s.min.js"></script>' % (protocol, version))
 
     @staticmethod
     def lang(language):

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='Flask-Moment',
-    version='0.2.0',
+    version='0.2.1',
     url='http://github.com/miguelgrinberg/flask-moment/',
     license='MIT',
     author='Miguel Grinberg',