diff --git a/src/vue-poc/components/qd-confirm.vue b/src/vue-poc/components/qd-confirm.vue index 7a623b4..4e96916 100644 --- a/src/vue-poc/components/qd-confirm.vue +++ b/src/vue-poc/components/qd-confirm.vue @@ -3,24 +3,24 @@ ok cancel dialog --> diff --git a/src/vue-poc/components/vue-ace.vue b/src/vue-poc/components/vue-ace.vue index b9d7d39..aced17d 100644 --- a/src/vue-poc/components/vue-ace.vue +++ b/src/vue-poc/components/vue-ace.vue @@ -45,7 +45,7 @@ ace editor for vue.js var session=this.editor.getSession() session.setUseWrapMode(value) }, - 'settings' (value) { + 'setting' (value) { console.log("--settings--",value) this.applySettings(value) } @@ -69,7 +69,7 @@ ace editor for vue.js }, applySettings(aceSettings){ - console.log("apply: ",aceSettings) + console.log("apply: ",aceSettings.theme) this.editor.setTheme(`ace/theme/${aceSettings.theme}`) //this.editor.setKeyboardHandler(`ace/keyboard//${aceSettings.keybinding}`) this.editor.setFontSize(parseInt(aceSettings.fontsize,10)) @@ -122,7 +122,7 @@ ace editor for vue.js } } //console.log(this.annots) - this.$emit('annotation',this.annots) + this.$emit('annotation',{error: this.annots["error"]+0, warning: this.annots["warning"]+0}) }); if(this.events){ this.events.$on('eventFired', (cmd) => { diff --git a/src/vue-poc/core.js b/src/vue-poc/core.js index 99cad47..67d3ebb 100644 --- a/src/vue-poc/core.js +++ b/src/vue-poc/core.js @@ -83,7 +83,22 @@ var settings = { } }; +// error help +// https://stackoverflow.com/questions/18391212/is-it-not-possible-to-stringify-an-error-using-json-stringify/18391400#18391400 +if (!('toJSON' in Error.prototype)) + Object.defineProperty(Error.prototype, 'toJSON', { + value: function () { + var alt = {}; + Object.getOwnPropertyNames(this).forEach(function (key) { + alt[key] = this[key]; + }, this); + + return alt; + }, + configurable: true, + writable: true + }); //Returns a function, that, as long as it continues to be invoked, will not //be triggered. The function will be called after it stops being called for diff --git a/src/vue-poc/features/adminlog/logs.vue b/src/vue-poc/features/adminlog/logs.vue index 591315b..b64fc9a 100644 --- a/src/vue-poc/features/adminlog/logs.vue +++ b/src/vue-poc/features/adminlog/logs.vue @@ -2,9 +2,9 @@ diff --git a/src/vue-poc/features/eval/eval.vue b/src/vue-poc/features/eval/eval.vue index 2603f35..5de1775 100644 --- a/src/vue-poc/features/eval/eval.vue +++ b/src/vue-poc/features/eval/eval.vue @@ -32,7 +32,7 @@ label Namespaces - more_vert + more_vert Show query plan diff --git a/src/vue-poc/features/images/dates.vue b/src/vue-poc/features/images/dates.vue index e981449..38f6e8b 100644 --- a/src/vue-poc/features/images/dates.vue +++ b/src/vue-poc/features/images/dates.vue @@ -22,7 +22,7 @@ :key="year.year"> {{m}} + :key="i">{{m}} diff --git a/src/vue-poc/features/images/images.vue b/src/vue-poc/features/images/images.vue index e7a9194..2db0db2 100644 --- a/src/vue-poc/features/images/images.vue +++ b/src/vue-poc/features/images/images.vue @@ -21,10 +21,10 @@ {{ total }} in {{ elapsed | round(2) }} secs Page:{{ query.page+1 }} - + arrow_back - + arrow_forward @@ -39,23 +39,31 @@ > - - - - - favorite + height="80px" contain> + + + check_circle + + + + + + # + + place - - bookmark + + + info + + share - - + @@ -84,9 +92,6 @@ - - closeClear keyword - @@ -138,8 +143,8 @@ @@ -152,7 +157,7 @@ - Apply + Apply diff --git a/src/vue-poc/features/images/keywords.vue b/src/vue-poc/features/images/keywords.vue index 343517c..e71bdf9 100644 --- a/src/vue-poc/features/images/keywords.vue +++ b/src/vue-poc/features/images/keywords.vue @@ -19,12 +19,12 @@ - - + diff --git a/src/vue-poc/features/job/job.vue b/src/vue-poc/features/job/job.vue index 2e68446..c4e7cf6 100644 --- a/src/vue-poc/features/job/job.vue +++ b/src/vue-poc/features/job/job.vue @@ -1,7 +1,7 @@