Merge pull request #91 from makermelissa/master

Handle app/javascript as json. Fix missing text position error

Author: ladyada

adafruit_pyportal.py

@@ -375,7 +375,9 @@ def __init__(
         self.set_caption(caption_text, caption_position, caption_color)
 
         if text_font:
-            if isinstance(text_position[0], (list, tuple)):
+            if text_position is not None and isinstance(
+                text_position[0], (list, tuple)
+            ):
                 num = len(text_position)
                 if not text_wrap:
                     text_wrap = [0] * num
@@ -819,8 +821,8 @@ def _connect_esp(self):
     @staticmethod
     def image_converter_url(image_url, width, height, color_depth=16):
         """Generate a converted image url from the url passed in,
-           with the given width and height. aio_username and aio_key must be
-           set in secrets."""
+        with the given width and height. aio_username and aio_key must be
+        set in secrets."""
         try:
             aio_username = secrets["aio_username"]
             aio_key = secrets["aio_key"]
@@ -933,6 +935,8 @@ def fetch(self, refresh_url=None, timeout=10):
                         content_type = CONTENT_IMAGE
                     elif "application/json" in headers["content-type"]:
                         content_type = CONTENT_JSON
+                    elif "application/javascript" in headers["content-type"]:
+                        content_type = CONTENT_JSON
             else:
                 print(
                     "HTTP Error {}: {}".format(r.status_code, r.reason.decode("utf-8"))
@@ -1161,8 +1165,7 @@ def show_QR(
         self._qr_only = hide_background
 
     def hide_QR(self):  # pylint: disable=invalid-name
-        """Clear any QR codes that are currently on the screen
-        """
+        """Clear any QR codes that are currently on the screen"""
 
         if self._qr_only:
             board.DISPLAY.show(self.splash)