+
+ {{ doc.subject }}
++ {{ frappe.format_date(doc.modified) }} +
+
+ {{ doc.message }}
+
+ \
\
- ×
')
+ ×')
.prependTo(me.input_area)
.toggle(false);
this.input = this.$input.get(0);
diff --git a/frappe/public/js/frappe/form/controls/html.js b/frappe/public/js/frappe/form/controls/html.js
index 5c4f736071..53f1f04c08 100644
--- a/frappe/public/js/frappe/form/controls/html.js
+++ b/frappe/public/js/frappe/form/controls/html.js
@@ -2,13 +2,21 @@ frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({
make: function() {
this._super();
this.disp_area = this.wrapper;
+ $(document).on('change', () => {
+ setTimeout(() => this.refresh_input(), 500);
+ });
},
refresh_input: function() {
var content = this.get_content();
if(content) this.$wrapper.html(content);
},
get_content: function() {
- return this.df.options || "";
+ var content = this.df.options || "";
+ try {
+ return frappe.render(content, this);
+ } catch (e) {
+ return content;
+ }
},
html: function(html) {
this.$wrapper.html(html || this.get_content());
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 1110fee7fc..00af468754 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -137,17 +137,17 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
});
},
get_image: function (fileobj, callback) {
- var freader = new FileReader();
+ var reader = new FileReader();
- freader.onload = function() {
- var dataurl = freader.result;
+ reader.onload = function() {
+ var dataurl = reader.result;
// add filename to dataurl
var parts = dataurl.split(",");
parts[0] += ";filename=" + fileobj.name;
dataurl = parts[0] + ',' + parts[1];
callback(dataurl);
};
- freader.readAsDataURL(fileobj);
+ reader.readAsDataURL(fileobj);
},
hide_elements_on_mobile: function() {
this.note_editor.find('.note-btn-underline,\
diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 025f0bba7b..015cc27ded 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -48,7 +48,8 @@ frappe.ui.form.QuickEntryForm = Class.extend({
return false;
}
- if (this.too_many_mandatory_fields() || this.has_child_table()) {
+ if (this.too_many_mandatory_fields() || this.has_child_table()
+ || !this.mandatory.length) {
return false;
}
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 19b622e8ee..bde19db1f3 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -34,7 +34,7 @@ frappe.call = function(opts) {
var callback = function(data, response_text) {
if(data.task_id) {
// async call, subscribe
- frappe.socket.subscribe(data.task_id, opts);
+ frappe.socketio.subscribe(data.task_id, opts);
if(opts.queued) {
opts.queued(data);
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index c8af253bed..d058b8a3f4 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -1,4 +1,4 @@
-frappe.socket = {
+frappe.socketio = {
open_tasks: {},
open_docs: [],
emit_queue: [],
@@ -7,40 +7,40 @@ frappe.socket = {
return;
}
- if (frappe.socket.socket) {
+ if (frappe.socketio.socket) {
return;
}
if (frappe.boot.developer_mode) {
// File watchers for development
- frappe.socket.setup_file_watchers();
+ frappe.socketio.setup_file_watchers();
}
//Enable secure option when using HTTPS
if (window.location.protocol == "https:") {
- frappe.socket.socket = io.connect(frappe.socket.get_host(), {secure: true});
+ frappe.socketio.socket = io.connect(frappe.socketio.get_host(), {secure: true});
}
else if (window.location.protocol == "http:") {
- frappe.socket.socket = io.connect(frappe.socket.get_host());
+ frappe.socketio.socket = io.connect(frappe.socketio.get_host());
}
else if (window.location.protocol == "file:") {
- frappe.socket.socket = io.connect(window.localStorage.server);
+ frappe.socketio.socket = io.connect(window.localStorage.server);
}
- if (!frappe.socket.socket) {
- console.log("Unable to connect to " + frappe.socket.get_host());
+ if (!frappe.socketio.socket) {
+ console.log("Unable to connect to " + frappe.socketio.get_host());
return;
}
- frappe.socket.socket.on('msgprint', function(message) {
+ frappe.socketio.socket.on('msgprint', function(message) {
frappe.msgprint(message);
});
- frappe.socket.socket.on('eval_js', function(message) {
+ frappe.socketio.socket.on('eval_js', function(message) {
eval(message);
});
- frappe.socket.socket.on('progress', function(data) {
+ frappe.socketio.socket.on('progress', function(data) {
if(data.progress) {
data.percent = flt(data.progress[0]) / data.progress[1] * 100;
}
@@ -53,23 +53,24 @@ frappe.socket = {
}
});
- frappe.socket.setup_listeners();
- frappe.socket.setup_reconnect();
+ frappe.socketio.setup_listeners();
+ frappe.socketio.setup_reconnect();
+ frappe.socketio.uploader = new frappe.socketio.SocketIOUploader();
$(document).on('form-load form-rename', function(e, frm) {
if (frm.is_new()) {
return;
}
- for (var i=0, l=frappe.socket.open_docs.length; i')
+ dialog.progress = $(`
+
+
+
`)
.appendTo(dialog.body);
dialog.progress_bar = dialog.progress.css({"margin-top": "10px"})
.find(".progress-bar");
@@ -250,7 +253,12 @@ frappe.show_progress = function(title, count, total) {
dialog.show();
frappe.cur_progress = dialog;
}
- dialog.progress_bar.css({"width": cint(flt(count) * 100 / total) + "%" });
+ if (description) {
+ dialog.progress.find('.description').text(description);
+ }
+ dialog.percent = cint(flt(count) * 100 / total);
+ dialog.progress_bar.css({"width": dialog.percent + "%" });
+ return dialog;
}
frappe.hide_progress = function() {
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index 319fc61971..5914cb9c79 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -187,7 +187,7 @@ frappe.upload = {
},
upload_multiple_files: function(files /*FileData array*/, args, opts) {
var i = -1;
-
+ frappe.upload.total_files = files ? files.length : 0;
// upload the first file
upload_next();
// subsequent files will be uploaded after
@@ -200,7 +200,7 @@ frappe.upload = {
var file = files[i];
args.is_private = file.is_private;
if(!opts.progress) {
- frappe.show_progress(__('Uploading'), i+1, files.length);
+ frappe.show_progress(__('Uploading'), i, files.length);
}
}
frappe.upload.upload_file(file, args, opts);
@@ -225,20 +225,21 @@ frappe.upload = {
return;
}
- if(args.file_url) {
- frappe.upload._upload_file(fileobj, args, opts);
- } else {
+ if(fileobj) {
frappe.upload.read_file(fileobj, args, opts);
+ } else {
+ // with file_url
+ frappe.upload._upload_file(fileobj, args, opts);
}
},
- _upload_file: function(fileobj, args, opts, dataurl) {
+ _upload_file: function(fileobj, args, opts) {
if (args.file_size) {
frappe.upload.validate_max_file_size(args.file_size);
}
if(opts.on_attach) {
- opts.on_attach(args, dataurl)
+ opts.on_attach(args)
} else {
if (opts.confirm_is_private) {
frappe.prompt({
@@ -248,55 +249,53 @@ frappe.upload = {
"default": 1
}, function(values) {
args["is_private"] = values.is_private;
- frappe.upload.upload_to_server(fileobj, args, opts, dataurl);
+ frappe.upload.upload_to_server(fileobj, args, opts);
}, __("Private or Public?"));
} else {
if ("is_private" in opts) {
args["is_private"] = opts.is_private;
}
- frappe.upload.upload_to_server(fileobj, args, opts, dataurl);
+ frappe.upload.upload_to_server(fileobj, args, opts);
}
}
},
read_file: function(fileobj, args, opts) {
- var freader = new FileReader();
+ args.filename = fileobj.name.split(' ').join('_');
+ args.file_url = null;
- freader.onload = function() {
- args.filename = fileobj.name.split(' ').join('_');
- if(opts.options && opts.options.toLowerCase()=="image") {
- if(!frappe.utils.is_image_file(args.filename)) {
- frappe.msgprint(__("Only image extensions (.gif, .jpg, .jpeg, .tiff, .png, .svg) allowed"));
- return;
- }
+ if(opts.options && opts.options.toLowerCase()=="image") {
+ if(!frappe.utils.is_image_file(args.filename)) {
+ frappe.msgprint(__("Only image extensions (.gif, .jpg, .jpeg, .tiff, .png, .svg) allowed"));
+ return;
}
+ }
- if((opts.max_width || opts.max_height) && frappe.utils.is_image_file(args.filename)) {
- frappe.utils.resize_image(freader, function(_dataurl) {
- var dataurl = _dataurl;
- args.filedata = _dataurl.split(",")[1];
- args.file_size = Math.round(args.filedata.length * 3 / 4);
- console.log("resized!")
- frappe.upload._upload_file(fileobj, args, opts, dataurl);
- })
- } else {
- var dataurl = freader.result;
- args.filedata = freader.result.split(",")[1];
- args.file_size = fileobj.size;
- frappe.upload._upload_file(fileobj, args, opts, dataurl);
+ let start_complete = frappe.cur_progress ? frappe.cur_progress.percent : 0;
+
+ frappe.socketio.uploader.start({
+ file: fileobj,
+ filename: args.filename,
+ is_private: args.is_private,
+ callback: (data) => {
+ args.file_url = data.file_url;
+ frappe.upload._upload_file(fileobj, args, opts);
+ },
+ on_progress: (percent_complete) => {
+ let increment = (flt(percent_complete) / frappe.upload.total_files);
+ frappe.show_progress(__('Uploading'),
+ start_complete + increment);
}
- };
-
- freader.readAsDataURL(fileobj);
+ });
},
- upload_to_server: function(fileobj, args, opts, dataurl) {
- // var msgbox = frappe.msgprint(__("Uploading..."));
+ upload_to_server: function(file, args, opts) {
if(opts.start) {
opts.start();
}
+
var ajax_args = {
"method": "uploadfile",
args: args,
@@ -368,7 +367,7 @@ frappe.upload = {
d.hide();
opts.loopcallback = function (){
if (i < j) {
- args.is_private = d.fields_dict[fileobjs[i].name + "_is_private"].get_value()
+ args.is_private = d.fields_dict[fileobjs[i].name + "_is_private"].get_value();
frappe.upload.upload_file(fileobjs[i], args, opts);
i++;
}
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index afec19cd44..196d225027 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -749,11 +749,9 @@ select.form-control {
.control-code, .control-code.bold {
height: 400px;
font-family: Monaco, "Courier New", monospace;
- background-color: black;
- color: @light-yellow;
+ color: @text-color;
font-size: 12px;
line-height: 1.7em;
- border: none;
}
.delivery-status-indicator {
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index aacb83b17e..e45cc91bd7 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -130,15 +130,6 @@ body[data-route^="Module"] .main-menu {
right: 5px;
}
- // .attachment-row .icon-lock {
- // color: @text-warning;
- // display: inline-block;
- // margin-top: 1px;
- // }
-
- .attachment-row a.close {
- margin-top: -5px;
- }
.form-shared, .form-viewers {
.share-doc-btn {
diff --git a/frappe/tests/ui/test_control_html.js b/frappe/tests/ui/test_control_html.js
new file mode 100644
index 0000000000..8c0276508c
--- /dev/null
+++ b/frappe/tests/ui/test_control_html.js
@@ -0,0 +1,51 @@
+QUnit.module('controls');
+
+QUnit.test("Test ControlHTML", function(assert) {
+ assert.expect(3);
+ const random_name = frappe.utils.get_random(3).toLowerCase();
+
+ let done = assert.async();
+
+ frappe.run_serially([
+ () => {
+ return frappe.tests.make('Custom Field', [
+ {dt: 'ToDo'},
+ {fieldtype: 'HTML'},
+ {label: random_name},
+ {options: '