mirror of
https://gitlab.com/flectra-hq/flectra.git
synced 2026-10-25 15:30:05 -05:00
Merge branch 'master-upstream-patch-29112021' into 'master'
[PATCH] Upstream patch - 29112021 See merge request flectra-hq/flectra!512
This commit is contained in:
Parthiv Patel committed
commit
41933db083
3 files changed
+163
-29
No files matched your search
@@ -40,7 +40,35 @@ function checkXML(xml) {
|
||||
var xmlDoc = (new window.DOMParser()).parseFromString(xml, 'text/xml');
|
||||
var error = xmlDoc.getElementsByTagName('parsererror');
|
||||
if (error.length > 0) {
|
||||
return _getCheckReturn(false, parseInt(error[0].innerHTML.match(/[Ll]ine[^\d]+(\d+)/)[1], 10), error[0].innerHTML);
|
||||
const errorEl = error[0];
|
||||
const sourceTextEls = errorEl.querySelectorAll('sourcetext');
|
||||
let codeEls = null;
|
||||
if (sourceTextEls.length) {
|
||||
codeEls = [...sourceTextEls].map(el => {
|
||||
const codeEl = document.createElement('code');
|
||||
codeEl.textContent = el.textContent;
|
||||
const brEl = document.createElement('br');
|
||||
brEl.classList.add('o_we_source_text_origin');
|
||||
el.parentElement.insertBefore(brEl, el);
|
||||
return codeEl;
|
||||
});
|
||||
for (const el of sourceTextEls) {
|
||||
el.remove();
|
||||
}
|
||||
}
|
||||
for (const el of [...errorEl.querySelectorAll(':not(code):not(pre):not(br)')]) {
|
||||
const pEl = document.createElement('p');
|
||||
for (const cEl of [...el.childNodes]) {
|
||||
pEl.appendChild(cEl);
|
||||
}
|
||||
el.parentElement.insertBefore(pEl, el);
|
||||
el.remove();
|
||||
}
|
||||
errorEl.innerHTML = errorEl.innerHTML.replace(/\r?\n/g, '<br/>');
|
||||
errorEl.querySelectorAll('.o_we_source_text_origin').forEach((el, i) => {
|
||||
el.after(codeEls[i]);
|
||||
});
|
||||
return _getCheckReturn(false, parseInt(error[0].innerHTML.match(/[Ll]ine[^\d]+(\d+)/)[1], 10), errorEl.innerHTML);
|
||||
}
|
||||
} else if (typeof window.ActiveXObject != 'undefined' && new window.ActiveXObject('Microsoft.XMLDOM')) {
|
||||
var xmlDocIE = new window.ActiveXObject('Microsoft.XMLDOM');
|
||||
@@ -295,6 +323,10 @@ var ViewEditor = Widget.extend({
|
||||
this.$editor.width(width);
|
||||
this.aceEditor.resize();
|
||||
this.$el.width(width);
|
||||
|
||||
if (this.$errorLine) {
|
||||
this.$errorLine.popover('update');
|
||||
}
|
||||
}
|
||||
function storeEditorWidth() {
|
||||
localStorage.setItem('ace_editor_width', this.$el.width());
|
||||
@@ -308,7 +340,14 @@ var ViewEditor = Widget.extend({
|
||||
resizing = true;
|
||||
}
|
||||
function stopResizing() {
|
||||
resizing = false;
|
||||
if (resizing) {
|
||||
resizing = false;
|
||||
|
||||
if (this.errorSession) {
|
||||
// To trigger an update of the error display
|
||||
this.errorSession.setScrollTop(this.errorSession.getScrollTop() + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
function updateWidth(e) {
|
||||
if (!resizing) return;
|
||||
@@ -373,6 +412,13 @@ var ViewEditor = Widget.extend({
|
||||
this._switchType(type);
|
||||
}
|
||||
|
||||
if (!this.resources[this.currentType].hasOwnProperty(resID)) {
|
||||
// This could happen if trying to switch to a file which is not
|
||||
// visible with the default filters. In that case, we prefer the
|
||||
// user to have to switch explicitely to the right filters again.
|
||||
return;
|
||||
}
|
||||
|
||||
var editingSession = this.editingSessions[this.currentType][resID];
|
||||
if (!editingSession) {
|
||||
editingSession = this.editingSessions[this.currentType][resID] = this._buildEditingSession(resID);
|
||||
@@ -682,17 +728,13 @@ var ViewEditor = Widget.extend({
|
||||
*/
|
||||
_showErrorLine: function (line, message, resID, type) {
|
||||
if (line === undefined || line <= 0) {
|
||||
if (this.$errorLine) {
|
||||
this.$errorLine.removeClass('o_error');
|
||||
this.$errorLine.off('.o_error');
|
||||
this.$errorLine = undefined;
|
||||
this.$errorContent.removeClass('o_error');
|
||||
this.$errorContent = undefined;
|
||||
}
|
||||
__restore.call(this);
|
||||
return;
|
||||
}
|
||||
|
||||
if (type) this._switchType(type);
|
||||
if (type) {
|
||||
this._switchType(type);
|
||||
}
|
||||
|
||||
if (this._getSelectedResource() === resID) {
|
||||
__showErrorLine.call(this, line);
|
||||
@@ -705,17 +747,66 @@ var ViewEditor = Widget.extend({
|
||||
this._displayResource(resID, this.currentType);
|
||||
}
|
||||
|
||||
function __showErrorLine(line) {
|
||||
this.aceEditor.gotoLine(line);
|
||||
this.$errorLine = this.$viewEditor.find('.ace_gutter-cell').filter(function () {
|
||||
return parseInt($(this).text()) === line;
|
||||
}).addClass('o_error');
|
||||
this.$errorLine.addClass('o_error').on('click.o_error', function () {
|
||||
var $message = $('<div/>').html(message);
|
||||
$message.text($message.text());
|
||||
Dialog.alert(this, "", {$content: $message});
|
||||
function __restore() {
|
||||
if (this.errorSession) {
|
||||
this.errorSession.off('change', this.errorSessionChangeCallback);
|
||||
this.errorSession.off('changeScrollTop', this.errorSessionScrollCallback);
|
||||
this.errorSession = undefined;
|
||||
}
|
||||
__restoreErrorLine.call(this);
|
||||
|
||||
if (this.$errorContent) { // TODO remove in master
|
||||
this.$errorContent.removeClass('o_error');
|
||||
this.$errorContent = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
function __restoreErrorLine() {
|
||||
if (this.$errorLine) {
|
||||
this.$errorLine.removeClass('o_error');
|
||||
this.$errorLine.popover('hide');
|
||||
this.$errorLine.popover('dispose');
|
||||
this.$errorLine = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
function __updateErrorLineDisplay(line) {
|
||||
__restoreErrorLine.call(this);
|
||||
|
||||
const $lines = this.$viewEditor.find('.ace_gutter-cell');
|
||||
this.$errorLine = $lines.filter(function (i, el) {
|
||||
return parseInt($(el).text()) === line;
|
||||
});
|
||||
this.$errorContent = this.$viewEditor.find('.ace_scroller').addClass('o_error');
|
||||
if (!this.$errorLine.length) {
|
||||
const $firstLine = $lines.first();
|
||||
const firstLineNumber = parseInt($firstLine.text());
|
||||
this.$errorLine = line < firstLineNumber ? $lines.eq(1) : $lines.eq($lines.length - 2);
|
||||
}
|
||||
this.$errorLine.addClass('o_error');
|
||||
this.$errorLine.popover({
|
||||
animation: false,
|
||||
html: true,
|
||||
content: message,
|
||||
placement: 'left',
|
||||
container: 'body',
|
||||
trigger: 'manual',
|
||||
template: '<div class="popover o_ace_error_popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
|
||||
});
|
||||
this.$errorLine.popover('show');
|
||||
}
|
||||
|
||||
function __showErrorLine(line) {
|
||||
this.$errorContent = this.$viewEditor.find('.ace_scroller').addClass('o_error'); // TODO remove in master
|
||||
|
||||
this.errorSession = this.aceEditor.getSession();
|
||||
this.errorSessionChangeCallback = __restore.bind(this);
|
||||
this.errorSession.on('change', this.errorSessionChangeCallback);
|
||||
this.errorSessionScrollCallback = _.debounce(__updateErrorLineDisplay.bind(this, line), 10);
|
||||
this.errorSession.on('changeScrollTop', this.errorSessionScrollCallback);
|
||||
|
||||
__updateErrorLineDisplay.call(this, line);
|
||||
|
||||
setTimeout(() => this.aceEditor.gotoLine(line), 100);
|
||||
}
|
||||
},
|
||||
/**
|
||||
@@ -860,6 +951,7 @@ var ViewEditor = Widget.extend({
|
||||
* @private
|
||||
*/
|
||||
_onCloseClick: function () {
|
||||
this._showErrorLine();
|
||||
this.do_hide();
|
||||
},
|
||||
/**
|
||||
|
||||
@@ -403,10 +403,13 @@ a.o_underline {
|
||||
@mixin ace-line-error-mixin {
|
||||
content: "";
|
||||
z-index: 1000;
|
||||
display: block;
|
||||
background-color: theme-color('danger');
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
display: flex;
|
||||
background-color: $o-we-color-danger;
|
||||
color: white;
|
||||
font-size: 1.2em;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: help;
|
||||
}
|
||||
|
||||
height: 70%; // in case flex is not supported
|
||||
@@ -418,9 +421,16 @@ a.o_underline {
|
||||
.ace_gutter-cell.o_error {
|
||||
position: relative;
|
||||
|
||||
&::before {
|
||||
@include o-position-absolute(-100vh, 0, -100vh);
|
||||
@include ace-line-error-mixin;
|
||||
width: 2px;
|
||||
}
|
||||
&::after {
|
||||
@include o-position-absolute(-100%, 0, -100%, 0);
|
||||
@include ace-line-error-mixin;
|
||||
font-family: FontAwesome;
|
||||
content: "\f071";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -431,12 +441,28 @@ a.o_underline {
|
||||
height: 100%;
|
||||
cursor: ew-resize;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ace_scroller.o_error::after {
|
||||
@include o-position-absolute(0, auto, 0, 0);
|
||||
width: 3px;
|
||||
@include ace-line-error-mixin;
|
||||
}
|
||||
.o_ace_error_popover {
|
||||
max-width: 40vw;
|
||||
|
||||
.popover-body {
|
||||
background-color: lighten($o-we-ace-color, 10%);
|
||||
color: #ebecee;
|
||||
}
|
||||
&.bs-popover-left .arrow::after {
|
||||
border-left-color: lighten($o-we-ace-color, 10%);
|
||||
}
|
||||
&.bs-popover-right .arrow::after {
|
||||
border-right-color: lighten($o-we-ace-color, 10%);
|
||||
}
|
||||
code {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
overflow-x: auto;
|
||||
white-space: pre;
|
||||
color: cyan;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -69,6 +69,22 @@ var WebsiteAceEditor = AceEditor.extend({
|
||||
}));
|
||||
}).bind(this));
|
||||
},
|
||||
/**
|
||||
* @override
|
||||
*/
|
||||
_switchType(type) {
|
||||
const ret = this._super(...arguments);
|
||||
|
||||
if (type === 'scss') {
|
||||
// By default show the user_custom_rules.scss one as some people
|
||||
// would write rules in user_custom_bootstrap_overridden.scss
|
||||
// otherwise, not reading the comment inside explaining how that
|
||||
// file should be used.
|
||||
this._displayResource('/website/static/src/scss/user_custom_rules.scss');
|
||||
}
|
||||
|
||||
return ret;
|
||||
},
|
||||
/**
|
||||
* @override
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user