kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #4011

Browse Source
This commit is contained in:
James Cole
2020-10-29 17:20:58 +01:00
parent 1ed71ea742
commit a0f34666a3
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@@ -53,7 +53,15 @@
:target="target" :target="target"
item-key="name_with_balance" item-key="name_with_balance"
v-on:input="selectedItem" v-on:input="selectedItem"
></typeahead> >
<template slot="item" slot-scope="props">
<li v-for="(item, index) in props.items" :class="{active:props.activeIndex===index}">
<a role="button" @click="props.select(item)">
<span v-html="betterHighlight(item)"></span>
</a>
</li>
</template>
</typeahead>
<ul v-for="error in this.error" class="list-unstyled"> <ul v-for="error in this.error" class="list-unstyled">
<li class="text-danger">{{ error }}</li> <li class="text-danger">{{ error }}</li>
</ul> </ul>
@@ -131,22 +139,17 @@ export default {
aSyncFunction: function (query, done) { aSyncFunction: function (query, done) {
axios.get(this.accountAutoCompleteURI + query) axios.get(this.accountAutoCompleteURI + query)
.then(res => { .then(res => {
// loop over data done(res.data);
let escapedData = [];
let current;
for (const key in res.data) {
if (res.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
current = res.data[key];
current.name_with_balance = this.escapeHtml(res.data[key].name_with_balance)
escapedData.push(current);
}
}
done(escapedData);
}) })
.catch(err => { .catch(err => {
// any error handler // any error handler
}) })
}, },
betterHighlight: function (item) {
var inputValue = this.$refs.input.value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
var escapedName = this.escapeHtml(item.name_with_balance);
return escapedName.replace(new RegExp(("" + inputValue), 'i'), '<b>$&</b>');
},
escapeHtml: function (string) { escapeHtml: function (string) {
let entityMap = { let entityMap = {