diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index a951baa9d..8743ff9d9 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -324,7 +324,7 @@
}
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);
if (!type) {
window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
diff --git a/apps/common/Analytics.js b/apps/common/Analytics.js
index eb3c02a9c..37a59ab6d 100644
--- a/apps/common/Analytics.js
+++ b/apps/common/Analytics.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js
index 5e06dbdd8..7d173d612 100644
--- a/apps/common/Gateway.js
+++ b/apps/common/Gateway.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/IrregularStack.js b/apps/common/IrregularStack.js
index a9f59a98c..7a9aa5170 100644
--- a/apps/common/IrregularStack.js
+++ b/apps/common/IrregularStack.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/embed/lib/controller/modals.js b/apps/common/embed/lib/controller/modals.js
index 28fb74d1b..bdf8ac2d1 100644
--- a/apps/common/embed/lib/controller/modals.js
+++ b/apps/common/embed/lib/controller/modals.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/embed/lib/util/utils.js b/apps/common/embed/lib/util/utils.js
index ef670b092..5a4b5db1f 100644
--- a/apps/common/embed/lib/util/utils.js
+++ b/apps/common/embed/lib/util/utils.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/embed/lib/view/modals.js b/apps/common/embed/lib/view/modals.js
index 7f41cc5b5..32b1be5d3 100644
--- a/apps/common/embed/lib/view/modals.js
+++ b/apps/common/embed/lib/view/modals.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/locale.js b/apps/common/locale.js
index 9d401fffc..b84aa0c37 100644
--- a/apps/common/locale.js
+++ b/apps/common/locale.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/collection/ChatMessages.js b/apps/common/main/lib/collection/ChatMessages.js
index d407bed90..afedde6fb 100644
--- a/apps/common/main/lib/collection/ChatMessages.js
+++ b/apps/common/main/lib/collection/ChatMessages.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* Collection
*
* 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.
*
*/
diff --git a/apps/common/main/lib/collection/Comments.js b/apps/common/main/lib/collection/Comments.js
index cbb0f3ac4..1c9fdb4b1 100644
--- a/apps/common/main/lib/collection/Comments.js
+++ b/apps/common/main/lib/collection/Comments.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Comments.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/collection/Fonts.js b/apps/common/main/lib/collection/Fonts.js
index 62d71c993..de2ddfe9c 100644
--- a/apps/common/main/lib/collection/Fonts.js
+++ b/apps/common/main/lib/collection/Fonts.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Fonts.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/collection/HistoryVersions.js b/apps/common/main/lib/collection/HistoryVersions.js
index 9a8fd4f53..00c929c7f 100644
--- a/apps/common/main/lib/collection/HistoryVersions.js
+++ b/apps/common/main/lib/collection/HistoryVersions.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/collection/Plugins.js b/apps/common/main/lib/collection/Plugins.js
index 498f7c2ee..16f491e64 100644
--- a/apps/common/main/lib/collection/Plugins.js
+++ b/apps/common/main/lib/collection/Plugins.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/collection/ReviewChanges.js b/apps/common/main/lib/collection/ReviewChanges.js
index 2ac0c7d04..9f23da3bd 100644
--- a/apps/common/main/lib/collection/ReviewChanges.js
+++ b/apps/common/main/lib/collection/ReviewChanges.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ReviewChanges.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/collection/TextArt.js b/apps/common/main/lib/collection/TextArt.js
index ec2ebfa7a..16d19784e 100644
--- a/apps/common/main/lib/collection/TextArt.js
+++ b/apps/common/main/lib/collection/TextArt.js
@@ -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
* 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
- * Copyright (c) 2014 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*/
if (Common === undefined)
diff --git a/apps/common/main/lib/collection/Users.js b/apps/common/main/lib/collection/Users.js
index e9f472a50..02dc62235 100644
--- a/apps/common/main/lib/collection/Users.js
+++ b/apps/common/main/lib/collection/Users.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* Collection
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/BaseView.js b/apps/common/main/lib/component/BaseView.js
index ae093ef5e..853631472 100644
--- a/apps/common/main/lib/component/BaseView.js
+++ b/apps/common/main/lib/component/BaseView.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* BaseView.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index e55b50942..c766a8d7e 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Button.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js
index 428224d03..2e3849ac0 100644
--- a/apps/common/main/lib/component/CheckBox.js
+++ b/apps/common/main/lib/component/CheckBox.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* CheckBox.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js
index 4572aa358..d9d16c840 100644
--- a/apps/common/main/lib/component/ColorButton.js
+++ b/apps/common/main/lib/component/ColorButton.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/component/ColorPalette.js b/apps/common/main/lib/component/ColorPalette.js
index b39b9f2b9..1c513290a 100644
--- a/apps/common/main/lib/component/ColorPalette.js
+++ b/apps/common/main/lib/component/ColorPalette.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ColorPalette.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js
index 697d621b3..d8ad4bbaf 100644
--- a/apps/common/main/lib/component/ColorPaletteExt.js
+++ b/apps/common/main/lib/component/ColorPaletteExt.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ColorPaletteExt.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js
index 4576f7622..e106b2f4e 100644
--- a/apps/common/main/lib/component/ComboBorderSize.js
+++ b/apps/common/main/lib/component/ComboBorderSize.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ComboBorderSize.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index 612729bb2..a55fd3aa9 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ComboBox.js
*
* 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
}));
if (this.itemsTemplate)
- this.cmpEl.find('ul').append(
+ this.cmpEl.find('ul').html(
$(this.itemsTemplate({
items : items,
scope : me
diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js
index 8e9bec06b..143c8a47f 100644
--- a/apps/common/main/lib/component/ComboBoxFonts.js
+++ b/apps/common/main/lib/component/ComboBoxFonts.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ComboBoxFonts.js
*
* 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('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');
@@ -318,6 +320,15 @@ define([
},
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());
if (this.getRawValue() !== name) {
diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js
index fc4436af0..6bf42af17 100644
--- a/apps/common/main/lib/component/ComboDataView.js
+++ b/apps/common/main/lib/component/ComboDataView.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ComboDataView.js
*
* 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) {
if (!_.isUndefined(record) && record instanceof Backbone.Model){
- this.needFillComboView = false;
+ this.needFillComboView = !this.isVisible();
var me = this,
store = me.menuPicker.store,
diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index beb4fa81e..40a19c71f 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -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
* 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.
*
* 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: '',
listenStoreEvents: true,
allowScrollbar: true,
+ scrollAlwaysVisible: false,
showLast: true,
useBSKeydown: false
},
@@ -239,6 +240,7 @@ define([
me.emptyText = me.options.emptyText || '';
me.listenStoreEvents= (me.options.listenStoreEvents!==undefined) ? me.options.listenStoreEvents : true;
me.allowScrollbar = (me.options.allowScrollbar!==undefined) ? me.options.allowScrollbar : true;
+ me.scrollAlwaysVisible = me.options.scrollAlwaysVisible || false;
if (me.parentMenu)
me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
me.rendered = false;
@@ -308,7 +310,8 @@ define([
el: $(this.el).find('.inner').addBack().filter('.inner'),
useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40,
- wheelSpeed: 10
+ wheelSpeed: 10,
+ alwaysVisibleY: this.scrollAlwaysVisible
});
}
@@ -361,11 +364,12 @@ define([
if (suspendEvents)
this.resumeEvents();
+ return record;
},
selectByIndex: function(index, suspendEvents) {
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'),
useKeyboard: this.enableKeyEvents && !this.handleSelect,
minScrollbarLength : 40,
- wheelSpeed: 10
+ wheelSpeed: 10,
+ alwaysVisibleY: this.scrollAlwaysVisible
});
}
@@ -568,18 +573,21 @@ define([
},
scrollToRecord: function (record) {
+ if (!record) return;
var innerEl = $(this.el).find('.inner'),
inner_top = innerEl.offset().top,
idx = _.indexOf(this.store.models, record),
div = (idx>=0 && this.dataViewItems.length>idx) ? $(this.dataViewItems[idx].el) : innerEl.find('#' + record.get('id'));
if (div.length<=0) return;
- var div_top = div.offset().top;
- if (div_top < inner_top || div_top+div.outerHeight() > inner_top + innerEl.height()) {
+ var div_top = div.offset().top,
+ 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) {
- this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top, 0);
+ this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top, 0);
} 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')),
paddings = parseInt(menuRoot.css('padding-top')) + parseInt(menuRoot.css('padding-bottom')),
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 ) {
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 ) {
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);
}
},
diff --git a/apps/common/main/lib/component/DimensionPicker.js b/apps/common/main/lib/component/DimensionPicker.js
index 7601c82dd..b81c95b54 100644
--- a/apps/common/main/lib/component/DimensionPicker.js
+++ b/apps/common/main/lib/component/DimensionPicker.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* DimensionPicker.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/HSBColorPicker.js b/apps/common/main/lib/component/HSBColorPicker.js
index f6b6e27d4..c64eb4983 100644
--- a/apps/common/main/lib/component/HSBColorPicker.js
+++ b/apps/common/main/lib/component/HSBColorPicker.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index faf1c662a..5bfea7578 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* InputField.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/Layout.js b/apps/common/main/lib/component/Layout.js
index 9b07c7c5c..e620f4820 100644
--- a/apps/common/main/lib/component/Layout.js
+++ b/apps/common/main/lib/component/Layout.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Layout.js
*
* 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
@@ -152,7 +152,8 @@ define([
fmin : panel.resize.fmin,
fmax : panel.resize.fmax,
behaviour : panel.behaviour,
- index : this.splitters.length
+ index : this.splitters.length,
+ offset : panel.resize.offset || 0
};
if (!stretch) {
@@ -224,6 +225,8 @@ define([
},
resizeStart: function(e) {
+ if (this.freeze) return;
+
this.clearSelection();
this.addHandler(window.document, 'selectstart', this.onSelectStart);
@@ -369,7 +372,7 @@ define([
setResizeValue: function (index, value) {
if (index >= this.splitters.length)
- return;
+ return false;
var panel = null, next = null, oldValue = 0,
resize = this.splitters[index].resizer,
@@ -404,6 +407,7 @@ define([
if (resize.value != value) {
this.doLayout();
}
+ return (Math.abs(oldValue-value)>0.99);
}
});
@@ -492,7 +496,10 @@ define([
if ( !panel.stretch ) {
style = panel.el.is(':visible');
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) {
@@ -514,10 +521,13 @@ define([
width = 0;
this.panels.forEach(function(panel){
if (panel.el.is(':visible')) {
- style = {left: width};
+ style = {left: width - (panel.isresizer ? panel.width : 0)};
panel.rely!==true && (style.width = panel.width);
panel.el.css(style);
- width += this.getElementWidth(panel.el);
+ if (panel.isresizer)
+ width += panel.offset;
+ else
+ width += this.getElementWidth(panel.el);
}
},this);
}
diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js
index 226fe349e..1476af029 100644
--- a/apps/common/main/lib/component/ListView.js
+++ b/apps/common/main/lib/component/ListView.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ListView.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/LoadMask.js b/apps/common/main/lib/component/LoadMask.js
index 0d839df17..704606354 100644
--- a/apps/common/main/lib/component/LoadMask.js
+++ b/apps/common/main/lib/component/LoadMask.js
@@ -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
* 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.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/MaskedField.js b/apps/common/main/lib/component/MaskedField.js
index 894e80327..640687c14 100644
--- a/apps/common/main/lib/component/MaskedField.js
+++ b/apps/common/main/lib/component/MaskedField.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js
index f529a4ac8..fa03b2612 100644
--- a/apps/common/main/lib/component/Menu.js
+++ b/apps/common/main/lib/component/Menu.js
@@ -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
* 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}.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js
index 9142fef94..ffd4c1d69 100644
--- a/apps/common/main/lib/component/MenuItem.js
+++ b/apps/common/main/lib/component/MenuItem.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -37,7 +37,7 @@
* sub-menus, icons, etc.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js
index 28d286d71..354689eaf 100644
--- a/apps/common/main/lib/component/MetricSpinner.js
+++ b/apps/common/main/lib/component/MetricSpinner.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* MetricSpinner.js
*
* 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))
val = this.oldValue;
} 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);
}
diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 0edc4d482..f9c921d8c 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -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
* 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.
- * Copyright (c) 2017 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js
index 86290981b..77a1812cd 100644
--- a/apps/common/main/lib/component/MultiSliderGradient.js
+++ b/apps/common/main/lib/component/MultiSliderGradient.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* MultiSliderGradient.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js
index 839c76f3a..9d8e435ee 100644
--- a/apps/common/main/lib/component/RadioBox.js
+++ b/apps/common/main/lib/component/RadioBox.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* RadioBox.js
*
* 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.
*
*/
/**
diff --git a/apps/common/main/lib/component/Scroller.js b/apps/common/main/lib/component/Scroller.js
index 4143db7aa..550e45aeb 100644
--- a/apps/common/main/lib/component/Scroller.js
+++ b/apps/common/main/lib/component/Scroller.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Scroller.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js
index 67a86d2d2..371c119cb 100644
--- a/apps/common/main/lib/component/Slider.js
+++ b/apps/common/main/lib/component/Slider.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Slider.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/Switcher.js b/apps/common/main/lib/component/Switcher.js
index 40d2a85b8..db2c2ad2b 100644
--- a/apps/common/main/lib/component/Switcher.js
+++ b/apps/common/main/lib/component/Switcher.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js
index cb1aa968c..8cbbd51de 100644
--- a/apps/common/main/lib/component/SynchronizeTip.js
+++ b/apps/common/main/lib/component/SynchronizeTip.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js
index 72018f776..15ac4a025 100644
--- a/apps/common/main/lib/component/Tab.js
+++ b/apps/common/main/lib/component/Tab.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Tab.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js
index 81db94966..c52f7f446 100644
--- a/apps/common/main/lib/component/TabBar.js
+++ b/apps/common/main/lib/component/TabBar.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* TabBar.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js
index 40c383d4f..7a354e0bd 100644
--- a/apps/common/main/lib/component/TableStyler.js
+++ b/apps/common/main/lib/component/TableStyler.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* TableStyler.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js
index bfdeae7d2..73c761b19 100644
--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ThemeColorPalette.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/ToggleManager.js b/apps/common/main/lib/component/ToggleManager.js
index c8ea8ef55..dab80c690 100644
--- a/apps/common/main/lib/component/ToggleManager.js
+++ b/apps/common/main/lib/component/ToggleManager.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ToggleManager.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/component/Tooltip.js b/apps/common/main/lib/component/Tooltip.js
index 84b271a49..230cde22b 100644
--- a/apps/common/main/lib/component/Tooltip.js
+++ b/apps/common/main/lib/component/Tooltip.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Tooltip.js
*
* 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.
*
*/
/*
diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js
index eb382a14b..1eb299f1b 100644
--- a/apps/common/main/lib/component/TreeView.js
+++ b/apps/common/main/lib/component/TreeView.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -158,6 +158,7 @@ define([
handleSelect: true,
showLast: true,
allowScrollbar: true,
+ scrollAlwaysVisible: true,
emptyItemText: ''
},
@@ -245,24 +246,24 @@ define([
var isExpanded = !record.get('isExpanded');
record.set('isExpanded', isExpanded);
this.store[(isExpanded) ? 'expandSubItems' : 'collapseSubItems'](record);
- this.scroller.update({minScrollbarLength: 40});
+ this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
} else
Common.UI.DataView.prototype.onClickItem.call(this, view, record, e);
},
expandAll: function() {
this.store.expandAll();
- this.scroller.update({minScrollbarLength: 40});
+ this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
},
collapseAll: function() {
this.store.collapseAll();
- this.scroller.update({minScrollbarLength: 40});
+ this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
},
expandToLevel: function(expandLevel) {
this.store.expandToLevel(expandLevel);
- this.scroller.update({minScrollbarLength: 40});
+ this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: this.scrollAlwaysVisible});
}
}
})());
diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index e4387beaa..ae250a195 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Window.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/Chat.js b/apps/common/main/lib/controller/Chat.js
index 25697ac19..e673adc0f 100644
--- a/apps/common/main/lib/controller/Chat.js
+++ b/apps/common/main/lib/controller/Chat.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* Controller
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js
index 00fc195a1..55cda0f45 100644
--- a/apps/common/main/lib/controller/Comments.js
+++ b/apps/common/main/lib/controller/Comments.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Comments.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/ExternalDiagramEditor.js b/apps/common/main/lib/controller/ExternalDiagramEditor.js
index ad90550a1..11ecae80d 100644
--- a/apps/common/main/lib/controller/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/controller/ExternalDiagramEditor.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ExternalDiagramEditor.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/ExternalMergeEditor.js b/apps/common/main/lib/controller/ExternalMergeEditor.js
index 7dc992ce7..6e3cfdfc5 100644
--- a/apps/common/main/lib/controller/ExternalMergeEditor.js
+++ b/apps/common/main/lib/controller/ExternalMergeEditor.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ExternalDiagramEditor.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/Fonts.js b/apps/common/main/lib/controller/Fonts.js
index cd6ca5f49..364478fcb 100644
--- a/apps/common/main/lib/controller/Fonts.js
+++ b/apps/common/main/lib/controller/Fonts.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Fonts.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index 6be2b1405..998bbdecd 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index 911d90fb3..7db8fb145 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/controller/Protection.js b/apps/common/main/lib/controller/Protection.js
index 99e8ac821..1282aa044 100644
--- a/apps/common/main/lib/controller/Protection.js
+++ b/apps/common/main/lib/controller/Protection.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -35,7 +35,7 @@
* Protection.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index 2d634f94d..4e64011e6 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ReviewChanges.js
*
* 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('Statusbar').getView('Statusbar').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);
var leftMenu = app.getController('LeftMenu').leftMenu;
diff --git a/apps/common/main/lib/core/NotificationCenter.js b/apps/common/main/lib/core/NotificationCenter.js
index 1dbabbf2d..20d733284 100644
--- a/apps/common/main/lib/core/NotificationCenter.js
+++ b/apps/common/main/lib/core/NotificationCenter.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -37,7 +37,7 @@
* of an application through event-driven architecture.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/extend/Bootstrap.js b/apps/common/main/lib/extend/Bootstrap.js
index ab55b71f9..4ae829c2d 100755
--- a/apps/common/main/lib/extend/Bootstrap.js
+++ b/apps/common/main/lib/extend/Bootstrap.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Bootstrap.js
*
* 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) {
var $parent = ($(this)).parent();
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'));
if (e.isDefaultPrevented()) return;
$parent.removeClass('open').trigger('hidden.bs.dropdown', isFromInputControl);
diff --git a/apps/common/main/lib/model/ChatMessage.js b/apps/common/main/lib/model/ChatMessage.js
index 49febb9e2..941947f12 100644
--- a/apps/common/main/lib/model/ChatMessage.js
+++ b/apps/common/main/lib/model/ChatMessage.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* Model
*
* 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.
*
*/
diff --git a/apps/common/main/lib/model/Comment.js b/apps/common/main/lib/model/Comment.js
index 2d3c7ae94..83479b771 100644
--- a/apps/common/main/lib/model/Comment.js
+++ b/apps/common/main/lib/model/Comment.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Comments.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/model/Font.js b/apps/common/main/lib/model/Font.js
index 201d15208..818829ffc 100644
--- a/apps/common/main/lib/model/Font.js
+++ b/apps/common/main/lib/model/Font.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Font.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/model/HistoryVersion.js b/apps/common/main/lib/model/HistoryVersion.js
index 4908e09b7..f6ef20c46 100644
--- a/apps/common/main/lib/model/HistoryVersion.js
+++ b/apps/common/main/lib/model/HistoryVersion.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js
index 2b1b73602..6456647d1 100644
--- a/apps/common/main/lib/model/Plugin.js
+++ b/apps/common/main/lib/model/Plugin.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/model/ReviewChange.js b/apps/common/main/lib/model/ReviewChange.js
index 8bd302fcc..280cce495 100644
--- a/apps/common/main/lib/model/ReviewChange.js
+++ b/apps/common/main/lib/model/ReviewChange.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ReviewChange.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/model/User.js b/apps/common/main/lib/model/User.js
index b308ca136..f224399a5 100644
--- a/apps/common/main/lib/model/User.js
+++ b/apps/common/main/lib/model/User.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,25 +36,33 @@
* Model
*
* 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([
- 'backbone'
-], function(Backbone){
+ 'underscore',
+ 'backbone',
+ 'common/main/lib/component/BaseView'
+], function(_, Backbone){
'use strict';
- Common.Models = Common.Models || {};
-
Common.Models.User = Backbone.Model.extend({
- defaults: {
- id : undefined,
- username : 'Guest',
- color : '#fff',
- colorval : null,
- online : false,
- view : false
+ defaults: function() {
+ return {
+ iid : Common.UI.getId(), // internal id for rendering
+ id : undefined,
+ username : 'Guest',
+ color : '#fff',
+ colorval : null,
+ online : false,
+ view : false
+ }
}
});
});
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template
index e96797333..20f185e2e 100644
--- a/apps/common/main/lib/template/CommentsPopover.template
+++ b/apps/common/main/lib/template/CommentsPopover.template
@@ -5,7 +5,7 @@
<% if (!item.get("editTextInPopover")) { %>
-
+
<% if (!hint) { %>
<% if (item.get("editable")) { %>
diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js
index ba3db2877..6c2917964 100644
--- a/apps/common/main/lib/util/LanguageInfo.js
+++ b/apps/common/main/lib/util/LanguageInfo.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* LanguageInfo.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/util/LocalStorage.js b/apps/common/main/lib/util/LocalStorage.js
index 1b0a86888..fba918a1b 100644
--- a/apps/common/main/lib/util/LocalStorage.js
+++ b/apps/common/main/lib/util/LocalStorage.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* LocalStorage.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/util/Shortcuts.js b/apps/common/main/lib/util/Shortcuts.js
index a50c5b23b..97c1aedfd 100644
--- a/apps/common/main/lib/util/Shortcuts.js
+++ b/apps/common/main/lib/util/Shortcuts.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Shortcuts.js
*
* 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.
*
*/
/*
diff --git a/apps/common/main/lib/util/Tip.js b/apps/common/main/lib/util/Tip.js
index f4ce19e4a..f04507b9a 100644
--- a/apps/common/main/lib/util/Tip.js
+++ b/apps/common/main/lib/util/Tip.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js
index 46c67580f..562df9121 100644
--- a/apps/common/main/lib/util/define.js
+++ b/apps/common/main/lib/util/define.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index df5006ed3..190e8c80c 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -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
* 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() {
- 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.firefoxVersion != 0 && Common.Utils.firefoxVersion < 4.0) ||
(Common.Utils.chromeVersion != 0 && Common.Utils.chromeVersion < 7.0) ||
diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js
index a9f0dce04..d40c8610f 100644
--- a/apps/common/main/lib/view/About.js
+++ b/apps/common/main/lib/view/About.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* About.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js
index c3afaf523..14fe6c10b 100644
--- a/apps/common/main/lib/view/AdvancedSettingsWindow.js
+++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* AdvancedSettingsWindow.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js
index d84448032..8d5a6212a 100644
--- a/apps/common/main/lib/view/Chat.js
+++ b/apps/common/main/lib/view/Chat.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* View
*
* 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,
storeMessages: undefined,
- tplUser: ['
"<% if (!user.get("online")) { %> class="offline"<% } %>>',
'
;" >',
'',
'
',
@@ -169,7 +169,7 @@ define([
_onUsersChanged: function(m) {
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});
}
},
@@ -389,6 +389,7 @@ define([
if (event && 0 == textBox.val().length) {
this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight));
this.textBoxAutoSizeLocked = undefined;
+ this.updateScrolls();
return;
}
@@ -409,9 +410,8 @@ define([
height = this.panelBox.height();
- this.layout.setResizeValue(1,
- Math.max(this.addMessageBoxHeight,
- Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)));
+ if (this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))))
+ this.updateScrolls(); // update when resize position changed
},
updateScrolls: function () {
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js
index 2a7c9200a..164e936ed 100644
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* View
*
* 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());
});
view.tipsArray = arr;
+ this.autoHeightTextBox();
};
var onCommentsViewMouseOver = function() {
diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js
index 7d8fff28c..427949e05 100644
--- a/apps/common/main/lib/view/CopyWarningDialog.js
+++ b/apps/common/main/lib/view/CopyWarningDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* CopyWarningDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/DocumentAccessDialog.js b/apps/common/main/lib/view/DocumentAccessDialog.js
index 30fc76d9c..a9e9e0e56 100644
--- a/apps/common/main/lib/view/DocumentAccessDialog.js
+++ b/apps/common/main/lib/view/DocumentAccessDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* DocumentAccessDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js
index f7374d10f..ff6e6e86d 100644
--- a/apps/common/main/lib/view/ExtendedColorDialog.js
+++ b/apps/common/main/lib/view/ExtendedColorDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js
index 511fe6585..9d5e0641d 100644
--- a/apps/common/main/lib/view/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/view/ExternalDiagramEditor.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ExternalDiagramEditor.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/ExternalMergeEditor.js b/apps/common/main/lib/view/ExternalMergeEditor.js
index 61570e5f3..f4917af17 100644
--- a/apps/common/main/lib/view/ExternalMergeEditor.js
+++ b/apps/common/main/lib/view/ExternalMergeEditor.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ExternalDiagramEditor.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 4c5ab7cb5..5f2895b03 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* Header.js
*
* 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 templateUserItem =
- '
" class="<% if (!user.get("online")) { %> offline <% } if (user.get("view")) {%> viewmode <% } %>">' +
+ '
" class="<% if (!user.get("online")) { %> offline <% } if (user.get("view")) {%> viewmode <% } %>">' +
'
;" >' +
'' +
'
' +
@@ -127,7 +127,7 @@ define([
function onUsersChanged(model, collection) {
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});
}
diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js
index 09970162f..e915c66ae 100644
--- a/apps/common/main/lib/view/History.js
+++ b/apps/common/main/lib/view/History.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js
index 992257873..5f92912fc 100644
--- a/apps/common/main/lib/view/ImageFromUrlDialog.js
+++ b/apps/common/main/lib/view/ImageFromUrlDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* ImageFromUrlDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js
index 0189aa7fc..c895a3bb0 100644
--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* InsertTableDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index 5b88b4fb5..26f87e7c3 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -35,7 +35,7 @@
* LanguageDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index 1fcb92d10..9a7b0899b 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -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
* 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.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js
index 320d75293..02ab68cf1 100644
--- a/apps/common/main/lib/view/PasswordDialog.js
+++ b/apps/common/main/lib/view/PasswordDialog.js
@@ -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
* 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.
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index 1b870e814..6a98e3200 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
diff --git a/apps/common/main/lib/view/Protection.js b/apps/common/main/lib/view/Protection.js
index b66853b11..2154cad27 100644
--- a/apps/common/main/lib/view/Protection.js
+++ b/apps/common/main/lib/view/Protection.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -35,7 +35,7 @@
* Protection.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/RenameDialog.js b/apps/common/main/lib/view/RenameDialog.js
index 95207e9bf..241b8c589 100644
--- a/apps/common/main/lib/view/RenameDialog.js
+++ b/apps/common/main/lib/view/RenameDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* RenameDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js
index 1efa2905d..9f86d7636 100644
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -36,7 +36,7 @@
* View
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js
index f518a9a88..e266784d0 100644
--- a/apps/common/main/lib/view/SearchDialog.js
+++ b/apps/common/main/lib/view/SearchDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* SearchDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js
index 2ce0863ac..4fdcf3f9b 100644
--- a/apps/common/main/lib/view/SignDialog.js
+++ b/apps/common/main/lib/view/SignDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* SignDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/lib/view/SignSettingsDialog.js b/apps/common/main/lib/view/SignSettingsDialog.js
index e85b8c3e0..db62ea0fa 100644
--- a/apps/common/main/lib/view/SignSettingsDialog.js
+++ b/apps/common/main/lib/view/SignSettingsDialog.js
@@ -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
* modify it under the terms of the GNU Affero General Public License (AGPL)
@@ -34,7 +34,7 @@
* SignSettingsDialog.js
*
* 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.
*
*/
diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png
index 4af0c3e62..86c6e0c13 100755
Binary files a/apps/common/main/resources/img/controls/common-controls@2x.png and b/apps/common/main/resources/img/controls/common-controls@2x.png differ
diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png
index a12a54961..f84e10e26 100644
Binary files a/apps/common/main/resources/img/controls/toolbarbig.png and b/apps/common/main/resources/img/controls/toolbarbig.png differ
diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png
index 3692eeff3..4d5486b11 100644
Binary files a/apps/common/main/resources/img/controls/toolbarbig@2x.png and b/apps/common/main/resources/img/controls/toolbarbig@2x.png differ
diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted.png
rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted.png
diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-highlighted@2x.png
rename to apps/common/main/resources/img/dimension-picker/dimension-highlighted@2x.png
diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted.png
rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted.png
diff --git a/apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png b/apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/controls/dimension-picker/dimension-unhighlighted@2x.png
rename to apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@2x.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle.png
rename to apps/common/main/resources/img/right-panels/Begin-EndStyle.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png b/apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/Begin-EndStyle@2x.png
rename to apps/common/main/resources/img/right-panels/Begin-EndStyle@2x.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders.png b/apps/common/main/resources/img/right-panels/SmallBorders.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders.png
rename to apps/common/main/resources/img/right-panels/SmallBorders.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png b/apps/common/main/resources/img/right-panels/SmallBorders@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/SmallBorders@2x.png
rename to apps/common/main/resources/img/right-panels/SmallBorders@2x.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients.png b/apps/common/main/resources/img/right-panels/gradients.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/gradients.png
rename to apps/common/main/resources/img/right-panels/gradients.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/gradients@2x.png b/apps/common/main/resources/img/right-panels/gradients@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/gradients@2x.png
rename to apps/common/main/resources/img/right-panels/gradients@2x.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns.png b/apps/common/main/resources/img/right-panels/patterns.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/patterns.png
rename to apps/common/main/resources/img/right-panels/patterns.png
diff --git a/apps/documenteditor/main/resources/img/right-panels/patterns@2x.png b/apps/common/main/resources/img/right-panels/patterns@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/right-panels/patterns@2x.png
rename to apps/common/main/resources/img/right-panels/patterns@2x.png
diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/right-panels/rowscols_icon.png
rename to apps/common/main/resources/img/right-panels/rowscols_icon.png
diff --git a/apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png
similarity index 100%
rename from apps/presentationeditor/main/resources/img/right-panels/rowscols_icon@2x.png
rename to apps/common/main/resources/img/right-panels/rowscols_icon@2x.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png
rename to apps/common/main/resources/img/toolbar/bullets-and-numbering.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png
rename to apps/common/main/resources/img/toolbar/bullets-and-numbering@2x.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes.png b/apps/common/main/resources/img/toolbar/charttypes.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/charttypes.png
rename to apps/common/main/resources/img/toolbar/charttypes.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png b/apps/common/main/resources/img/toolbar/charttypes@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/charttypes@2x.png
rename to apps/common/main/resources/img/toolbar/charttypes@2x.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/math.png b/apps/common/main/resources/img/toolbar/math.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/math.png
rename to apps/common/main/resources/img/toolbar/math.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/math@2x.png b/apps/common/main/resources/img/toolbar/math@2x.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/math@2x.png
rename to apps/common/main/resources/img/toolbar/math@2x.png
diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less
index feb87653c..6738d6a17 100644
--- a/apps/common/main/resources/less/dimension-picker.less
+++ b/apps/common/main/resources/less/dimension-picker.less
@@ -21,12 +21,12 @@
.dimension-picker-unhighlighted {
//background: transparent repeat scroll 0 0;
- .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-unhighlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
+ .background-ximage('@{common-image-path}/dimension-picker/dimension-unhighlighted.png', '@{common-image-path}/dimension-picker/dimension-unhighlighted@2x.png', 18px, auto, repeat);
}
.dimension-picker div.dimension-picker-highlighted {
//background: transparent repeat scroll 0 0;
- .background-ximage('@{app-image-path}/controls/dimension-picker/dimension-highlighted.png', '@{app-image-path}/controls/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
+ .background-ximage('@{common-image-path}/dimension-picker/dimension-highlighted.png', '@{common-image-path}/dimension-picker/dimension-highlighted@2x.png', 18px, auto, repeat);
}
.dimension-picker-status {
diff --git a/apps/common/main/resources/less/language-dialog.less b/apps/common/main/resources/less/language-dialog.less
index 4d2a5f0aa..ab82c66b0 100644
--- a/apps/common/main/resources/less/language-dialog.less
+++ b/apps/common/main/resources/less/language-dialog.less
@@ -30,7 +30,7 @@
&.it, &.it-IT {background-position: -32px -24px;}
&.ko, &.ko-KR {background-position: 0 -36px;}
&.nl, &.nl-NL {background-position: -16px -36px;}
- &.nb, &.nb-NO {background-position: -32px -36px;}
+ &.nb, &.nb-NO, &.nn, &.nn-NO {background-position: -32px -36px;}
&.pl, &.pl-PL {background-position: 0 -48px;}
&.pt, &.pt-BR {background-position: -16px -48px;}
&.ro, &.ro-RO {background-position: -32px -48px;}
@@ -42,7 +42,6 @@
&.lt, &.lt-LT {background-position: 0 -84px;}
&.vi, &.vi-VN {background-position: -16px -84px;}
&.de-CH {background-position: -32px -84px;}
- &.nn, &.nn-NO {background-position: 0 -96px;}
&.pt-PT {background-position: -16px -96px;}
&.de-AT {background-position: -32px -96px;}
&.es, &.es-ES {background-position: 0 -108px;}
diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less
index c3ef9c3fc..d447dfe85 100644
--- a/apps/common/main/resources/less/layout.less
+++ b/apps/common/main/resources/less/layout.less
@@ -2,7 +2,7 @@
* layout.less
*
* 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.
*
*/
diff --git a/apps/common/main/resources/less/separator.less b/apps/common/main/resources/less/separator.less
index 09e3ee4c0..b163e8a96 100644
--- a/apps/common/main/resources/less/separator.less
+++ b/apps/common/main/resources/less/separator.less
@@ -2,7 +2,7 @@
* description of styles for the '.separator' element
*
* Created by Maxim Kadushkin 1/22/14
- * Copyright (c) 2014 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less
index 91c29c2ba..c5b43ea1e 100644
--- a/apps/common/main/resources/less/treeview.less
+++ b/apps/common/main/resources/less/treeview.less
@@ -37,7 +37,7 @@
.tree-item {
width: 100%;
min-height: 28px;
- padding: 0px 0 0 24px;
+ padding: 0px 6px 0 24px;
}
.name {
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 74f9c4000..8e3302440 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -4,7 +4,7 @@
* Describes styles for base class 'Window'
*
* 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.
*
*/
diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.js b/apps/common/mobile/lib/component/ThemeColorPalette.js
index 56d08a7ee..cf8c9028c 100644
--- a/apps/common/mobile/lib/component/ThemeColorPalette.js
+++ b/apps/common/mobile/lib/component/ThemeColorPalette.js
@@ -1,6 +1,6 @@
/*
*
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
*
* 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)
@@ -35,7 +35,7 @@
* ThemeColorPalette.js
*
* Created by Alexander Yuzhin on 10/27/16
- * Copyright (c) 2016 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/common/mobile/utils/SharedSettings.js b/apps/common/mobile/utils/SharedSettings.js
index ba2846bc7..9b644d2c7 100644
--- a/apps/common/mobile/utils/SharedSettings.js
+++ b/apps/common/mobile/utils/SharedSettings.js
@@ -1,6 +1,6 @@
/*
*
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
*
* 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)
@@ -35,7 +35,7 @@
* SharedSettings.js
*
* Created by Alexander Yuzhin on 10/7/16
- * Copyright (c) 2016 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/common/mobile/utils/extendes.js b/apps/common/mobile/utils/extendes.js
index 97e612bce..b71e0bbf3 100644
--- a/apps/common/mobile/utils/extendes.js
+++ b/apps/common/mobile/utils/extendes.js
@@ -1,6 +1,6 @@
/*
*
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
*
* 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)
@@ -35,7 +35,7 @@
* extendes.js
*
* Created by Alexander Yuzhin on 10/14/16
- * Copyright (c) 2016 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/common/mobile/utils/utils.js b/apps/common/mobile/utils/utils.js
index 0cf7cd5b4..f5e6954c3 100644
--- a/apps/common/mobile/utils/utils.js
+++ b/apps/common/mobile/utils/utils.js
@@ -1,6 +1,6 @@
/*
*
- * (c) Copyright Ascensio System Limited 2010-2016
+ * (c) Copyright Ascensio System Limited 2010-2018
*
* 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)
@@ -35,7 +35,7 @@
* utils.js
*
* Created by Maxim.Kadushkin on 1/30/2017
- * Copyright (c) 2016 Ascensio System SIA. All rights reserved.
+ * Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index ec5a7131a..5a37da3b2 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -198,7 +198,7 @@
check = function(regex){ return regex.test(userAgent); };
if (!check(/opera/) && (check(/msie/) || check(/trident/))) {
var m = /msie (\d+\.\d+)/.exec(userAgent);
- if (m && parseFloat(m[1]) < 9.0) {
+ if (m && parseFloat(m[1]) < 10.0) {
document.write(
'
',
'
',
@@ -340,7 +340,7 @@
+
-
Über den TeamLab Document Editor
-
Der TeamLab Document Editor ist eine Online-Anwendung, die Sie Ihre Dokumente direkt auf Ihrem TeamLab-Portal durchsehen
- und bearbeiten lässt.
-
Mit dem TeamLab Document Editor können Sie unterschiedliche Bearbeitungsoperationen wie in den meisten Desktop-Editoren durchführen,
- bearbeitete Dokumente mit der Beibehaltung aller Formatierungsdetails drucken oder auf die Festplatte Ihres Rechners
- als PDF-, TXT-, DOCX-, DOC-, ODT-, RTF-, HTML- oder EPUB-Dateien herunterladen.
+
+
+
+
Über den Dokumenteneditor
+
Der Dokumenteneditor ist eine Online-Anwendung, mit der Sie Ihre Dokumente direkt in Ihrem Browser betrachten und bearbeiten können.
+
Mit dem Dokumenteneditor können Sie Editiervorgänge durchführen, wie bei einem beliebigen Desktopeditor, editierte Dokumente unter Beibehaltung aller Formatierungsdetails drucken oder sie auf der Festplatte Ihres Rechners als PDF-, TXT-, DOCX-, DOC-, ODT-, RTF-, HTML- oder EPUB-Dateien speichern.
+
Wenn Sie mehr über die aktuelle Softwareversion und den Lizenzgeber erfahren möchten, klicken Sie auf das Symbol in der linken Seitenleiste.