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

[DE] Bug 44511 (open anchor-link in help panel)

Browse source
This commit is contained in:
Julia Radzhabova 2020-08-24 16:45:30 +03:00
parent 73c8b3114d
commit 86a589a351
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -2241,7 +2241,7 @@ define([
}); });
win.$window.find('#id-equation-convert-help').on('click', function (e) { win.$window.find('#id-equation-convert-help').on('click', function (e) {
win && win.close(); win && win.close();
me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm'); me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm#convertequation');
}) })
}, },

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

@ -1529,7 +1529,7 @@ define([
}); });
this.viewHelpPicker.on('item:select', function(dataview, itemview, record) { this.viewHelpPicker.on('item:select', function(dataview, itemview, record) {
me.iFrame.src = me.urlPref + record.get('src'); me.onSelectItem(record.get('src'));
}); });
this.iFrame = document.createElement('iframe'); this.iFrame = document.createElement('iframe');
@ -1575,10 +1575,14 @@ define([
} }
}, },
success: function () { success: function () {
var rec = (me.openUrl) ? store.findWhere({ src: me.openUrl }) || store.at(0) : store.at(0); var rec = me.openUrl ? store.find(function(record){
me.viewHelpPicker.selectRecord(rec); return (me.openUrl.indexOf(record.get('src'))>=0);
me.viewHelpPicker.scrollToRecord(rec); }) : store.at(0);
me.iFrame.src = me.urlPref + rec.get('src'); if (rec) {
me.viewHelpPicker.selectRecord(rec, true);
me.viewHelpPicker.scrollToRecord(rec);
}
me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src'));
} }
}; };
store.url = 'resources/help/' + lang + '/Contents.json'; store.url = 'resources/help/' + lang + '/Contents.json';
@ -1594,15 +1598,22 @@ define([
this._scrollerInited = true; this._scrollerInited = true;
} }
if (url) { if (url) {
var rec = this.viewHelpPicker.store.findWhere({ if (this.viewHelpPicker.store.length>0) {
src: url var rec = this.viewHelpPicker.store.find(function(record){
}); return (url.indexOf(record.get('src'))>=0);
if (rec) { });
this.viewHelpPicker.selectRecord(rec); if (rec) {
this.viewHelpPicker.scrollToRecord(rec); this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
this.onSelectItem(url);
} else } else
this.openUrl = url; this.openUrl = url;
} }
},
onSelectItem: function(src) {
this.iFrame.src = this.urlPref + src;
} }
}); });