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

Merge branch 'release/v5.1.0' into feature/bookmarks

Browse source
This commit is contained in:
Julia Radzhabova 2018-03-19 12:10:49 +03:00
parent 7cbbdeccc9 edfdecff5e
commit f307c90ae8
2626 changed files with 23571 additions and 6449 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/api.js
View file

@ -324,7 +324,7 @@
} }
if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') { if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt))$/ var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|docm|dot|dotm|dotx|fodt|ott))$/
.exec(_config.document.fileType); .exec(_config.document.fileType);
if (!type) { if (!type) {
window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it."); window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");

2
apps/common/Analytics.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/Gateway.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/IrregularStack.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/embed/lib/controller/modals.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/embed/lib/util/utils.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/embed/lib/view/modals.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/locale.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/collection/ChatMessages.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Collection * Collection
* *
* Created by Maxim Kadushkin on 01 March 2014 * Created by Maxim Kadushkin on 01 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/collection/Comments.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Comments.js * Comments.js
* *
* Created by Alexey Musinov on 17.01.14 * Created by Alexey Musinov on 17.01.14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/collection/Fonts.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Fonts.js * Fonts.js
* *
* Created by Alexander Yuzhin on 2/11/14 * Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/collection/HistoryVersions.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/main/lib/collection/Plugins.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/collection/ReviewChanges.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ReviewChanges.js * ReviewChanges.js
* *
* Created by Julia.Radzhabova on 05.08.15 * Created by Julia.Radzhabova on 05.08.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/collection/TextArt.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -32,7 +32,7 @@
*/ */
/** /**
* Created by Julia.Radzhabova on 09.07.15 * Created by Julia.Radzhabova on 09.07.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*/ */
if (Common === undefined) if (Common === undefined)

4
apps/common/main/lib/collection/Users.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Collection * Collection
* *
* Created by Maxim Kadushkin on 27 February 2014 * Created by Maxim Kadushkin on 27 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/BaseView.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* BaseView.js * BaseView.js
* *
* Created by Alexander Yuzhin on 1/17/14 * Created by Alexander Yuzhin on 1/17/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/Button.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Button.js * Button.js
* *
* Created by Alexander Yuzhin on 1/20/14 * Created by Alexander Yuzhin on 1/20/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/CheckBox.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* CheckBox.js * CheckBox.js
* *
* Created by Julia Radzhabova on 1/24/14 * Created by Julia Radzhabova on 1/24/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/component/ColorButton.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/component/ColorPalette.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ColorPalette.js * ColorPalette.js
* *
* Created by Alexander Yuzhin on 2/20/14 * Created by Alexander Yuzhin on 2/20/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/ColorPaletteExt.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ColorPaletteExt.js * ColorPaletteExt.js
* *
* Created by Julia Radzhabova on 07/21/15 * Created by Julia Radzhabova on 07/21/15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/ComboBorderSize.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ComboBorderSize.js * ComboBorderSize.js
* *
* Created by Julia Radzhabova on 2/10/14 * Created by Julia Radzhabova on 2/10/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

6
apps/common/main/lib/component/ComboBox.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ComboBox.js * ComboBox.js
* *
* Created by Alexander Yuzhin on 1/22/14 * Created by Alexander Yuzhin on 1/22/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -146,7 +146,7 @@ define([
scope : me scope : me
})); }));
if (this.itemsTemplate) if (this.itemsTemplate)
this.cmpEl.find('ul').append( this.cmpEl.find('ul').html(
$(this.itemsTemplate({ $(this.itemsTemplate({
items : items, items : items,
scope : me scope : me

15
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ComboBoxFonts.js * ComboBoxFonts.js
* *
* Created by Alexander Yuzhin on 2/11/14 * Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -112,6 +112,8 @@ define([
this._input.on('keyup', _.bind(this.onInputKeyUp, this)); this._input.on('keyup', _.bind(this.onInputKeyUp, this));
this._input.on('keydown', _.bind(this.onInputKeyDown, this)); this._input.on('keydown', _.bind(this.onInputKeyDown, this));
this._input.on('focus', _.bind(function() {this.inFormControl = true;}, this));
this._input.on('blur', _.bind(function() {this.inFormControl = false;}, this));
this._modalParents = this.cmpEl.closest('.asc-window'); this._modalParents = this.cmpEl.closest('.asc-window');
@ -318,6 +320,15 @@ define([
}, },
onApiChangeFont: function(font) { onApiChangeFont: function(font) {
var me = this;
setTimeout(function () {
me.onApiChangeFontInternal(font);
}, 100);
},
onApiChangeFontInternal: function(font) {
if (this.inFormControl) return;
var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName()); var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName());
if (this.getRawValue() !== name) { if (this.getRawValue() !== name) {

6
apps/common/main/lib/component/ComboDataView.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ComboDataView.js * ComboDataView.js
* *
* Created by Alexander Yuzhin on 2/13/14 * Created by Alexander Yuzhin on 2/13/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -401,7 +401,7 @@ define([
fillComboView: function(record, forceSelect, forceFill) { fillComboView: function(record, forceSelect, forceFill) {
if (!_.isUndefined(record) && record instanceof Backbone.Model){ if (!_.isUndefined(record) && record instanceof Backbone.Model){
this.needFillComboView = false; this.needFillComboView = !this.isVisible();
var me = this, var me = this,
store = me.menuPicker.store, store = me.menuPicker.store,

34
apps/common/main/lib/component/DataView.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* A mechanism for displaying data using custom layout templates and formatting. * A mechanism for displaying data using custom layout templates and formatting.
* *
* Created by Alexander Yuzhin on 1/24/14 * Created by Alexander Yuzhin on 1/24/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -197,6 +197,7 @@ define([
emptyText: '', emptyText: '',
listenStoreEvents: true, listenStoreEvents: true,
allowScrollbar: true, allowScrollbar: true,
scrollAlwaysVisible: false,
showLast: true, showLast: true,
useBSKeydown: false useBSKeydown: false
}, },
@ -239,6 +240,7 @@ define([
me.emptyText = me.options.emptyText || ''; me.emptyText = me.options.emptyText || '';
me.listenStoreEvents= (me.options.listenStoreEvents!==undefined) ? me.options.listenStoreEvents : true; me.listenStoreEvents= (me.options.listenStoreEvents!==undefined) ? me.options.listenStoreEvents : true;
me.allowScrollbar = (me.options.allowScrollbar!==undefined) ? me.options.allowScrollbar : true; me.allowScrollbar = (me.options.allowScrollbar!==undefined) ? me.options.allowScrollbar : true;
me.scrollAlwaysVisible = me.options.scrollAlwaysVisible || false;
if (me.parentMenu) if (me.parentMenu)
me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0); me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
me.rendered = false; me.rendered = false;
@ -308,7 +310,8 @@ define([
el: $(this.el).find('.inner').addBack().filter('.inner'), el: $(this.el).find('.inner').addBack().filter('.inner'),
useKeyboard: this.enableKeyEvents && !this.handleSelect, useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40, minScrollbarLength : 40,
wheelSpeed: 10 wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
}); });
} }
@ -361,11 +364,12 @@ define([
if (suspendEvents) if (suspendEvents)
this.resumeEvents(); this.resumeEvents();
return record;
}, },
selectByIndex: function(index, suspendEvents) { selectByIndex: function(index, suspendEvents) {
if (this.store.length > 0 && index > -1 && index < this.store.length) { if (this.store.length > 0 && index > -1 && index < this.store.length) {
this.selectRecord(this.store.at(index), suspendEvents); return this.selectRecord(this.store.at(index), suspendEvents);
} }
}, },
@ -480,7 +484,8 @@ define([
el: $(this.el).find('.inner').addBack().filter('.inner'), el: $(this.el).find('.inner').addBack().filter('.inner'),
useKeyboard: this.enableKeyEvents && !this.handleSelect, useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40, minScrollbarLength : 40,
wheelSpeed: 10 wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
}); });
} }
@ -568,18 +573,21 @@ define([
}, },
scrollToRecord: function (record) { scrollToRecord: function (record) {
if (!record) return;
var innerEl = $(this.el).find('.inner'), var innerEl = $(this.el).find('.inner'),
inner_top = innerEl.offset().top, inner_top = innerEl.offset().top,
idx = _.indexOf(this.store.models, record), idx = _.indexOf(this.store.models, record),
div = (idx>=0 && this.dataViewItems.length>idx) ? $(this.dataViewItems[idx].el) : innerEl.find('#' + record.get('id')); div = (idx>=0 && this.dataViewItems.length>idx) ? $(this.dataViewItems[idx].el) : innerEl.find('#' + record.get('id'));
if (div.length<=0) return; if (div.length<=0) return;
var div_top = div.offset().top; var div_top = div.offset().top,
if (div_top < inner_top || div_top+div.outerHeight() > inner_top + innerEl.height()) { div_first = $(this.dataViewItems[0].el),
div_first_top = (div_first.length>0) ? div_first[0].offsetTop : 0;
if (div_top < inner_top + div_first_top || div_top+div.outerHeight() > inner_top + innerEl.height()) {
if (this.scroller && this.allowScrollbar) { if (this.scroller && this.allowScrollbar) {
this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top, 0); this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top, 0);
} else { } else {
innerEl.scrollTop(innerEl.scrollTop() + div_top - inner_top); innerEl.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top);
} }
} }
}, },
@ -716,14 +724,16 @@ define([
margins = parseInt(parent.css('margin-top')) + parseInt(parent.css('margin-bottom')) + parseInt(menuRoot.css('margin-top')), margins = parseInt(parent.css('margin-top')) + parseInt(parent.css('margin-bottom')) + parseInt(menuRoot.css('margin-top')),
paddings = parseInt(menuRoot.css('padding-top')) + parseInt(menuRoot.css('padding-bottom')), paddings = parseInt(menuRoot.css('padding-top')) + parseInt(menuRoot.css('padding-bottom')),
menuH = menuRoot.outerHeight(), menuH = menuRoot.outerHeight(),
top = parseInt(menuRoot.css('top')); top = parseInt(menuRoot.css('top')),
props = {minScrollbarLength : 40};
this.scrollAlwaysVisible && (props.alwaysVisibleY = this.scrollAlwaysVisible);
if (top + menuH > docH ) { if (top + menuH > docH ) {
innerEl.css('max-height', (docH - top - paddings - margins) + 'px'); innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
if (this.allowScrollbar) this.scroller.update({minScrollbarLength : 40}); if (this.allowScrollbar) this.scroller.update(props);
} else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) { } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px'); innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
if (this.allowScrollbar) this.scroller.update({minScrollbarLength : 40}); if (this.allowScrollbar) this.scroller.update(props);
} }
}, },

4
apps/common/main/lib/component/DimensionPicker.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* DimensionPicker.js * DimensionPicker.js
* *
* Created by Alexander Yuzhin on 1/29/14 * Created by Alexander Yuzhin on 1/29/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/component/HSBColorPicker.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/component/InputField.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* InputField.js * InputField.js
* *
* Created by Alexander Yuzhin on 4/10/14 * Created by Alexander Yuzhin on 4/10/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

24
apps/common/main/lib/component/Layout.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Layout.js * Layout.js
* *
* Created by Maxim Kadushkin on 10 February 2014 * Created by Maxim Kadushkin on 10 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
* *
* Configuration * Configuration
@ -152,7 +152,8 @@ define([
fmin : panel.resize.fmin, fmin : panel.resize.fmin,
fmax : panel.resize.fmax, fmax : panel.resize.fmax,
behaviour : panel.behaviour, behaviour : panel.behaviour,
index : this.splitters.length index : this.splitters.length,
offset : panel.resize.offset || 0
}; };
if (!stretch) { if (!stretch) {
@ -224,6 +225,8 @@ define([
}, },
resizeStart: function(e) { resizeStart: function(e) {
if (this.freeze) return;
this.clearSelection(); this.clearSelection();
this.addHandler(window.document, 'selectstart', this.onSelectStart); this.addHandler(window.document, 'selectstart', this.onSelectStart);
@ -369,7 +372,7 @@ define([
setResizeValue: function (index, value) { setResizeValue: function (index, value) {
if (index >= this.splitters.length) if (index >= this.splitters.length)
return; return false;
var panel = null, next = null, oldValue = 0, var panel = null, next = null, oldValue = 0,
resize = this.splitters[index].resizer, resize = this.splitters[index].resizer,
@ -404,6 +407,7 @@ define([
if (resize.value != value) { if (resize.value != value) {
this.doLayout(); this.doLayout();
} }
return (Math.abs(oldValue-value)>0.99);
} }
}); });
@ -492,7 +496,10 @@ define([
if ( !panel.stretch ) { if ( !panel.stretch ) {
style = panel.el.is(':visible'); style = panel.el.is(':visible');
if ( style ) { if ( style ) {
width += (panel.rely!==true ? panel.width : this.getElementWidth(panel.el)); if (panel.isresizer)
width += panel.offset;
else
width += (panel.rely!==true ? panel.width : this.getElementWidth(panel.el));
} }
if (panel.resize && panel.resize.autohide !== false && panel.resize.el) { if (panel.resize && panel.resize.autohide !== false && panel.resize.el) {
@ -514,10 +521,13 @@ define([
width = 0; width = 0;
this.panels.forEach(function(panel){ this.panels.forEach(function(panel){
if (panel.el.is(':visible')) { if (panel.el.is(':visible')) {
style = {left: width}; style = {left: width - (panel.isresizer ? panel.width : 0)};
panel.rely!==true && (style.width = panel.width); panel.rely!==true && (style.width = panel.width);
panel.el.css(style); panel.el.css(style);
width += this.getElementWidth(panel.el); if (panel.isresizer)
width += panel.offset;
else
width += this.getElementWidth(panel.el);
} }
},this); },this);
} }

4
apps/common/main/lib/component/ListView.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ListView.js * ListView.js
* *
* Created by Julia Radzhabova on 2/27/14 * Created by Julia Radzhabova on 2/27/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/LoadMask.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Displays loading mask over selected element(s) or component. Accepts both single and multiple selectors. * Displays loading mask over selected element(s) or component. Accepts both single and multiple selectors.
* *
* Created by Alexander Yuzhin on 2/7/14 * Created by Alexander Yuzhin on 2/7/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/component/MaskedField.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/component/Menu.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* A menu object. This is the container to which you may add {@link Common.UI.MenuItem menu items}. * A menu object. This is the container to which you may add {@link Common.UI.MenuItem menu items}.
* *
* Created by Alexander Yuzhin on 1/28/14 * Created by Alexander Yuzhin on 1/28/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/MenuItem.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -37,7 +37,7 @@
* sub-menus, icons, etc. * sub-menus, icons, etc.
* *
* Created by Alexander Yuzhin on 1/27/14 * Created by Alexander Yuzhin on 1/27/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

6
apps/common/main/lib/component/MetricSpinner.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* MetricSpinner.js * MetricSpinner.js
* *
* Created by Julia Radzhabova on 1/21/14 * Created by Julia Radzhabova on 1/21/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -448,7 +448,7 @@ define([
if (isNaN(val)) if (isNaN(val))
val = this.oldValue; val = this.oldValue;
} else { } else {
val = me.options.defaultValue; val = me.options.defaultValue - me.options.step;
} }
me.setValue((this._add(val, me.options.step, (me.options.allowDecimal) ? 3 : 0) + ' ' + this.options.defaultUnit).trim(), suspend); me.setValue((this._add(val, me.options.step, (me.options.allowDecimal) ? 3 : 0) + ' ' + this.options.defaultUnit).trim(), suspend);
} }

4
apps/common/main/lib/component/Mixtbar.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -37,7 +37,7 @@
* *
* *
* Created by Maxim.Kadushkin on 4/11/2017. * Created by Maxim.Kadushkin on 4/11/2017.
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/MultiSliderGradient.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* MultiSliderGradient.js * MultiSliderGradient.js
* *
* Created by Julia Radzhabova on 2/19/14 * Created by Julia Radzhabova on 2/19/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/RadioBox.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* RadioBox.js * RadioBox.js
* *
* Created by Julia Radzhabova on 2/26/14 * Created by Julia Radzhabova on 2/26/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
/** /**

4
apps/common/main/lib/component/Scroller.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Scroller.js * Scroller.js
* *
* Created by Alexander Yuzhin on 3/14/14 * Created by Alexander Yuzhin on 3/14/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/Slider.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Slider.js * Slider.js
* *
* Created by Julia Radzhabova on 2/18/14 * Created by Julia Radzhabova on 2/18/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/component/Switcher.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/main/lib/component/SynchronizeTip.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/component/Tab.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Tab.js * Tab.js
* *
* Created by Maxim Kadushkin on 01 April 2014 * Created by Maxim Kadushkin on 01 April 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/TabBar.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* TabBar.js * TabBar.js
* *
* Created by Maxim Kadushkin on 28 March 2014 * Created by Maxim Kadushkin on 28 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/TableStyler.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* TableStyler.js * TableStyler.js
* *
* Created by Alexander Yuzhin on 2/28/14 * Created by Alexander Yuzhin on 2/28/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/ThemeColorPalette.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ThemeColorPalette.js * ThemeColorPalette.js
* *
* Created by Julia Radzhabova on 1/28/14 * Created by Julia Radzhabova on 1/28/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/ToggleManager.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ToggleManager.js * ToggleManager.js
* *
* Created by Alexander Yuzhin on 1/28/14 * Created by Alexander Yuzhin on 1/28/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/component/Tooltip.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Tooltip.js * Tooltip.js
* *
* Created by Maxim Kadushkin on 14 March 2014 * Created by Maxim Kadushkin on 14 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
/* /*

11
apps/common/main/lib/component/TreeView.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -158,6 +158,7 @@ define([
handleSelect: true, handleSelect: true,
showLast: true, showLast: true,
allowScrollbar: true, allowScrollbar: true,
scrollAlwaysVisible: true,
emptyItemText: '' emptyItemText: ''
}, },
@ -245,24 +246,24 @@ define([
var isExpanded = !record.get('isExpanded'); var isExpanded = !record.get('isExpanded');
record.set('isExpanded', isExpanded); record.set('isExpanded', isExpanded);
this.store[(isExpanded) ? 'expandSubItems' : 'collapseSubItems'](record); this.store[(isExpanded) ? 'expandSubItems' : 'collapseSubItems'](record);
this.scroller.update({minScrollbarLength: 40}); this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
} else } else
Common.UI.DataView.prototype.onClickItem.call(this, view, record, e); Common.UI.DataView.prototype.onClickItem.call(this, view, record, e);
}, },
expandAll: function() { expandAll: function() {
this.store.expandAll(); this.store.expandAll();
this.scroller.update({minScrollbarLength: 40}); this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
}, },
collapseAll: function() { collapseAll: function() {
this.store.collapseAll(); this.store.collapseAll();
this.scroller.update({minScrollbarLength: 40}); this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
}, },
expandToLevel: function(expandLevel) { expandToLevel: function(expandLevel) {
this.store.expandToLevel(expandLevel); this.store.expandToLevel(expandLevel);
this.scroller.update({minScrollbarLength: 40}); this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
} }
} }
})()); })());

4
apps/common/main/lib/component/Window.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Window.js * Window.js
* *
* Created by Maxim Kadushkin on 24 January 2014 * Created by Maxim Kadushkin on 24 January 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/controller/Chat.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Controller * Controller
* *
* Created by Maxim Kadushkin on 27 February 2014 * Created by Maxim Kadushkin on 27 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/controller/Comments.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Comments.js * Comments.js
* *
* Created by Alexey Musinov on 16.01.14 * Created by Alexey Musinov on 16.01.14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/controller/ExternalDiagramEditor.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ExternalDiagramEditor.js * ExternalDiagramEditor.js
* *
* Created by Julia Radzhabova on 4/08/14 * Created by Julia Radzhabova on 4/08/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/controller/ExternalMergeEditor.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ExternalDiagramEditor.js * ExternalDiagramEditor.js
* *
* Created by Julia Radzhabova on 4/08/14 * Created by Julia Radzhabova on 4/08/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/controller/Fonts.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Fonts.js * Fonts.js
* *
* Created by Alexander Yuzhin on 2/11/14 * Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/controller/History.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/main/lib/controller/Plugins.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/controller/Protection.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -35,7 +35,7 @@
* Protection.js * Protection.js
* *
* Created by Julia Radzhabova on 14.11.2017 * Created by Julia Radzhabova on 14.11.2017
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

5
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ReviewChanges.js * ReviewChanges.js
* *
* Created by Julia.Radzhabova on 05.08.15 * Created by Julia.Radzhabova on 05.08.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -557,6 +557,7 @@ define([
app.getController('RightMenu').SetDisabled(disable, false); app.getController('RightMenu').SetDisabled(disable, false);
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable); app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
app.getController('DocumentHolder').getView().SetDisabled(disable); app.getController('DocumentHolder').getView().SetDisabled(disable);
app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable); app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
var leftMenu = app.getController('LeftMenu').leftMenu; var leftMenu = app.getController('LeftMenu').leftMenu;

4
apps/common/main/lib/core/NotificationCenter.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -37,7 +37,7 @@
* of an application through event-driven architecture. * of an application through event-driven architecture.
* *
* Created by Alexander Yuzhin on 1/21/14 * Created by Alexander Yuzhin on 1/21/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

8
apps/common/main/lib/extend/Bootstrap.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Bootstrap.js * Bootstrap.js
* *
* Created by Alexander Yuzhin on 5/27/14 * Created by Alexander Yuzhin on 5/27/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -191,6 +191,10 @@ function clearMenus(isFromInputControl) {
$('.dropdown-toggle').each(function (e) { $('.dropdown-toggle').each(function (e) {
var $parent = ($(this)).parent(); var $parent = ($(this)).parent();
if (!$parent.hasClass('open')) return; if (!$parent.hasClass('open')) return;
if ($parent.attr('data-value') == 'prevent-canvas-click') {
$parent.attr('data-value','');
return;
}
$parent.trigger(e = $.Event('hide.bs.dropdown')); $parent.trigger(e = $.Event('hide.bs.dropdown'));
if (e.isDefaultPrevented()) return; if (e.isDefaultPrevented()) return;
$parent.removeClass('open').trigger('hidden.bs.dropdown', isFromInputControl); $parent.removeClass('open').trigger('hidden.bs.dropdown', isFromInputControl);

4
apps/common/main/lib/model/ChatMessage.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Model * Model
* *
* Created by Maxim Kadushkin on 01 March 2014 * Created by Maxim Kadushkin on 01 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/model/Comment.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Comments.js * Comments.js
* *
* Created by Alexey Musinov on 16.01.14 * Created by Alexey Musinov on 16.01.14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/model/Font.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Font.js * Font.js
* *
* Created by Alexander Yuzhin on 2/11/14 * Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/model/HistoryVersion.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/main/lib/model/Plugin.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/model/ReviewChange.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ReviewChange.js * ReviewChange.js
* *
* Created by Julia.Radzhabova on 05.08.15 * Created by Julia.Radzhabova on 05.08.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

34
apps/common/main/lib/model/User.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,25 +36,33 @@
* Model * Model
* *
* Created by Maxim Kadushkin on 27 February 2014 * Created by Maxim Kadushkin on 27 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
if (Common === undefined)
var Common = {};
Common.Models = Common.Models || {};
define([ define([
'backbone' 'underscore',
], function(Backbone){ 'backbone',
'common/main/lib/component/BaseView'
], function(_, Backbone){
'use strict'; 'use strict';
Common.Models = Common.Models || {};
Common.Models.User = Backbone.Model.extend({ Common.Models.User = Backbone.Model.extend({
defaults: { defaults: function() {
id : undefined, return {
username : 'Guest', iid : Common.UI.getId(), // internal id for rendering
color : '#fff', id : undefined,
colorval : null, username : 'Guest',
online : false, color : '#fff',
view : false colorval : null,
online : false,
view : false
}
} }
}); });
}); });

4
apps/common/main/lib/template/CommentsPopover.template
View file

@ -5,7 +5,7 @@
<div class="user-name"><%=scope.getUserName(username)%></div> <div class="user-name"><%=scope.getUserName(username)%></div>
<div class="user-date"><%=date%></div> <div class="user-date"><%=date%></div>
<% if (!editTextInPopover || hint) { %> <% if (!editTextInPopover || hint) { %>
<textarea readonly class="user-message user-select"><%=scope.pickLink(comment)%></textarea> <textarea readonly class="user-message user-select" style="overflow: hidden;" maxlength="maxCommLength"><%=scope.pickLink(comment)%></textarea>
<% } else { %> <% } else { %>
<div class="inner-edit-ct"> <div class="inner-edit-ct">
<textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea> <textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@ -27,7 +27,7 @@
<div class="user-name"><%=scope.getUserName(item.get("username"))%></div> <div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
<div class="user-date"><%=item.get("date")%></div> <div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editTextInPopover")) { %> <% if (!item.get("editTextInPopover")) { %>
<textarea readonly class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></textarea> <textarea readonly class="user-message user-select" maxlength="maxCommLength" style="overflow: hidden;"><%=scope.pickLink(item.get("reply"))%></textarea>
<% if (!hint) { %> <% if (!hint) { %>
<div class="btns-reply-ct"> <div class="btns-reply-ct">
<% if (item.get("editable")) { %> <% if (item.get("editable")) { %>

4
apps/common/main/lib/util/LanguageInfo.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* LanguageInfo.js * LanguageInfo.js
* *
* Created by Maxim Kadushkin on 31 January 2014 * Created by Maxim Kadushkin on 31 January 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/util/LocalStorage.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* LocalStorage.js * LocalStorage.js
* *
* Created by Maxim Kadushkin on 31 July 2015 * Created by Maxim Kadushkin on 31 July 2015
* Copyright (c) 2015 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/util/Shortcuts.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Shortcuts.js * Shortcuts.js
* *
* Created by Maxim Kadushkin on 05 March 2014 * Created by Maxim Kadushkin on 05 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
/* /*

2
apps/common/main/lib/util/Tip.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

2
apps/common/main/lib/util/define.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/util/utils.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -577,7 +577,7 @@ Common.Utils.String = new (function() {
})(); })();
Common.Utils.isBrowserSupported = function() { Common.Utils.isBrowserSupported = function() {
return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 9.0) || return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 10.0) ||
(Common.Utils.safariVersion != 0 && Common.Utils.safariVersion < 5.0) || (Common.Utils.safariVersion != 0 && Common.Utils.safariVersion < 5.0) ||
(Common.Utils.firefoxVersion != 0 && Common.Utils.firefoxVersion < 4.0) || (Common.Utils.firefoxVersion != 0 && Common.Utils.firefoxVersion < 4.0) ||
(Common.Utils.chromeVersion != 0 && Common.Utils.chromeVersion < 7.0) || (Common.Utils.chromeVersion != 0 && Common.Utils.chromeVersion < 7.0) ||

4
apps/common/main/lib/view/About.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* About.js * About.js
* *
* Created by Julia Radzhabova on 3/06/14 * Created by Julia Radzhabova on 3/06/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* AdvancedSettingsWindow.js * AdvancedSettingsWindow.js
* *
* Created by Julia Radzhabova on 2/21/14 * Created by Julia Radzhabova on 2/21/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

14
apps/common/main/lib/view/Chat.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* View * View
* *
* Created by Maxim Kadushkin on 27 February 2014 * Created by Maxim Kadushkin on 27 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -59,7 +59,7 @@ define([
storeUsers: undefined, storeUsers: undefined,
storeMessages: undefined, storeMessages: undefined,
tplUser: ['<li id="chat-user-<%= user.get("id") %>"<% if (!user.get("online")) { %> class="offline"<% } %>>', tplUser: ['<li id="<%= user.get("iid") %>"<% if (!user.get("online")) { %> class="offline"<% } %>>',
'<div class="color" style="background-color: <%= user.get("color") %>;" >', '<div class="color" style="background-color: <%= user.get("color") %>;" >',
'<label class="name"><%= scope.getUserName(user.get("username")) %></label>', '<label class="name"><%= scope.getUserName(user.get("username")) %></label>',
'</div>', '</div>',
@ -169,7 +169,7 @@ define([
_onUsersChanged: function(m) { _onUsersChanged: function(m) {
if (m.changed.online != undefined && this.panelUsers) { if (m.changed.online != undefined && this.panelUsers) {
this.panelUsers.find('#chat-user-'+ m.get('id'))[m.changed.online?'removeClass':'addClass']('offline'); this.panelUsers.find('#' + m.get('iid'))[m.changed.online?'removeClass':'addClass']('offline');
this.panelUsers.scroller.update({minScrollbarLength : 25, alwaysVisibleY: true}); this.panelUsers.scroller.update({minScrollbarLength : 25, alwaysVisibleY: true});
} }
}, },
@ -389,6 +389,7 @@ define([
if (event && 0 == textBox.val().length) { if (event && 0 == textBox.val().length) {
this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight)); this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight));
this.textBoxAutoSizeLocked = undefined; this.textBoxAutoSizeLocked = undefined;
this.updateScrolls();
return; return;
} }
@ -409,9 +410,8 @@ define([
height = this.panelBox.height(); height = this.panelBox.height();
this.layout.setResizeValue(1, if (this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))))
Math.max(this.addMessageBoxHeight, this.updateScrolls(); // update when resize position changed
Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)));
}, },
updateScrolls: function () { updateScrolls: function () {

5
apps/common/main/lib/view/Comments.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* View * View
* *
* Created by Alexey Musinov on 16.01.14 * Created by Alexey Musinov on 16.01.14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -292,6 +292,7 @@ define([
arr.push($(item).data('bs.tooltip').tip()); arr.push($(item).data('bs.tooltip').tip());
}); });
view.tipsArray = arr; view.tipsArray = arr;
this.autoHeightTextBox();
}; };
var onCommentsViewMouseOver = function() { var onCommentsViewMouseOver = function() {

4
apps/common/main/lib/view/CopyWarningDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* CopyWarningDialog.js * CopyWarningDialog.js
* *
* Created by Alexander Yuzhin on 4/15/14 * Created by Alexander Yuzhin on 4/15/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/DocumentAccessDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* DocumentAccessDialog.js * DocumentAccessDialog.js
* *
* Created by Julia Radzhabova on 3/14/14 * Created by Julia Radzhabova on 3/14/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/view/ExtendedColorDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/view/ExternalDiagramEditor.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ExternalDiagramEditor.js * ExternalDiagramEditor.js
* *
* Created by Julia Radzhabova on 4/08/14 * Created by Julia Radzhabova on 4/08/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/ExternalMergeEditor.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ExternalDiagramEditor.js * ExternalDiagramEditor.js
* *
* Created by Julia Radzhabova on 4/08/14 * Created by Julia Radzhabova on 4/08/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

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

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* Header.js * Header.js
* *
* Created by Alexander Yuzhin on 2/14/14 * Created by Alexander Yuzhin on 2/14/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */
@ -56,7 +56,7 @@ define([
var $saveStatus; var $saveStatus;
var templateUserItem = var templateUserItem =
'<li id="status-chat-user-<%= user.get("id") %>" class="<% if (!user.get("online")) { %> offline <% } if (user.get("view")) {%> viewmode <% } %>">' + '<li id="<%= user.get("iid") %>" class="<% if (!user.get("online")) { %> offline <% } if (user.get("view")) {%> viewmode <% } %>">' +
'<div class="color" style="background-color: <%= user.get("color") %>;" >' + '<div class="color" style="background-color: <%= user.get("color") %>;" >' +
'<label class="name"><%= fnEncode(user.get("username")) %></label>' + '<label class="name"><%= fnEncode(user.get("username")) %></label>' +
'</div>' + '</div>' +
@ -127,7 +127,7 @@ define([
function onUsersChanged(model, collection) { function onUsersChanged(model, collection) {
if (model.changed.online != undefined && $userList) { if (model.changed.online != undefined && $userList) {
$userList.find('#status-chat-user-'+ model.get('id'))[model.changed.online ? 'removeClass' : 'addClass']('offline'); $userList.find('#'+ model.get('iid'))[model.changed.online ? 'removeClass' : 'addClass']('offline');
$userList.scroller && $userList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true}); $userList.scroller && $userList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
} }

2
apps/common/main/lib/view/History.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/view/ImageFromUrlDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* ImageFromUrlDialog.js * ImageFromUrlDialog.js
* *
* Created by Alexander Yuzhin on 2/18/14 * Created by Alexander Yuzhin on 2/18/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/InsertTableDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* InsertTableDialog.js * InsertTableDialog.js
* *
* Created by Alexander Yuzhin on 2/17/14 * Created by Alexander Yuzhin on 2/17/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/LanguageDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -35,7 +35,7 @@
* LanguageDialog.js * LanguageDialog.js
* *
* Created by Julia Radzhabova on 04/25/2017 * Created by Julia Radzhabova on 04/25/2017
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/OpenDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Select Codepage for open CSV/TXT format file. * Select Codepage for open CSV/TXT format file.
* *
* Created by Alexey.Musinov on 29/04/14 * Created by Alexey.Musinov on 29/04/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/PasswordDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* Select Codepage for open CSV/TXT format file. * Select Codepage for open CSV/TXT format file.
* *
* Created by Alexey.Musinov on 29/04/14 * Created by Alexey.Musinov on 29/04/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

2
apps/common/main/lib/view/Plugins.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)

4
apps/common/main/lib/view/Protection.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -35,7 +35,7 @@
* Protection.js * Protection.js
* *
* Created by Julia Radzhabova on 14.11.2017 * Created by Julia Radzhabova on 14.11.2017
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/RenameDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* RenameDialog.js * RenameDialog.js
* *
* Created by Julia Radzhabova on 9/23/16 * Created by Julia Radzhabova on 9/23/16
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/ReviewChanges.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -36,7 +36,7 @@
* View * View
* *
* Created by Julia.Radzhabova on 05.08.15 * Created by Julia.Radzhabova on 05.08.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/SearchDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* SearchDialog.js * SearchDialog.js
* *
* Created by Maxim Kadushkin on 03 March 2014 * Created by Maxim Kadushkin on 03 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/SignDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* SignDialog.js * SignDialog.js
* *
* Created by Julia Radzhabova on 5/19/17 * Created by Julia Radzhabova on 5/19/17
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

4
apps/common/main/lib/view/SignSettingsDialog.js
View file

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2017 * (c) Copyright Ascensio System Limited 2010-2018
* *
* This program is a free software product. You can redistribute it and/or * 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) * modify it under the terms of the GNU Affero General Public License (AGPL)
@ -34,7 +34,7 @@
* SignSettingsDialog.js * SignSettingsDialog.js
* *
* Created by Julia Radzhabova on 5/19/17 * Created by Julia Radzhabova on 5/19/17
* Copyright (c) 2017 Ascensio System SIA. All rights reserved. * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
* *
*/ */

Some files were not shown because too many files have changed in this diff Show more