Merge pull request #37 from theonion/override-image-url

Allow override of base image url
theonion · Oct 7, 2014 · fc46c66 · fc46c66
2 parents 2880082 + 7bcd393
commit fc46c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/betty/__init__.py b/betty/__init__.py
@@ -2,4 +2,4 @@
 
 from .celery import app as celery_app  # noqa
 
-__version__ = "0.2.11"
+__version__ = "0.2.12"
diff --git a/betty/cropper/templates/image.js b/betty/cropper/templates/image.js
@@ -2,7 +2,7 @@
     /* We can request an image at every possible width, but let's limit it to a reasonable number
        We can set these so they correspond to our more common sizes.
     */
-    var IMAGE_URL = "{{ BETTY_IMAGE_URL }}",
+    var IMAGE_URL = w.BETTY_IMAGE_URL || "{{ BETTY_IMAGE_URL }}",
         RATIOS = {{ BETTY_RATIOS|safe }},
         ASPECT_RATIO_TOLERANCE = .1, // 10% tolerance. 
         breakpoints = [{{ BETTY_WIDTHS|join:","}}];