Merge pull request TryGhost#1222 from mduvall/encoding-image-upload

r# the commit.
Glowin · Oct 24, 2013 · 37359dc · 37359dc
2 parents 0ddd7e8 + 6dc3e05
commit 37359dc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/core/client/models/uploadModal.js b/core/client/models/uploadModal.js
@@ -31,7 +31,8 @@
             this.options.key = options.key;
             this.options.src = options.src;
             this.options.confirm.accept = options.accept;
+            this.options.acceptEncoding = options.acceptEncoding || 'image/*';
         }
     });
 
-}());
+}());
diff --git a/core/client/tpl/modals/uploadImage.hbs b/core/client/tpl/modals/uploadImage.hbs
@@ -1,4 +1,4 @@
 <section class="js-drop-zone">
     <img class="js-upload-target" src="{{options.src}}"{{#unless options.src}} style="display: none"{{/unless}} alt="logo">
-    <input data-url="upload" class="js-fileupload main" type="file" name="uploadimage">
+    <input data-url="upload" class="js-fileupload main" type="file" name="uploadimage" {{#if options.acceptEncoding}}accept="{{options.acceptEncoding}}"{{/if}}>
 </section>
diff --git a/core/client/views/settings.js b/core/client/views/settings.js
@@ -205,27 +205,28 @@
             this.showUpload('cover', settings.cover);
         },
         showUpload: function (key, src) {
-            var self = this, upload = new Ghost.Models.uploadModal({'key': key, 'src': src, 'id': this.id, 'accept': {
-                func: function () { // The function called on acceptance
-                    var data = {};
-                    if (this.$('.js-upload-url').val()) {
-                        data[key] = this.$('.js-upload-url').val();
-                    } else {
-                        data[key] = this.$('.js-upload-target').attr('src');
-                    }
-
-                    self.model.save(data, {
-                        success: self.saveSuccess,
-                        error: self.saveError
-                    }).then(function () {
-                        self.saveSettings();
-                    });
+            var self = this,
+                upload = new Ghost.Models.uploadModal({'key': key, 'src': src, 'id': this.id, 'accept': {
+                    func: function () { // The function called on acceptance
+                        var data = {};
+                        if (this.$('.js-upload-url').val()) {
+                            data[key] = this.$('.js-upload-url').val();
+                        } else {
+                            data[key] = this.$('.js-upload-target').attr('src');
+                        }
+
+                        self.model.save(data, {
+                            success: self.saveSuccess,
+                            error: self.saveError
+                        }).then(function () {
+                            self.saveSettings();
+                        });
 
-                    return true;
-                },
-                buttonClass: "button-save right",
-                text: "Save" // The accept button text
-            }});
+                        return true;
+                    },
+                    buttonClass: "button-save right",
+                    text: "Save" // The accept button text
+                }});
 
             this.addSubview(new Ghost.Views.Modal({
                 model: upload