[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/js

[Tor Lillqvist (via logerrit)]

 loleaflet/js/w2ui-1.5.rc1.js |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b95a22a740bccbd50d6cf49ad0b5fdbd1d489a90
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 18 19:02:16 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Oct 18 18:21:15 2019 +0200

    tdf#126973: Don't do anything in the tooltip show and hide functions on iOS
    
    I have no understanding of what this code does and how it works but
    this seems to fix the problem described in the bug.
    
    Change-Id: I7188745b5c77d9e065828336b7dd6524aedc1dce
    Reviewed-on: https://gerrit.libreoffice.org/81079
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index fbbcc3d63..9d6820e3d 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -9203,6 +9203,7 @@ w2utils.event = {
         },
 
         columnTooltipShow: function (ind) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.columnTooltip == 'normal') return;
             var $el  = $(this.box).find('#grid_'+ this.name + '_column_'+ ind);
             var item = this.columns[ind];
@@ -9218,6 +9219,7 @@ w2utils.event = {
         },
 
         columnTooltipHide: function (ind) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.columnTooltip == 'normal') return;
             var $el  = $(this.box).find('#grid_'+ this.name + '_column_'+ ind);
             var item = this.columns[ind];
@@ -12912,6 +12914,7 @@ var w2prompt = function (label, title, callBack) {
         },
 
         tooltipShow: function (id, event, forceRefresh) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.tooltip == null) return;
             var $el  = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id));
             var item = this.get(id);
@@ -12932,6 +12935,7 @@ var w2prompt = function (label, title, callBack) {
         },
 
         tooltipHide: function (id) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.tooltip == null) return;
             var $el  = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id));
             var item = this.get(id);
@@ -13897,6 +13901,7 @@ var w2prompt = function (label, title, callBack) {
         },
 
         tooltipShow: function (id, event, forceRefresh) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.tooltip == null) return;
             var $el  = $(this.box).find('#tb_'+ this.name + '_item_'+ w2utils.escapeId(id));
             var item = this.get(id);
@@ -13918,6 +13923,7 @@ var w2prompt = function (label, title, callBack) {
         },
 
         tooltipHide: function (id, event) {
+            if (window.ThisIsTheiOSApp) return;
             if (this.tooltip == null) return;
             var $el  = $(this.box).find('#tb_'+ this.name + '_item_'+ w2utils.escapeId(id));
             var item = this.get(id);