Sfoglia il codice sorgente

Merge branch 'hotfix'

version-14
Saurabh 7 anni fa
parent
commit
ca3bbe75ae
4 ha cambiato i file con 26 aggiunte e 10 eliminazioni
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -0
      frappe/public/css/form.css
  3. +18
    -9
      frappe/public/js/frappe/upload.js
  4. +4
    -0
      frappe/public/less/form.less

+ 1
- 1
frappe/__init__.py Vedi File

@@ -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()


+ 3
- 0
frappe/public/css/form.css Vedi File

@@ -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%;


+ 18
- 9
frappe/public/js/frappe/upload.js Vedi File

@@ -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;


+ 4
- 0
frappe/public/less/form.less Vedi File

@@ -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 {


Caricamento…
Annulla
Salva