@tolgee/core 4.6.0 → 4.6.1-rc.c466f12.0

package/dist/tolgee.umd.js

@@ -532,9 +532,9 @@
                             return [4 /*yield*/, this.fetchPromises[lang]];
                         case 1:
                             _a.sent();
+                            this.eventService.LANGUAGE_LOADED.emit(lang);
                             _a.label = 2;
                         case 2:
-                            this.eventService.LANGUAGE_LOADED.emit(lang);
                             this.fetchPromises[lang] = undefined;
                             return [2 /*return*/, this.translationsCache.get(lang)];
                     }
@@ -696,8 +696,11 @@
         };
         TranslationService.prototype.getFromCacheOrFallback = function (key, lang, defaultValue) {
             if (lang === void 0) { lang = this.properties.currentLanguage; }
-            var message = this.getFromCache(key, lang) ||
-                this.getFromCache(key, this.properties.config.fallbackLanguage);
+            var fallbackLang = this.properties.config.fallbackLanguage;
+            var message = this.getFromCache(key, lang) || this.getFromCache(key, fallbackLang);
+            if (!message && (!this.isLoaded(lang) || !this.isLoaded(fallbackLang))) {
+                return undefined;
+            }
             return TranslationService.translationByValue(message, defaultValue);
         };
         TranslationService.prototype.isFetchNeeded = function (lang) {
@@ -706,6 +709,9 @@
             var devFetched = Boolean(this.fetchedDev[lang]);
             return (isDevMode && !devFetched) || !dataPresent;
         };
+        TranslationService.prototype.isLoaded = function (lang) {
+            return this.translationsCache.get(lang) !== undefined;
+        };
         TranslationService.prototype.fetchTranslations = function (lang) {
             return __awaiter(this, void 0, void 0, function () {
                 var isDevMode;
@@ -1789,7 +1795,7 @@
             this.handshake = function () {
                 var sharedConfiguration = __assign(__assign({}, _this.properties), { config: __assign(__assign({}, _this.properties.config), { 
                         //remove properties, which cannot be sent by window.postMessage
-                        staticData: undefined, targetElement: undefined, _targetElement: undefined, ui: undefined }), uiPresent: Boolean(_this.properties.config.ui), uiVersion: "4.6.0" });
+                        staticData: undefined, targetElement: undefined, _targetElement: undefined, ui: undefined }), uiPresent: Boolean(_this.properties.config.ui), uiVersion: "4.6.1-rc.c466f12.0" });
                 var timer = null;
                 var ping = function () {
                     _this.messages.send('TOLGEE_READY', sharedConfiguration);
@@ -2011,6 +2017,9 @@
             var restrictedElements = this.properties.config.restrictedElements;
             return nodes.filter(function (n) {
                 var e = NodeHelper.closestElement(n);
+                if (!e) {
+                    return false;
+                }
                 return (restrictedElements.indexOf(e.tagName.toLowerCase()) === -1 &&
                     e.closest("[".concat(RESTRICTED_ASCENDANT_ATTRIBUTE, "=\"true\"]")) === null);
             });
@@ -3064,7 +3073,7 @@
         });
         Object.defineProperty(Tolgee.prototype, "onLangLoaded", {
             /**
-             * Is emitted when language is changed and loaded (including initial load)
+             * Is emitted when language is loaded for the first time
              */
             get: function () {
                 return this.dependencyService.eventService.LANGUAGE_LOADED;