diff --git a/app/imports/ui/components/global/SmartInputMixin.js b/app/imports/ui/components/global/SmartInputMixin.js
index 7b8d63c0..5df4f5b2 100644
--- a/app/imports/ui/components/global/SmartInputMixin.js
+++ b/app/imports/ui/components/global/SmartInputMixin.js
@@ -26,6 +26,10 @@ export default {
value: [String, Number, Date, Array, Object, Boolean],
errorMessages: [String, Array],
disabled: Boolean,
+ debounce: {
+ type: Number,
+ default: undefined,
+ },
},
watch: {
focused(newFocus){
@@ -113,7 +117,9 @@ export default {
return this.context.editPermission === false || this.disabled;
},
debounceTime() {
- if (Number.isFinite(this.context.debounceTime)){
+ if (Number.isFinite(this.debounce)){
+ return this.debounce;
+ } else if (Number.isFinite(this.context.debounceTime)){
return this.context.debounceTime;
} else {
return 750;
diff --git a/app/imports/ui/components/global/TextField.vue b/app/imports/ui/components/global/TextField.vue
index 5f8b79c3..337543e8 100644
--- a/app/imports/ui/components/global/TextField.vue
+++ b/app/imports/ui/components/global/TextField.vue
@@ -6,7 +6,7 @@
:error-messages="errors"
:value="safeValue"
:disabled="isDisabled"
- box
+ :box="!regular"
@input="input"
@focus="focused = true"
@blur="focused = false"
@@ -18,5 +18,8 @@
export default {
mixins: [SmartInput],
+ props: {
+ regular: Boolean,
+ },
};
diff --git a/app/imports/ui/dialogStack/DialogStack.vue b/app/imports/ui/dialogStack/DialogStack.vue
index fd8fb680..0a807e6b 100644
--- a/app/imports/ui/dialogStack/DialogStack.vue
+++ b/app/imports/ui/dialogStack/DialogStack.vue
@@ -42,8 +42,6 @@
diff --git a/app/imports/ui/properties/components/spells/SpellListTile.vue b/app/imports/ui/properties/components/spells/SpellListTile.vue
index 977b9f53..61c777d4 100644
--- a/app/imports/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/ui/properties/components/spells/SpellListTile.vue
@@ -33,6 +33,16 @@
>
drag_indicator
+
+ info
+
@@ -46,6 +56,7 @@ export default {
props: {
preparingSpells: Boolean,
hideHandle: Boolean,
+ showInfoButton: Boolean,
},
computed: {
hasClickListener(){
@@ -86,4 +97,7 @@ export default {
.primary--text .v-icon, .primary--text .v-list__tile__sub-title {
color: #b71c1c
}
+.theme--light.info-icon{
+ color: rgba(0,0,0,.54) !important;
+}
diff --git a/app/imports/ui/utility/escapeRegex.js b/app/imports/ui/utility/escapeRegex.js
new file mode 100644
index 00000000..8ed9c0b9
--- /dev/null
+++ b/app/imports/ui/utility/escapeRegex.js
@@ -0,0 +1,3 @@
+RegExp.escape = function(s) {
+ return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+};