Mirror
/
codiad
mirror of https://github.com/xevidos/codiad.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'master' 

Fixed issue where settings would not load after update.

See merge request xevidos/codiad!23
This commit is contained in:
Isaac Brown 2019-01-15 11:02:30 -05:00
parent 00b1b56bee eb9d51e9be
commit 325f971572
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/editor/init.js
View File

@ -334,17 +334,18 @@
$.each( options, async function( idx, key ) { $.each( options, async function( idx, key ) {
let localValue = await codiad.settings.get_option( 'codiad.' + key ); let localValue = await codiad.settings.get_option( 'codiad.' + key );
if ( localValue !== null ) { if ( localValue != null ) {
_this.settings[key] = localValue; _this.settings[key.split('.').pop()] = localValue;
} }
}); });
$.each( bool_options, async function(idx, key) { $.each( bool_options, async function(idx, key) {
let localValue = await codiad.settings.get_option( 'codiad.' + key ); let localValue = await codiad.settings.get_option( 'codiad.' + key );
if ( localValue !== null ) { if ( localValue != null ) {
_this.settings[key] = (localValue == 'true').toString(); _this.settings[key.split('.').pop()] = (localValue == 'true');
} }
}); });
}, },

2
components/settings/init.js
View File

@ -187,7 +187,7 @@
let key = await $( item ).attr( 'data-setting' ); let key = await $( item ).attr( 'data-setting' );
let value = await codiad.settings.get_option( key ); let value = await codiad.settings.get_option( key );
console.log( key, value, i, $( item ).attr( 'data-setting' ) ); //console.log( key, value, i, $( item ).attr( 'data-setting' ) );
if ( value != null && value != undefined ) { if ( value != null && value != undefined ) {