Sfoglia il codice sorgente

[minor] css for upload.js

version-14
Rushabh Mehta 9 anni fa
parent
commit
423cdc643d
4 ha cambiato i file con 8 aggiunte e 5 eliminazioni
  1. +3
    -2
      frappe/public/js/frappe/request.js
  2. +1
    -0
      frappe/public/js/frappe/ui/messages.js
  3. +2
    -2
      frappe/public/js/frappe/ui/upload.html
  4. +2
    -1
      frappe/public/js/frappe/upload.js

+ 3
- 2
frappe/public/js/frappe/request.js Vedi File

@@ -231,8 +231,9 @@ frappe.request.cleanup = function(opts, r) {

// show messages
if(r._server_messages && !opts.silent) {
r._server_messages = JSON.parse(r._server_messages)
msgprint(r._server_messages);
r._server_messages = JSON.parse(r._server_messages);
frappe.hide_msgprint();
frappe.msgprint(r._server_messages);
}

// show errors


+ 1
- 0
frappe/public/js/frappe/ui/messages.js Vedi File

@@ -140,6 +140,7 @@ frappe.msgprint = function(msg, title) {
}

frappe.hide_msgprint = function(instant) {
msg_dialog.msg_area.empty();
if(msg_dialog && msg_dialog.$wrapper.is(":visible")) {
if(instant) {
msg_dialog.$wrapper.removeClass("fade");


+ 2
- 2
frappe/public/js/frappe/ui/upload.html Vedi File

@@ -3,8 +3,8 @@
<input class="input-upload-file hidden" type="file" name="filedata" />
<button class="btn btn-primary btn-sm btn-browse">{%= __("Browse") %}</button>
</div>
<div class="uploaded-filename hidden" style="width: calc(100% - 67px);"></div>
<div class="web-link-wrapper" style="width: calc(100% - 67px);">
<div class="uploaded-filename hidden" style="width: calc(100% - 80px);"></div>
<div class="web-link-wrapper" style="width: calc(100% - 80px);">
<span class="text-muted file-upload-or">{%= __("or") %}</span>
<div class="input-link" style="width: calc(100% - 30px);">
<div class="input-group">


+ 2
- 1
frappe/public/js/frappe/upload.js Vedi File

@@ -161,8 +161,9 @@ frappe.upload = {
"method": "uploadfile",
args: args,
callback: function(r) {
if(!r._server_messages)
if(!r._server_messages) {
msgbox.hide();
}
if(r.exc) {
// if no onerror, assume callback will handle errors
opts.onerror ? opts.onerror(r) : opts.callback(null, null, r);


Caricamento…
Annulla
Salva