From ebddb6c6b05d251f1e87b918eaec59ab09cd97a1 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Thu, 23 Jul 2015 11:37:59 -0700
Subject: Added support for png profile pictures

---
 web/react/components/user_settings.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'web/react/components/user_settings.jsx')

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 1fbbf16ed..0f600a813 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -683,13 +683,15 @@ var GeneralTab = React.createClass({
 
         if(!this.submitActive) return;
 
-        if(this.state.picture.type !== "image/jpeg") {
-            this.setState({client_error: "Only JPG images may be used for profile pictures"});
+        var picture = this.state.picture;
+
+        if(picture.type !== "image/jpeg" && picture.type !== "image/png") {
+            this.setState({client_error: "Only JPG or PNG images may be used for profile pictures"});
             return;
         }
 
         formData = new FormData();
-        formData.append('image', this.state.picture, this.state.picture.name);
+        formData.append('image', picture, picture.name);
 
         client.uploadProfileImage(formData,
             function(data) {
-- 
cgit v1.2.3-1-g7c22

