From 884555b6459a7c73cb9d40bc97d5837daa7502ea Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 9 Oct 2017 16:12:00 +0530
Subject: [PATCH 1/2] [fix] if no_socketio specified, upload file with
 FileReader

---
 frappe/public/css/form.css        |  3 +++
 frappe/public/js/frappe/upload.js | 27 ++++++++++++++++++---------
 frappe/public/less/form.less      |  4 ++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css
index f2f758aac5..255c2afc2a 100644
--- a/frappe/public/css/form.css
+++ b/frappe/public/css/form.css
@@ -612,6 +612,9 @@ select.form-control {
   font-weight: 500;
   color: #8D99A6;
 }
+.attach-btn {
+  margin-top: 10px;
+}
 @media (min-width: 768px) {
   .layout-main .form-column.col-sm-12 > form > .input-max-width {
     max-width: 50%;
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 2031e8e325..f8face91fb 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -131,7 +131,7 @@ frappe.upload = {
 
 
 		if(!opts.btn) {
-			opts.btn = $('<button class="btn btn-default btn-sm">' + __("Attach")
+			opts.btn = $('<button class="btn btn-default btn-sm attach-btn">' + __("Attach")
 				+ '</div>').appendTo($upload);
 		} else {
 			$(opts.btn).unbind("click");
@@ -280,20 +280,29 @@ frappe.upload = {
 
 		let start_complete = frappe.cur_progress ? frappe.cur_progress.percent : 0;
 
+		var upload_with_filedata = function() {
+			let freader = new FileReader();
+			freader.onload = function() {
+				var dataurl = freader.result;
+				args.filedata = freader.result.split(",")[1];
+				args.file_size = fileobj.size;
+				frappe.upload._upload_file(fileobj, args, opts, dataurl);
+			};
+			freader.readAsDataURL(fileobj);
+		}
+
+		if (opts.no_socketio) {
+			upload_with_filedata();
+			return;
+		}
+
 		frappe.socketio.uploader.start({
 			file: fileobj,
 			filename: args.filename,
 			is_private: args.is_private,
 			fallback: () => {
 				// if fails, use old filereader
-				let freader = new FileReader();
-				freader.onload = function() {
-					var dataurl = freader.result;
-					args.filedata = freader.result.split(",")[1];
-					args.file_size = fileobj.size;
-					frappe.upload._upload_file(fileobj, args, opts, dataurl);
-				};
-				freader.readAsDataURL(fileobj);
+				upload_with_filedata();
 			},
 			callback: (data) => {
 				args.file_url = data.file_url;
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 196d225027..dd2b07988d 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -762,6 +762,10 @@ select.form-control {
 	color: @text-muted;
 }
 
+.attach-btn {
+	margin-top: 10px;
+}
+
 // above mobile
 @media (min-width: 768px) {
 	.layout-main .form-column.col-sm-12 > form > .input-max-width {

From 2c25c9619dcf28cb9bb3d7a6b4f705e1f960a1fb Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Tue, 10 Oct 2017 11:51:05 +0600
Subject: [PATCH 2/2] bumped to version 9.1.4

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 4f02441af8..fde8f720ab 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '9.1.3'
+__version__ = '9.1.4'
 __title__ = "Frappe Framework"
 
 local = Local()