[DE] Make new search bar
This commit is contained in:
parent
4a5ce7f6c4
commit
14cf16f201
|
@ -100,6 +100,7 @@ define([
|
||||||
'<div class="btn-slot" id="slot-btn-mode"></div>' +
|
'<div class="btn-slot" id="slot-btn-mode"></div>' +
|
||||||
'<div class="btn-slot" id="slot-btn-back"></div>' +
|
'<div class="btn-slot" id="slot-btn-back"></div>' +
|
||||||
'<div class="btn-slot" id="slot-btn-favorite"></div>' +
|
'<div class="btn-slot" id="slot-btn-favorite"></div>' +
|
||||||
|
'<div class="btn-slot" id="slot-btn-search"></div>' +
|
||||||
'<div class="btn-slot" id="slot-btn-options"></div>' +
|
'<div class="btn-slot" id="slot-btn-options"></div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
'<div class="hedset">' +
|
'<div class="hedset">' +
|
||||||
|
@ -457,6 +458,14 @@ define([
|
||||||
reset : onResetUsers
|
reset : onResetUsers
|
||||||
});
|
});
|
||||||
|
|
||||||
|
me.btnSearch = new Common.UI.Button({
|
||||||
|
cls: 'btn-header no-caret',
|
||||||
|
iconCls: 'toolbar__icon icon--inverse btn-menu-search',
|
||||||
|
dataHint: '0',
|
||||||
|
dataHintDirection: 'bottom',
|
||||||
|
dataHintOffset: 'big'
|
||||||
|
});
|
||||||
|
|
||||||
me.btnOptions = new Common.UI.Button({
|
me.btnOptions = new Common.UI.Button({
|
||||||
cls: 'btn-header no-caret',
|
cls: 'btn-header no-caret',
|
||||||
iconCls: 'toolbar__icon icon--inverse btn-ic-options',
|
iconCls: 'toolbar__icon icon--inverse btn-ic-options',
|
||||||
|
@ -563,6 +572,7 @@ define([
|
||||||
if ( config.canEdit && config.canRequestEditRights )
|
if ( config.canEdit && config.canRequestEditRights )
|
||||||
this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big');
|
this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big');
|
||||||
}
|
}
|
||||||
|
me.btnSearch.render($html.find('#slot-btn-search'));
|
||||||
me.btnOptions.render($html.find('#slot-btn-options'));
|
me.btnOptions.render($html.find('#slot-btn-options'));
|
||||||
|
|
||||||
if (!config.isEdit || config.customization && !!config.customization.compactHeader) {
|
if (!config.isEdit || config.customization && !!config.customization.compactHeader) {
|
||||||
|
|
100
apps/common/main/lib/view/SearchBar.js
Normal file
100
apps/common/main/lib/view/SearchBar.js
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* (c) Copyright Ascensio System SIA 2010-2019
|
||||||
|
*
|
||||||
|
* This program is a free software product. You can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||||
|
* version 3 as published by the Free Software Foundation. In accordance with
|
||||||
|
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||||
|
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||||
|
* of any third-party rights.
|
||||||
|
*
|
||||||
|
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||||
|
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||||
|
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||||
|
*
|
||||||
|
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||||
|
* street, Riga, Latvia, EU, LV-1050.
|
||||||
|
*
|
||||||
|
* The interactive user interfaces in modified source and object code versions
|
||||||
|
* of the Program must display Appropriate Legal Notices, as required under
|
||||||
|
* Section 5 of the GNU AGPL version 3.
|
||||||
|
*
|
||||||
|
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||||
|
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||||
|
* grant you any rights under trademark law for use of our trademarks.
|
||||||
|
*
|
||||||
|
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||||
|
* well as technical writing content are licensed under the terms of the
|
||||||
|
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||||
|
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* SearchBar.js
|
||||||
|
*
|
||||||
|
* Created by Julia Svinareva on 03.02.2022
|
||||||
|
* Copyright (c) 2022 Ascensio System SIA. All rights reserved.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
define([
|
||||||
|
'common/main/lib/component/Window'
|
||||||
|
], function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
Common.UI.SearchBar = Common.UI.Window.extend(_.extend({
|
||||||
|
options: {
|
||||||
|
modal: false,
|
||||||
|
width: 328,
|
||||||
|
height: 54,
|
||||||
|
header: false,
|
||||||
|
cls: 'search-bar'
|
||||||
|
},
|
||||||
|
|
||||||
|
initialize : function(options) {
|
||||||
|
_.extend(this.options, options || {});
|
||||||
|
|
||||||
|
this.template = [
|
||||||
|
'<div class="box">',
|
||||||
|
'jghjgj',
|
||||||
|
'</div>'
|
||||||
|
].join('');
|
||||||
|
|
||||||
|
this.options.tpl = _.template(this.template)(this.options);
|
||||||
|
|
||||||
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
|
},
|
||||||
|
|
||||||
|
render: function() {
|
||||||
|
Common.UI.Window.prototype.render.call(this);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
this.on('animate:before', _.bind(this.focus, this));
|
||||||
|
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
|
||||||
|
show: function(x, y) {
|
||||||
|
Common.UI.Window.prototype.show.call(this, x, y);
|
||||||
|
|
||||||
|
|
||||||
|
this.focus();
|
||||||
|
},
|
||||||
|
|
||||||
|
focus: function() {
|
||||||
|
var me = this;
|
||||||
|
setTimeout(function(){
|
||||||
|
|
||||||
|
}, 10);
|
||||||
|
},
|
||||||
|
|
||||||
|
getSettings: function() {
|
||||||
|
return {
|
||||||
|
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
}, Common.UI.SearchBar || {}));
|
||||||
|
});
|
|
@ -44,6 +44,7 @@
|
||||||
define([
|
define([
|
||||||
'core',
|
'core',
|
||||||
'common/main/lib/view/Header',
|
'common/main/lib/view/Header',
|
||||||
|
'common/main/lib/view/SearchBar',
|
||||||
'documenteditor/main/app/view/Viewport',
|
'documenteditor/main/app/view/Viewport',
|
||||||
'documenteditor/main/app/view/LeftMenu'
|
'documenteditor/main/app/view/LeftMenu'
|
||||||
], function (Viewport) {
|
], function (Viewport) {
|
||||||
|
@ -332,6 +333,7 @@ define([
|
||||||
cls : 'btn-toolbar'
|
cls : 'btn-toolbar'
|
||||||
})).on('click', _on_btn_zoom.bind(me, 'up'));
|
})).on('click', _on_btn_zoom.bind(me, 'up'));
|
||||||
|
|
||||||
|
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
|
||||||
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
|
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
|
||||||
if ( !Common.UI.Themes.isDarkTheme() ) {
|
if ( !Common.UI.Themes.isDarkTheme() ) {
|
||||||
me.header.menuItemsDarkMode.hide();
|
me.header.menuItemsDarkMode.hide();
|
||||||
|
@ -460,6 +462,18 @@ define([
|
||||||
this.header && this.header.lockHeaderBtns( 'rename-user', disable);
|
this.header && this.header.lockHeaderBtns( 'rename-user', disable);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onSearchClick: function () {
|
||||||
|
if ( !this.searchBar ) {
|
||||||
|
this.searchBar = (new Common.UI.SearchBar({
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
var top = $('#app-title').height() + $('#toolbar').height() + 2,
|
||||||
|
left = Common.Utils.innerWidth() - $('#right-menu').width() - this.searchBar.options.width - 32;
|
||||||
|
|
||||||
|
this.searchBar.show(left, top);
|
||||||
|
},
|
||||||
|
|
||||||
textFitPage: 'Fit to Page',
|
textFitPage: 'Fit to Page',
|
||||||
textFitWidth: 'Fit to Width',
|
textFitWidth: 'Fit to Width',
|
||||||
txtDarkMode: 'Dark mode'
|
txtDarkMode: 'Dark mode'
|
||||||
|
|
Loading…
Reference in a new issue