Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 59430

Browse source
This commit is contained in:
Julia Radzhabova 2022-12-12 15:48:38 +03:00
parent 220f178f2b
commit 191805b342
3 changed files with 60 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -2202,16 +2202,17 @@ define([
this.iFrame.frameBorder = "0"; this.iFrame.frameBorder = "0";
this.iFrame.width = "100%"; this.iFrame.width = "100%";
this.iFrame.height = "100%"; this.iFrame.height = "100%";
if (Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)
this.iFrame.onload = function() {
try {
me.findUrl(me.iFrame.contentWindow.location.href);
} catch (e) {
}
};
Common.Gateway.on('internalcommand', function(data) { Common.Gateway.on('internalcommand', function(data) {
if (data.type == 'help:hyperlink') { if (data.type == 'help:hyperlink') {
var src = data.data; me.findUrl(data.data);
var rec = me.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>0);
});
if (rec) {
me.viewHelpPicker.selectRecord(rec, true);
me.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });
@ -2274,13 +2275,7 @@ define([
} }
if (url) { if (url) {
if (this.viewHelpPicker.store.length>0) { if (this.viewHelpPicker.store.length>0) {
var rec = this.viewHelpPicker.store.find(function(record){ this.findUrl(url);
return (url.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
this.onSelectItem(url); this.onSelectItem(url);
} else } else
this.openUrl = url; this.openUrl = url;
@ -2289,6 +2284,16 @@ define([
onSelectItem: function(src) { onSelectItem: function(src) {
this.iFrame.src = this.urlPref + src; this.iFrame.src = this.urlPref + src;
},
findUrl: function(src) {
var rec = this.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });

35
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -1679,16 +1679,17 @@ define([
this.iFrame.frameBorder = "0"; this.iFrame.frameBorder = "0";
this.iFrame.width = "100%"; this.iFrame.width = "100%";
this.iFrame.height = "100%"; this.iFrame.height = "100%";
if (Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)
this.iFrame.onload = function() {
try {
me.findUrl(me.iFrame.contentWindow.location.href);
} catch (e) {
}
};
Common.Gateway.on('internalcommand', function(data) { Common.Gateway.on('internalcommand', function(data) {
if (data.type == 'help:hyperlink') { if (data.type == 'help:hyperlink') {
var src = data.data; me.findUrl(data.data);
var rec = me.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>0);
});
if (rec) {
me.viewHelpPicker.selectRecord(rec, true);
me.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });
@ -1751,13 +1752,7 @@ define([
} }
if (url) { if (url) {
if (this.viewHelpPicker.store.length>0) { if (this.viewHelpPicker.store.length>0) {
var rec = this.viewHelpPicker.store.find(function(record){ this.findUrl(url);
return (url.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
this.onSelectItem(url); this.onSelectItem(url);
} else } else
this.openUrl = url; this.openUrl = url;
@ -1766,6 +1761,16 @@ define([
onSelectItem: function(src) { onSelectItem: function(src) {
this.iFrame.src = this.urlPref + src; this.iFrame.src = this.urlPref + src;
},
findUrl: function(src) {
var rec = this.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });

35
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -2070,16 +2070,17 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
this.iFrame.frameBorder = "0"; this.iFrame.frameBorder = "0";
this.iFrame.width = "100%"; this.iFrame.width = "100%";
this.iFrame.height = "100%"; this.iFrame.height = "100%";
if (Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)
this.iFrame.onload = function() {
try {
me.findUrl(me.iFrame.contentWindow.location.href);
} catch (e) {
}
};
Common.Gateway.on('internalcommand', function(data) { Common.Gateway.on('internalcommand', function(data) {
if (data.type == 'help:hyperlink') { if (data.type == 'help:hyperlink') {
var src = data.data; me.findUrl(data.data);
var rec = me.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>0);
});
if (rec) {
me.viewHelpPicker.selectRecord(rec, true);
me.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });
@ -2142,13 +2143,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
} }
if (url) { if (url) {
if (this.viewHelpPicker.store.length>0) { if (this.viewHelpPicker.store.length>0) {
var rec = this.viewHelpPicker.store.find(function(record){ this.findUrl(url);
return (url.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
this.onSelectItem(url); this.onSelectItem(url);
} else } else
this.openUrl = url; this.openUrl = url;
@ -2157,6 +2152,16 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
onSelectItem: function(src) { onSelectItem: function(src) {
this.iFrame.src = this.urlPref + src; this.iFrame.src = this.urlPref + src;
},
findUrl: function(src) {
var rec = this.viewHelpPicker.store.find(function(record){
return (src.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
} }
}); });