Fixed js quirk when resizing the image preview field

dpgmediamagazines · Jun 26, 2018 · 336c922 · 336c922
1 parent b8e871e
commit 336c922
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/arctic/static/arctic/dist/assets/js/app.js b/arctic/static/arctic/dist/assets/js/app.js
diff --git a/arctic/static/arctic/src/assets/js/components/file_input.js b/arctic/static/arctic/src/assets/js/components/file_input.js
@@ -6,7 +6,12 @@ function get_file_preview(target, url, filename) {
     }
     img.onload = function(evt) {
         target.html('<a href="' + this.src + '" target="_blank"><img src="' + this.src + '" /></a>');
-        target.prev().height(target.height());
+        if (target.height() < 22) {
+            setTimeout(function(){ target.prev().height(target.height()); }, 20);
+        }
+        else {
+            target.prev().height(target.height());            
+        }
     }
     img.src = url;
     if ($(target).next('.better-file-clear-checkbox')) {

diff --git a/example/articles/migrations/0005_auto_20180625_1539.py b/example/articles/migrations/0005_auto_20180625_1539.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.0.6 on 2018-06-25 13:39
+
+import articles.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('articles', '0004_image'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='image',
+            options={'ordering': ['order'], 'verbose_name': 'Image', 'verbose_name_plural': 'Images'},
+        ),
+        migrations.AlterField(
+            model_name='image',
+            name='image',
+            field=models.ImageField(null=True, upload_to=articles.models.filename),
+        ),
+    ]
diff --git a/example/articles/models.py b/example/articles/models.py
@@ -48,7 +48,7 @@ def filename(instance, filename):
 
 class Image(models.Model):
     title = models.CharField(max_length=255, null=True, blank=True)
-    image = models.ImageField(upload_to=filename, null=True)
+    image = models.ImageField(upload_to=filename, null=True, blank=True)
     article = models.ForeignKey(Article, on_delete=models.CASCADE)
     order = models.IntegerField(null=True, blank=True)