initialized app's strart params

This commit is contained in:
Maxim Kadushkin 2018-02-07 01:37:23 +03:00
parent 14c19f8369
commit c3260dfc38
8 changed files with 61 additions and 28 deletions

View file

@ -770,6 +770,10 @@ Common.Utils.InternalSettings = new(function() {
}
});
Common.Utils.InternalSettings.set('toolbar-height-compact', 32);
Common.Utils.InternalSettings.set('toolbar-height-normal', 32+67);
Common.Utils.InternalSettings.set('doc-title-height', 28);
Common.Utils.InternalSettings.set('toolbar-height-tabs', 32);
Common.Utils.InternalSettings.set('toolbar-height-tabs-top-title', 28);
Common.Utils.InternalSettings.set('toolbar-height-controls', 67);
Common.Utils.InternalSettings.set('document-title-height', 28);
Common.Utils.InternalSettings.set('toolbar-height-compact', Common.Utils.InternalSettings.get('toolbar-height-tabs'));
Common.Utils.InternalSettings.set('toolbar-height-normal', Common.Utils.InternalSettings.get('toolbar-height-tabs') + Common.Utils.InternalSettings.get('toolbar-height-controls'));

View file

@ -304,7 +304,3 @@
line-height: @height-title;
}
}
.toolbar-fullview-panel.new-doctitle-offset {
top: @height-tabs + 26;
}

View file

@ -116,19 +116,32 @@ define([
var me = this;
me.appConfig = config;
var _intvars = Common.Utils.InternalSettings;
var $filemenu = $('.toolbar-fullview-panel');
$filemenu.css('top', _intvars.get('toolbar-height-tabs'));
if ( !config.isEdit ||
( !Common.localStorage.itemExists("de-compact-toolbar") &&
config.customization && config.customization.compactToolbar )) {
var panel = me.viewport.vlayout.getItem('toolbar');
if ( panel ) panel.height = Common.Utils.InternalSettings.get('toolbar-height-compact');
if ( panel ) panel.height = _intvars.get('toolbar-height-tabs');
}
if ( config.isDesktopApp && config.isEdit ) {
var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show();
$('.toolbar-fullview-panel').addClass('new-doctitle-offset');
var toolbar = me.viewport.vlayout.getItem('toolbar');
toolbar.el.addClass('top-title');
toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
_intvars.set('toolbar-height-tabs', _tabs_new_height);
_intvars.set('toolbar-height-compact', _tabs_new_height);
_intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
$filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
}
},

View file

@ -82,13 +82,11 @@ define([
var $container = $('#viewport-vbox-layout', this.$el);
this.vlayout = new Common.UI.VBoxLayout({
box: $container,
items: [
{
items: [{
el: $container.find('> .layout-item#title').hide(),
alias: 'title',
height: Common.Utils.InternalSettings.get('doc-title-height')
},
{
height: Common.Utils.InternalSettings.get('document-title-height')
}, {
el: $container.find(' > .layout-item#toolbar'),
alias: 'toolbar',
// rely: true

View file

@ -119,18 +119,31 @@ define([
var me = this;
me.appConfig = config;
var _intvars = Common.Utils.InternalSettings;
var $filemenu = $('.toolbar-fullview-panel');
$filemenu.css('top', _intvars.get('toolbar-height-tabs'));
if ( !config.isEdit ||
( !Common.localStorage.itemExists("pe-compact-toolbar") &&
config.customization && config.customization.compactToolbar ))
{
me.viewport.vlayout.getItem('toolbar').height = Common.Utils.InternalSettings.get('toolbar-height-compact');
me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
}
if ( config.isDesktopApp && config.isEdit ) {
var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show();
$('.toolbar-fullview-panel').addClass('new-doctitle-offset');
var toolbar = me.viewport.vlayout.getItem('toolbar');
toolbar.el.addClass('top-title');
toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
_intvars.set('toolbar-height-tabs', _tabs_new_height);
_intvars.set('toolbar-height-compact', _tabs_new_height);
_intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
$filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
}
},

View file

@ -85,13 +85,11 @@ define([
var items = $container.find(' > .layout-item');
this.vlayout = new Common.UI.VBoxLayout({
box: $container,
items: [
{
items: [{
el: $container.find('> .layout-item#title').hide(),
alias: 'title',
height: Common.Utils.InternalSettings.get('doc-title-height')
},
{
height: Common.Utils.InternalSettings.get('document-title-height')
}, {
el: items[1],
alias: 'toolbar',
height: Common.localStorage.getBool('pe-compact-toolbar') ?

View file

@ -91,11 +91,15 @@ define([
var me = this;
me.appConfig = config;
var _intvars = Common.Utils.InternalSettings;
var $filemenu = $('.toolbar-fullview-panel');
$filemenu.css('top', _intvars.get('toolbar-height-tabs'));
if ( !config.isEdit ||
( !Common.localStorage.itemExists("sse-compact-toolbar") &&
config.customization && config.customization.compactToolbar ))
{
me.viewport.vlayout.getItem('toolbar').height = Common.Utils.InternalSettings.get('toolbar-height-compact');
me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
} else
if ( config.isEditDiagram || config.isEditMailMerge ) {
me.viewport.vlayout.getItem('toolbar').height = 41;
@ -105,7 +109,16 @@ define([
var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show();
$('.toolbar-fullview-panel').addClass('new-doctitle-offset');
var toolbar = me.viewport.vlayout.getItem('toolbar');
toolbar.el.addClass('top-title');
toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
_intvars.set('toolbar-height-tabs', _tabs_new_height);
_intvars.set('toolbar-height-compact', _tabs_new_height);
_intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
$filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
}
},

View file

@ -85,13 +85,11 @@ define([
var items = $container.find(' > .layout-item');
this.vlayout = new Common.UI.VBoxLayout({
box: $container,
items: [
{
items: [{
el: $container.find('> .layout-item#title').hide(),
alias: 'title',
height: Common.Utils.InternalSettings.get('doc-title-height')
},
{
height: Common.Utils.InternalSettings.get('document-title-height')
},{
el: items[1],
alias: 'toolbar',
height: Common.localStorage.getBool('sse-compact-toolbar') ?