From a86fe8a7f660f9ad6b03bcbdba623ae166f1ff44 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 15 Jun 2022 22:09:53 +0300 Subject: [PATCH] Refactoring show external message. [SSE] Show tip when link is copies --- apps/common/main/lib/component/Tooltip.js | 6 ++- .../main/lib/controller/ReviewChanges.js | 38 +------------------ .../main/app/controller/Main.js | 31 +++++++++------ .../main/app/controller/Main.js | 2 +- .../main/app/controller/DocumentHolder.js | 5 ++- .../main/app/controller/Main.js | 31 +++++++++------ apps/spreadsheeteditor/main/locale/en.json | 2 + 7 files changed, 53 insertions(+), 62 deletions(-) diff --git a/apps/common/main/lib/component/Tooltip.js b/apps/common/main/lib/component/Tooltip.js index 83d8f9c84..5d3a123dd 100644 --- a/apps/common/main/lib/component/Tooltip.js +++ b/apps/common/main/lib/component/Tooltip.js @@ -109,8 +109,12 @@ }); if (opts.hideonclick) { + var me = this; var tip = this.$element.data('bs.tooltip'); - if (tip) tip.tip().on('click', function() {tip.hide();}); + if (tip) tip.tip().on('click', function() { + tip.hide(); + me.trigger('tooltip:hideonclick', this); + }); } this.$element.on('shown.bs.tooltip', _.bind(this.onTipShown, this)); diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 64386ade3..8597fd11e 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -613,7 +613,8 @@ define([ this.view.turnChanges(state, global); if (userId && this.userCollection) { var rec = this.userCollection.findOriginalUser(userId); - rec && this.showTips(Common.Utils.String.format(globalFlag ? this.textOnGlobal : this.textOffGlobal, AscCommon.UserInfoParser.getParsedName(rec.get('username')))); + rec && Common.NotificationCenter.trigger('showmessage', {msg: Common.Utils.String.format(globalFlag ? this.textOnGlobal : this.textOffGlobal, AscCommon.UserInfoParser.getParsedName(rec.get('username')))}, + {timeout: 5000, hideCloseTip: true}); } } }, @@ -903,41 +904,6 @@ define([ me.appConfig.reviewHoverMode = val; }, - showTips: function(strings) { - var me = this; - if (!strings.length) return; - if (typeof(strings)!='object') strings = [strings]; - - function showNextTip() { - var str_tip = strings.shift(); - if (str_tip) { - me.tooltip.setTitle(str_tip); - me.tooltip.show(); - me.tipTimeout = setTimeout(function () { - me.tooltip.hide(); - }, 5000); - } - } - - if (!this.tooltip) { - this.tooltip = new Common.UI.Tooltip({ - owner: this.getApplication().getController('Toolbar').getView(), - hideonclick: true, - placement: 'bottom', - cls: 'main-info', - offset: 30 - }); - this.tooltip.on('tooltip:hide', function(cmp){ - if (cmp==me.tooltip) { - clearTimeout(me.tipTimeout); - setTimeout(showNextTip, 300); - } - }); - } - - showNextTip(); - }, - applySettings: function(menu) { this.view && this.view.turnSpelling( Common.localStorage.getBool(this.view.appPrefix + "settings-spellcheck", true) ); this.view && this.view.turnCoAuthMode( Common.localStorage.getBool(this.view.appPrefix + "settings-coauthmode", true) ); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 6515c7024..392e100bf 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1752,10 +1752,10 @@ define([ } }, - onExternalMessage: function(msg) { + onExternalMessage: function(msg, options) { if (msg && msg.msg) { msg.msg = (msg.msg).toString(); - this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]); + this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)], options); Common.component.Analytics.trackEvent('External Error'); } @@ -2043,17 +2043,30 @@ define([ this._state.isDisconnected = true; }, - showTips: function(strings) { + showTips: function(strings, options) { var me = this; if (!strings.length) return; if (typeof(strings)!='object') strings = [strings]; + function closeTip(cmp){ + me.tipTimeout && clearTimeout(me.tipTimeout); + setTimeout(showNextTip, 300); + } + function showNextTip() { var str_tip = strings.shift(); if (str_tip) { - str_tip += '\n' + me.textCloseTip; - tooltip.setTitle(str_tip); - tooltip.show(); + if (!(options && options.hideCloseTip)) + str_tip += '\n' + me.textCloseTip; + me.tooltip.setTitle(str_tip); + me.tooltip.show(); + me.tipTimeout && clearTimeout(me.tipTimeout); + if (options && options.timeout) { + me.tipTimeout = setTimeout(function () { + me.tooltip.hide(); + closeTip(); + }, options.timeout); + } } } @@ -2065,13 +2078,9 @@ define([ cls: 'main-info', offset: 30 }); + this.tooltip.on('tooltip:hideonclick',closeTip); } - var tooltip = this.tooltip; - tooltip.on('tooltip:hide', function(){ - setTimeout(showNextTip, 300); - }); - showNextTip(); }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 10b7f09e3..645b319e6 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1667,7 +1667,7 @@ define([ } var tooltip = this.tooltip; - tooltip.on('tooltip:hide', function(){ + tooltip.on('tooltip:hideonclick', function(){ setTimeout(showNextTip, 300); }); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index b0ab95032..be63a942a 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1179,7 +1179,7 @@ define([ var me = this; navigator.clipboard && navigator.clipboard.writeText(url) .then(function() { - console.log('OK'); + Common.NotificationCenter.trigger('showmessage', {msg: me.txtCopySuccess}, {timeout: 3000, hideCloseTip: true}); }) .catch(function(err) { console.log(err); @@ -4382,7 +4382,8 @@ define([ txtAllTableHint: 'Returns the entire contents of the table or specified table columns including column headers, data and total rows', txtDataTableHint: 'Returns the data cells of the table or specified table columns', txtHeadersTableHint: 'Returns the column headers for the table or specified table columns', - txtTotalsTableHint: 'Returns the total rows for the table or specified table columns' + txtTotalsTableHint: 'Returns the total rows for the table or specified table columns', + txtCopySuccess: 'Link copied to the clipboard' }, SSE.Controllers.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 275aa3f6c..f132fa985 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1523,10 +1523,10 @@ define([ } }, - onExternalMessage: function(msg) { + onExternalMessage: function(msg, options) { if (msg && msg.msg) { msg.msg = (msg.msg).toString(); - this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]); + this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)], options); Common.component.Analytics.trackEvent('External Error'); } @@ -2009,17 +2009,30 @@ define([ this._state.isDisconnected = true; }, - showTips: function(strings) { + showTips: function(strings, options) { var me = this; if (!strings.length) return; if (typeof(strings)!='object') strings = [strings]; + function closeTip(cmp){ + me.tipTimeout && clearTimeout(me.tipTimeout); + setTimeout(showNextTip, 300); + } + function showNextTip() { var str_tip = strings.shift(); if (str_tip) { - str_tip += '\n' + me.textCloseTip; - tooltip.setTitle(str_tip); - tooltip.show(); + if (!(options && options.hideCloseTip)) + str_tip += '\n' + me.textCloseTip; + me.tooltip.setTitle(str_tip); + me.tooltip.show(); + me.tipTimeout && clearTimeout(me.tipTimeout); + if (options && options.timeout) { + me.tipTimeout = setTimeout(function () { + me.tooltip.hide(); + closeTip(); + }, options.timeout); + } } } @@ -2031,13 +2044,9 @@ define([ cls: 'main-info', offset: 30 }); + this.tooltip.on('tooltip:hideonclick',closeTip); } - var tooltip = this.tooltip; - tooltip.on('tooltip:hide', function(){ - setTimeout(showNextTip, 300); - }); - showNextTip(); }, diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index da990f93b..b02d7d009 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -645,6 +645,7 @@ "SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard", "SSE.Controllers.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?", "SSE.Controllers.DocumentHolder.txtWidth": "Width", + "SSE.Controllers.DocumentHolder.txtCopySuccess": "Link copied to the clipboard", "SSE.Controllers.FormulaDialog.sCategoryAll": "All", "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube", "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database", @@ -2051,6 +2052,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.txtGetLink": "Get link to this range", "SSE.Views.FieldSettingsDialog.strLayout": "Layout", "SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals", "SSE.Views.FieldSettingsDialog.textReport": "Report Form",