From 1f15df4fee742d6d70b87cd189ca660ff5768d27 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 24 May 2022 00:13:42 +0300 Subject: [PATCH] [desktop] connection hints with app --- apps/common/main/lib/controller/Desktop.js | 15 ++++++++++++--- apps/common/main/lib/controller/HintManager.js | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index fe43614493..34041768c4 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -137,6 +137,10 @@ define([ if (!!_mr[1]) $('#app-title').show(); else if (!!_mr[2]) $('#app-title').hide(); } + } else + if (/althints:show/.test(cmd)) { + if ( param == /false|hide/.test(param) ) + Common.NotificationCenter.trigger('hints:clear'); } }; @@ -187,6 +191,10 @@ define([ } }; + var _onHintsShow = function (visible, level) { + native.execCommand('althints:show', JSON.stringify(visible && !(level > 0))); + } + return { init: function (opts) { _.extend(config, opts); @@ -256,12 +264,13 @@ define([ Common.NotificationCenter.on({ 'modal:show': _onModalDialog.bind(this, 'open'), - 'modal:close': _onModalDialog.bind(this, 'close') - , 'uitheme:changed' : function (name) { + 'modal:close': _onModalDialog.bind(this, 'close'), + 'uitheme:changed' : function (name) { var theme = Common.UI.Themes.get(name); if ( theme ) native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type})); - } + }, + 'hints:show': _onHintsShow.bind(this), }); webapp.addListeners({ diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index 08b9b5240b..81299f97d4 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -171,6 +171,8 @@ Common.UI.HintManager = new(function() { } else { _hintVisible = false; } + + Common.NotificationCenter.trigger('hints:show', _hintVisible, _currentLevel); }; var _hideHints = function() { @@ -179,6 +181,8 @@ Common.UI.HintManager = new(function() { item.remove() }); clearInterval(_inputTimer); + + Common.NotificationCenter.trigger('hints:show', false); }; var _nextLevel = function(level) {