diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c16196ab5..a73c98c45 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2241,7 +2241,7 @@ define([ }); win.$window.find('#id-equation-convert-help').on('click', function (e) { 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'); }) }, diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 2d46a8e45..846d594e4 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1529,7 +1529,7 @@ define([ }); 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'); @@ -1575,10 +1575,14 @@ define([ } }, success: function () { - var rec = (me.openUrl) ? store.findWhere({ src: me.openUrl }) || store.at(0) : store.at(0); - me.viewHelpPicker.selectRecord(rec); - me.viewHelpPicker.scrollToRecord(rec); - me.iFrame.src = me.urlPref + rec.get('src'); + var rec = me.openUrl ? store.find(function(record){ + return (me.openUrl.indexOf(record.get('src'))>=0); + }) : store.at(0); + 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'; @@ -1594,15 +1598,22 @@ define([ this._scrollerInited = true; } if (url) { - var rec = this.viewHelpPicker.store.findWhere({ - src: url - }); - if (rec) { - this.viewHelpPicker.selectRecord(rec); - this.viewHelpPicker.scrollToRecord(rec); + if (this.viewHelpPicker.store.length>0) { + var rec = this.viewHelpPicker.store.find(function(record){ + return (url.indexOf(record.get('src'))>=0); + }); + if (rec) { + this.viewHelpPicker.selectRecord(rec, true); + this.viewHelpPicker.scrollToRecord(rec); + } + this.onSelectItem(url); } else this.openUrl = url; } + }, + + onSelectItem: function(src) { + this.iFrame.src = this.urlPref + src; } });