From 91db93633dfc941b2cee5d3e839be2354ba6ac6d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 11 Oct 2017 22:25:57 +0100 Subject: [PATCH] vuetify 0.16.5 + settings --- src/vue-poc/components/vue-ace.vue | 9 +- src/vue-poc/core.js | 31 +++--- src/vue-poc/features/settings/acesettings.vue | 33 +++---- src/vue-poc/features/settings/settings.vue | 2 +- src/vue-poc/static/app-gen.js | 97 +++++++++---------- src/vue-poc/static/app.html | 4 +- src/vue-poc/vue-poc.vue | 2 +- 7 files changed, 86 insertions(+), 92 deletions(-) diff --git a/src/vue-poc/components/vue-ace.vue b/src/vue-poc/components/vue-ace.vue index aced17d..2913eb2 100644 --- a/src/vue-poc/components/vue-ace.vue +++ b/src/vue-poc/components/vue-ace.vue @@ -45,9 +45,12 @@ ace editor for vue.js var session=this.editor.getSession() session.setUseWrapMode(value) }, - 'setting' (value) { - console.log("--settings--",value) - this.applySettings(value) + "settings":{ + handler:function(vnew,vold){ + this.applySettings(vnew) + // alert("setting") + }, + deep:true } }, methods:{ diff --git a/src/vue-poc/core.js b/src/vue-poc/core.js index 67d3ebb..e549e87 100644 --- a/src/vue-poc/core.js +++ b/src/vue-poc/core.js @@ -50,30 +50,27 @@ var settings = { debug: false, getItem (key) { if (this.debug) console.log('getItem',key); - return new Promise((resolve, reject) => { - localforage.getItem(key) - .then((value) => { - //console.log('GET setting', key,value); - resolve(value) - }).catch((err) => { + return localforage.getItem(key) + .then(value => { + console.log('GET setting', key,value); + return value; + + }).catch(err => { console.log('GET failed'); - reject(err) - }); + }); }, setItem (key,value) { if (this.debug) console.log('setItem',key,value); - return new Promise((resolve, reject) => { - localforage.setItem(key, value) - .then((value) => { - //console.log('SET ',key, value); - return new Promise((resolve, reject) => {resolve(value);}) - }).catch((err) => { + return localforage.setItem(key, value) + .then(value => { + console.log('SET ',key, value); + return value + + }).catch(err => { console.log('set failed'); - return new Promise((resolve, reject) => {reject(err);}) }); - }) -}, + }, keys(){ return localforage.keys() // returns array of keys diff --git a/src/vue-poc/features/settings/acesettings.vue b/src/vue-poc/features/settings/acesettings.vue index bb3edff..b6bfa2a 100644 --- a/src/vue-poc/features/settings/acesettings.vue +++ b/src/vue-poc/features/settings/acesettings.vue @@ -96,7 +96,7 @@ diff --git a/src/vue-poc/features/settings/settings.vue b/src/vue-poc/features/settings/settings.vue index ba6de3e..be870f9 100644 --- a/src/vue-poc/features/settings/settings.vue +++ b/src/vue-poc/features/settings/settings.vue @@ -24,7 +24,7 @@ - Wipe + Wipe diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js index 3eede55..715d63a 100644 --- a/src/vue-poc/static/app-gen.js +++ b/src/vue-poc/static/app-gen.js @@ -1,4 +1,4 @@ -// generated 2017-10-09T10:18:05.74+01:00 +// generated 2017-10-11T22:21:45.072+01:00 Vue.component('qd-confirm',{template:` @@ -203,9 +203,12 @@ var session=this.editor.getSession() session.setUseWrapMode(value) }, - 'setting' (value) { - console.log("--settings--",value) - this.applySettings(value) + "settings":{ + handler:function(vnew,vold){ + this.applySettings(vnew) + // alert("setting") + }, + deep:true } }, methods:{ @@ -385,8 +388,8 @@ Vue.filter('round', function(value, decimals) { const Log=Vue.extend({template:` - - + + refresh @@ -1771,7 +1774,7 @@ people ); const Job=Vue.extend({template:` - + arrow_back {{ job }} @@ -1790,7 +1793,7 @@ people timer {{ jobstate.duration }} - + refresh @@ -1849,14 +1852,14 @@ people ); const Jobs=Vue.extend({template:` - + Stop - + {{ autorefresh?'refresh':'arrow_downward' }} @@ -2025,7 +2028,7 @@ people const Ping=Vue.extend({template:` - + Simple performance measure Reset @@ -2259,7 +2262,7 @@ people const Repo=Vue.extend({template:` - + @@ -2609,7 +2612,7 @@ people data () { return { - xace: { + ace: { enableSnippets: true, enableBasicAutocompletion: true, enableLiveAutocompletion: true, @@ -2617,7 +2620,6 @@ people keybinding: "ace", fontsize: "14" }, - ace: {}, keybindings:[ 'ace', 'vim', 'emacs', 'textarea', 'sublime' ], themes: [ "github", "chaos","tomorrow"] } @@ -2628,26 +2630,24 @@ people return obj; } }, - beforeRouteEnter (to, from, next) { - settings.getItem('settings/ace') - .then( v =>{ - next(vm => { vm.ace = v?v:vm.xace; }) - }) - }, - + beforeRouteLeave (to, from, next) { + settings.setItem('settings/ace',this.ace) + .then(v=>{ + next() + }) + }, mounted: function () { - // console.log(this.ace,this.xace) - // this.extend(this.storeace,this.storeace); + // console.log("$$$",this.ace) - }, - watch: {"ace":{ - handler:function(v){ - settings.setItem('settings/ace',this.ace) - }, - deep:true + settings.getItem('settings/ace') + .then( v =>{ + //alert("db\n"+JSON.stringify(v)) + this.ace = Object.assign({}, this.ace, v) + //alert("op\n"+JSON.stringify(this.ace)) + }) + } } -} ); @@ -2676,7 +2676,7 @@ people - Wipe + Wipe `, @@ -3160,7 +3160,7 @@ created(){ const Users=Vue.extend({template:` - + @@ -3406,7 +3406,7 @@ router.beforeEach((to, from, next) => { - + @@ -3666,30 +3666,27 @@ var settings = { debug: false, getItem (key) { if (this.debug) console.log('getItem',key); - return new Promise((resolve, reject) => { - localforage.getItem(key) - .then((value) => { - //console.log('GET setting', key,value); - resolve(value) - }).catch((err) => { + return localforage.getItem(key) + .then(value => { + console.log('GET setting', key,value); + return value; + + }).catch(err => { console.log('GET failed'); - reject(err) - }); + }); }, setItem (key,value) { if (this.debug) console.log('setItem',key,value); - return new Promise((resolve, reject) => { - localforage.setItem(key, value) - .then((value) => { - //console.log('SET ',key, value); - return new Promise((resolve, reject) => {resolve(value);}) - }).catch((err) => { + return localforage.setItem(key, value) + .then(value => { + console.log('SET ',key, value); + return value + + }).catch(err => { console.log('set failed'); - return new Promise((resolve, reject) => {reject(err);}) }); - }) -}, + }, keys(){ return localforage.keys() // returns array of keys diff --git a/src/vue-poc/static/app.html b/src/vue-poc/static/app.html index 5fb8b50..1561e36 100644 --- a/src/vue-poc/static/app.html +++ b/src/vue-poc/static/app.html @@ -9,7 +9,7 @@ Vue Router Test - + - + diff --git a/src/vue-poc/vue-poc.vue b/src/vue-poc/vue-poc.vue index eaaabb9..f1db8a2 100644 --- a/src/vue-poc/vue-poc.vue +++ b/src/vue-poc/vue-poc.vue @@ -21,7 +21,7 @@ + :disable-route-watcher="true" :enable-resize-watcher="true">