IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix #3993

Browse Source
This commit is contained in:
James Cole 2020-10-26 06:10:10 +01:00
parent f6ce49b586
commit 276de8a470
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
6 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/app_vue.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/create_transaction.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js
View File

File diff suppressed because one or more lines are too long

16
public/v1/js/ff/firefly.js
View File

@ -144,6 +144,11 @@ function listLengthInitial() {
$('.listLengthTrigger').unbind('click').click(triggerList)
}
/**
*
* @param e
* @returns {boolean}
*/
function triggerList(e) {
"use strict";
var link = $(e.target);
@ -153,12 +158,13 @@ function triggerList(e) {
table.find('.overListLength').hide();
table.attr('data-hidden', 'yes');
link.text(showFullList);
return false;
}
// show all, return false
table.find('.overListLength').show();
table.attr('data-hidden', 'no');
link.text(showOnlyTop);
if (table.attr('data-hidden') !== 'no') {
// show all, return false
table.find('.overListLength').show();
table.attr('data-hidden', 'no');
link.text(showOnlyTop);
}
return false;
}

25
resources/assets/js/components/transactions/AccountSelect.vue
View File

@ -124,10 +124,6 @@ export default {
types = this.defaultAccountTypeFilters.join(',');
}
this.updateACURI(types);
},
name() {
// console.log('Watch: name()');
// console.log(this.name);
}
},
methods:
@ -141,7 +137,7 @@ export default {
for (const key in res.data) {
if (res.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
current = res.data[key];
current.description = this.escapeHtml(res.data[key].description)
current.name_with_balance = this.escapeHtml(res.data[key].name_with_balance)
escapedData.push(current);
}
}
@ -151,6 +147,25 @@ export default {
// any error handler
})
},
escapeHtml: function (string) {
let entityMap = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
"'": '&#39;',
'/': '&#x2F;',
'`': '&#x60;',
'=': '&#x3D;'
};
return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
return entityMap[s];
});
},
updateACURI: function (types) {
this.accountAutoCompleteURI =
document.getElementsByTagName('base')[0].href +

21
resources/assets/js/components/transactions/Category.vue
View File

@ -100,7 +100,7 @@ export default {
for (const key in res.data) {
if (res.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
current = res.data[key];
current.description = this.escapeHtml(res.data[key].description)
current.name = this.escapeHtml(res.data[key].name)
escapedData.push(current);
}
}
@ -110,6 +110,25 @@ export default {
// any error handler
})
},
escapeHtml: function (string) {
let entityMap = {
'&': '&amp;',
'<': '&lt;',
'>': '&gt;',
'"': '&quot;',
"'": '&#39;',
'/': '&#x2F;',
'`': '&#x60;',
'=': '&#x3D;'
};
return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
return entityMap[s];
});
},
handleInput(e) {
if (typeof this.$refs.input.value === 'string') {
this.$emit('input', this.$refs.input.value);