From f7c7563f5ee7eaeba1ba45d13fdf1f3824104aaa Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sat, 7 Oct 2017 10:34:02 -0500 Subject: [PATCH] Theme URL check --- src/Styles.js | 28 ++++++++++++++++++---------- src/lib/sync.js | 2 -- src/screens/Abstract.js | 2 -- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/Styles.js b/src/Styles.js index c6821f40..1534bd3f 100644 --- a/src/Styles.js +++ b/src/Styles.js @@ -153,7 +153,24 @@ export default class GlobalStyles { } async downloadTheme(theme, callback) { + let errorBlock = (error) => { + if(!theme.notAvailableOnMobile) { + theme.notAvailableOnMobile = true; + theme.setDirty(true); + } + + callback && callback(); + + console.error("Theme download error", error); + } + + if(!theme.url) { + errorBlock(null); + return; + } + var url; + if(theme.url.includes("?")) { url = theme.url.replace("?", ".json?"); } else { @@ -180,16 +197,7 @@ export default class GlobalStyles { callback(); } }, function(response) { - // error - if(!theme.notAvailableOnMobile) { - theme.notAvailableOnMobile = true; - theme.setDirty(true); - } - if(callback) { - callback(); - } - - console.log("Theme download error", response); + errorBlock(response); }) } diff --git a/src/lib/sync.js b/src/lib/sync.js index 4a62e737..d20b522b 100644 --- a/src/lib/sync.js +++ b/src/lib/sync.js @@ -66,8 +66,6 @@ export default class Sync { this.dataLoaded = true; - console.log("Sync: Local Data Loaded"); - this.dataLoadObservers.forEach(function(observer){ observer.callback(); }) diff --git a/src/screens/Abstract.js b/src/screens/Abstract.js index a0376f59..02acac92 100644 --- a/src/screens/Abstract.js +++ b/src/screens/Abstract.js @@ -31,7 +31,6 @@ export default class Abstract extends Component { } lockContent() { - console.log("Locking Content"); this.mergeState({lockContent: true}); this.configureNavBar(); } @@ -40,7 +39,6 @@ export default class Abstract extends Component { if(!this.loadedInitialState) { this.loadInitialState(); } - console.log("Unlocking Content"); this.mergeState({lockContent: false}); }