Just a little cleanup on the image URLs

theonion · Jun 11, 2014 · bb728ed · bb728ed
1 parent b243faf
commit bb728ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/betty/cropper/templates/image.js b/betty/cropper/templates/image.js
@@ -7,7 +7,6 @@
         ASPECT_RATIO_TOLERANCE = .1, // 10% tolerance. 
         breakpoints = [{{ BETTY_WIDTHS|join:","}}];
 
-
     w.picturefill = function(elements) {
         //don't need to do them all at once. can decide to do lazy load if needed
         if (elements instanceof Array) {
@@ -100,7 +99,7 @@
                                 }
                                 id_str += id.charAt(ii);
                             }
-                            var url = IMAGE_URL + "/" + id_str + "/" + crop + "/" + width + "." + format;
+                            var url = IMAGE_URL + id_str + "/" + crop + "/" + width + "." + format;
 
                             imageData.push({
                                 'div': div,

diff --git a/betty/cropper/views.py b/betty/cropper/views.py
@@ -29,6 +29,8 @@ def image_js(request):
         "BETTY_IMAGE_URL": settings.BETTY_IMAGE_URL,
         "BETTY_WIDTHS": sorted(widths)
     }
+    if context["BETTY_IMAGE_URL"].endswith("/"):
+        context["BETTY_IMAGE_URL"] = context["BETTY_IMAGE_URL"][:-1]
     BETTY_RATIOS = []
     ratios_sorted = sorted(settings.BETTY_RATIOS, key=lambda r: Ratio(r).width / float(Ratio(r).height))
     for ratio_string in ratios_sorted: