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

[Common] 'back' now has one action

Browse source
This commit is contained in:
Maxim Kadushkin 2017-05-04 15:39:17 +03:00
parent cee6024b35
commit 2ab489cd3a
4 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/common/main/lib/view/Header.js
View file

@ -85,7 +85,7 @@ define([
'<label id="tlb-change-rights" class="link"><%= txtAccessRights %></label>' +
'</div>' +
'</section>'+
'<div class="btn-slot split" id="slot-btn-back"></div>' +
'<div class="btn-slot" id="slot-btn-back"></div>' +
'</div>' +
'</section>';
@ -202,11 +202,8 @@ define([
var me = this;
me.btnGoBack.updateHint(me.textBack);
me.btnGoBack.on('click', function (e) {
me.fireEvent('go:back', ['page:current']);
me.fireEvent('go:back', ['page:new']);
});
me.btnGoBack.menu.on('item:click', function (menu, item, e) {
me.fireEvent('go:back', ['page:' + item.value]);
})
if ( me.logo )
me.logo.on('click', function (e) {
@ -284,14 +281,7 @@ define([
id: 'btn-goback',
cls: 'btn-toolbar',
iconCls: 'svgicon svg-btn-goback',
split: true,
menu: new Common.UI.Menu({
style: 'min-width: 60px;',
items: [
{caption: me.itemBackCurrTab},
{caption: me.itemBackNewTab, value: 'new'}
]
})
split: true
});
storeUsers = this.options.storeUsers;
@ -469,8 +459,6 @@ define([
textBack: 'Go to Documents',
txtRename: 'Rename',
itemBackNewTab: 'Open in New Tab',
itemBackCurrTab: 'Open in Current Tab',
textSaveBegin: 'Saving...',
textSaveEnd: 'All changes saved',
textSaveChanged: 'Modified',

4
apps/documenteditor/main/locale/en.json
View file

@ -139,8 +139,8 @@
"Common.Views.ExternalMergeEditor.textClose": "Close",
"Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
"Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
"Common.Views.Header.itemBackNewTab": "Open in New Tab",
"Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"del_Common.Views.Header.itemBackNewTab": "Open in New Tab",
"del_Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",

6
apps/presentationeditor/main/locale/en.json
View file

@ -80,9 +80,9 @@
"Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
"del_Common.Views.Header.openNewTabText": "Open in New Tab",
"del_Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
"del_Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.itemBackNewTab": "Open in New Tab",
"Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"Common.Views.Header.txtRename": "Rename",
"del_Common.Views.Header.itemBackNewTab": "Open in New Tab",
"del_Common.Views.Header.itemBackCurrTab": "Open in Current Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",

6
apps/spreadsheeteditor/main/locale/en.json
View file

@ -72,7 +72,11 @@
"Common.Views.CopyWarningDialog.textToPaste": "for Paste",
"Common.Views.DocumentAccessDialog.textLoading": "Loading...",
"Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings",
"Common.Views.Header.openNewTabText": "Open in New Tab",
"del_Common.Views.Header.openNewTabText": "Open in New Tab",
"Common.Views.Header.textSaveBegin": "Saving...",
"Common.Views.Header.textSaveEnd": "All changes saved",
"Common.Views.Header.textSaveChanged": "Modified",
"Common.Views.Header.textSaveExpander": "All changes saved",
"Common.Views.Header.textBack": "Go to Documents",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.Header.txtAccessRights": "Change access rights",