diff --git a/src/LiveDevelopment/main.js b/src/LiveDevelopment/main.js index 6d9ba333a..ae3069b37 100644 --- a/src/LiveDevelopment/main.js +++ b/src/LiveDevelopment/main.js @@ -53,6 +53,7 @@ define(function main(require, exports, module) { // this will later be assigned its correct values once entitlementsManager loads let hasLiveEditCapability = false; let isPaidUser = false; + let isLoggedIn = false; const PREFERENCE_LIVE_PREVIEW_MODE = CONSTANTS.PREFERENCE_LIVE_PREVIEW_MODE; @@ -98,6 +99,7 @@ define(function main(require, exports, module) { showRulerLines: false, // default value, this will get updated when the extension loads imageGalleryState: _getImageGalleryState(), // image gallery selected state isPaidUser: false, // will be updated when we fetch entitlements + isLoggedIn: false, // will be updated when we fetch entitlements hasLiveEditCapability: false // handled inside _liveEditCapabilityChanged function }; @@ -259,6 +261,15 @@ define(function main(require, exports, module) { } } + function _isLoggedInChanged(newStatus) { + if(newStatus !== isLoggedIn){ + isLoggedIn = newStatus; + const config = MultiBrowserLiveDev.getConfig(); + config.isLoggedIn = isLoggedIn; + MultiBrowserLiveDev.updateConfig(config); + } + } + function setMode(mode) { if (mode === LIVE_EDIT_MODE && !hasLiveEditCapability) { return false; @@ -346,6 +357,7 @@ define(function main(require, exports, module) { // private api exports._liveEditCapabilityChanged = _liveEditCapabilityChanged; exports._isPaidUserChanged = _isPaidUserChanged; + exports._isLoggedInChanged = _isLoggedInChanged; // public events exports.EVENT_OPEN_PREVIEW_URL = MultiBrowserLiveDev.EVENT_OPEN_PREVIEW_URL; diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 9e33fd861..7b0be0991 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -197,7 +197,7 @@ define({ "LIVE_DEV_MORE_OPTIONS_CUT": "Cut", "LIVE_DEV_MORE_OPTIONS_COPY": "Copy", "LIVE_DEV_MORE_OPTIONS_PASTE": "Paste", - "LIVE_DEV_IMAGE_GALLERY_USE_IMAGE": "Use this image", + "LIVE_DEV_IMAGE_GALLERY_USE_IMAGE": "Download image", "LIVE_DEV_IMAGE_GALLERY_SELECT_DOWNLOAD_FOLDER": "Choose image download folder", "LIVE_DEV_IMAGE_GALLERY_SEARCH_PLACEHOLDER": "Search images\u2026", "LIVE_DEV_IMAGE_GALLERY_SEARCH_BUTTON": "Search", @@ -213,6 +213,11 @@ define({ "LIVE_DEV_IMAGE_GALLERY_OFFLINE_RETRY": "Retry", "LIVE_DEV_IMAGE_GALLERY_CHECKING_CONNECTION": "Checking connection", "LIVE_DEV_IMAGE_GALLERY_STILL_OFFLINE": "Still offline. Please check your connection.", + "LIVE_DEV_IMAGE_GALLERY_SELECT_SIZE": "Select image size", + "LIVE_DEV_IMAGE_GALLERY_SIZE_CARD": "Card 400px", + "LIVE_DEV_IMAGE_GALLERY_SIZE_HERO": "Hero 1080px", + "LIVE_DEV_IMAGE_GALLERY_SIZE_RETINA": "Retina 2200px", + "LIVE_DEV_IMAGE_GALLERY_ATTRIBUTION_ON": "on", "LIVE_DEV_TOAST_NOT_EDITABLE": "Element not editable - generated by script", "LIVE_DEV_COPY_TOAST_MESSAGE": "Element copied. Use 'Paste' to add it below the selected element", "LIVE_DEV_TOAST_FIXED_ELEMENT_DISMISSED": "Element doesn't scroll with page - edit boxes hidden", diff --git a/tracking-repos.json b/tracking-repos.json index c949227ec..dcc6cd8ce 100644 --- a/tracking-repos.json +++ b/tracking-repos.json @@ -1,5 +1,5 @@ { "phoenixPro": { - "commitID": "a0025cb1df45c5631454eb4f98d75284e240378a" + "commitID": "ef3d7518e411d9ca6c9938af2bc0d5cd8d791e34" } }