Rushabh Mehta hace 8 años
padre
commit
ad279149ea
Se han modificado 2 ficheros con 11 adiciones y 2 borrados
  1. +9
    -1
      frappe/public/js/frappe/dom.js
  2. +2
    -1
      frappe/public/js/frappe/form/control.js

+ 9
- 1
frappe/public/js/frappe/dom.js Ver fichero

@@ -30,10 +30,12 @@ frappe.dom = {
remove_script_and_style: function(txt) { remove_script_and_style: function(txt) {
var div = document.createElement('div'); var div = document.createElement('div');
div.innerHTML = txt; div.innerHTML = txt;
var found = false;
["script", "style", "noscript", "title", "meta", "base", "head"].forEach(function(e, i) { ["script", "style", "noscript", "title", "meta", "base", "head"].forEach(function(e, i) {
var elements = div.getElementsByTagName(e); var elements = div.getElementsByTagName(e);
var i = elements.length; var i = elements.length;
while (i--) { while (i--) {
found = true;
elements[i].parentNode.removeChild(elements[i]); elements[i].parentNode.removeChild(elements[i]);
} }
}); });
@@ -43,10 +45,16 @@ frappe.dom = {
var i = elements.length; var i = elements.length;
while (i--) { while (i--) {
if (elements[i].getAttribute("rel")=="stylesheet"){ if (elements[i].getAttribute("rel")=="stylesheet"){
found = true;
elements[i].parentNode.removeChild(elements[i]); elements[i].parentNode.removeChild(elements[i]);
} }
} }
return div.innerHTML;
if(found) {
return div.innerHTML;
} else {
// don't disturb
return txt;
}
}, },
is_element_in_viewport: function (el) { is_element_in_viewport: function (el) {




+ 2
- 1
frappe/public/js/frappe/form/control.js Ver fichero

@@ -1758,8 +1758,9 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
set_input: function(value) { set_input: function(value) {
if(value == null) value = ""; if(value == null) value = "";
value = frappe.dom.remove_script_and_style(value); value = frappe.dom.remove_script_and_style(value);
if(value !== this.get_value())
if(value !== this.get_value()) {
this.editor.summernote('code', value); this.editor.summernote('code', value);
}
this.last_value = value; this.last_value = value;
}, },
set_focus: function() { set_focus: function() {


Cargando…
Cancelar
Guardar