',
'
'
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js
index b4b65d017..a9d1e8501 100644
--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@@ -110,8 +110,8 @@ define([
onBtnClick: function(event) {
if (this.options.handler) {
this.options.handler.call(this, event.currentTarget.attributes['result'].value, {
- columns : this.udColumns.getValue(),
- rows : this.udRows.getValue()
+ columns : this.udColumns.getNumberValue(),
+ rows : this.udRows.getNumberValue()
});
}
@@ -121,8 +121,8 @@ define([
onPrimary: function() {
if (this.options.handler) {
this.options.handler.call(this, 'ok', {
- columns : this.udColumns.getValue(),
- rows : this.udRows.getValue()
+ columns : this.udColumns.getNumberValue(),
+ rows : this.udRows.getNumberValue()
});
}
diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index ad4216a15..cee215f17 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -52,8 +52,7 @@ define([
header: false,
width: 350,
cls: 'modal-dlg',
- buttons: ['ok', 'cancel'],
- footerCls: 'right'
+ buttons: ['ok', 'cancel']
},
template: '',
- '',
+ '',
'
',
'',
'' +
diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js
new file mode 100644
index 000000000..8f783c8d0
--- /dev/null
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@@ -0,0 +1,293 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ * ListSettingsDialog.js
+ *
+ * Created by Julia Radzhabova on 30.10.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+ var Common = {};
+
+define([
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/ThemeColorPalette',
+ 'common/main/lib/component/ColorButton',
+ 'common/main/lib/view/SymbolTableDialog'
+], function () { 'use strict';
+
+ Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ type: 0, // 0 - markers, 1 - numbers
+ width: 230,
+ height: 200,
+ style: 'min-width: 240px;',
+ cls: 'modal-dlg',
+ split: false,
+ buttons: ['ok', 'cancel']
+ },
+
+ initialize : function(options) {
+ this.type = options.type || 0;
+
+ _.extend(this.options, {
+ title: this.txtTitle
+ }, options || {});
+
+ this.template = [
+ '
'; + nCellsCounter = 0; + } + } + this.previewPanel.html(sInnerHtml); + }, + + fillRecentSymbols: function(){ + var sRecents = Common.localStorage.getItem(this.appPrefix + 'recentSymbols'); + var aRecentCookies; + if(sRecents != ''){ + aRecentCookies = JSON.parse(sRecents); + } + if(_.isArray(aRecentCookies)){ + aRecents = aRecentCookies; + } + }, + + saveRecent: function(){ + var sJSON = JSON.stringify(aRecents); + Common.localStorage.setItem(this.appPrefix + 'recentSymbols', sJSON); + }, + + checkRecent: function(sSymbol, sFont){ + if(aRecents.length === 0){ + aRecents.push({symbol: sSymbol, font: sFont}); + return; + } + for(var i = 0; i < aRecents.length; ++i){ + if(aRecents[i].symbol === sSymbol && aRecents[i].font === sFont){ + aRecents.splice(i, 1); + break; + } + } + aRecents.splice(0, 0, {symbol: sSymbol, font: sFont}); + if(aRecents.length > nMaxRecent){ + aRecents.splice(nMaxRecent, aRecents.length - nMaxRecent); + } + this.saveRecent(); + }, + + createCell: function(nSymbolCode, sFontName){ + var sId = '', + symbol = ''; + if(sFontName){ + var nFontIndex = 0; + for(var i = 0; i < aFontSelects.length; ++i){ + if(aFontSelects[i].displayValue === sFontName){ + nFontIndex = i; + break; + } + } + sId = 'r_' + nSymbolCode + '_' + nFontIndex; + symbol = '&#' + nSymbolCode.toString(); + } else if (nSymbolCode!==undefined) { + sId = 'r' + nSymbolCode; + symbol = '&#' + nSymbolCode.toString(); + } + var _ret = $('> 0);
+ },
+
+ getMaxHeight: function(){
+ return this.symbolTablePanel.innerHeight();
+ },
+
+ getRowsCount: function() {
+ return Math.max(1, ((this.getMaxHeight()/CELL_HEIGHT) >> 0));
+ },
+
+ getAllSymbolsCount: function(arrRanges){
+ var _count = 0;
+ var oRange;
+ for(var i = 0; i < arrRanges.length; ++i){
+ oRange = arrRanges[i];
+ _count += (oRange.End - oRange.Start + 1);
+ }
+ return _count;
+ },
+
+ setTable: function(nStartCode){
+ var nColsCount = this.getColsCount();
+ var nRowsCount = this.getRowsCount();
+ var nIndexSymbol = this.getLinearIndexByCode(aRanges, nStartCode);
+ var nAllSymbolsCount = this.getAllSymbolsCount(aRanges);
+ var nAllRowsCount = Math.ceil(nAllSymbolsCount/nColsCount);
+ var nRowsSkip = Math.max(0, Math.min(nAllRowsCount - nRowsCount, ((nIndexSymbol / nColsCount) >> 0)));
+ var nFirst = nRowsSkip*nColsCount;
+ var nSymbolsCount = nRowsCount*nColsCount;
+ var aSymbols = [];
+ var nCode;
+ for(var i = 0; i < nSymbolsCount; ++i){
+ nCode = this.getCodeByLinearIndex(aRanges, nFirst + i);
+ if(nCode === -1){
+ break;
+ }
+ aSymbols.push(nCode);
+ }
+ this.previewPanel.css('font-family', '\'' + aFontSelects[nCurrentFont].displayValue + '\'');
+ this.createTable(aSymbols, nRowsCount, nColsCount);
+ return nRowsSkip;
+ },
+
+ updateView: function(bUpdateTable, nTopSymbol, bUpdateInput, bUpdateRecents, bUpdateRanges) {
+ //fill ranges combo box
+ if(bMainFocus){
+ if(bUpdateRanges !== false){
+ this.updateRangeSelector();
+ }
+ }
+
+ if(bMainFocus){
+ this.fontLabel.text(aFontSelects[nCurrentFont] ? aFontSelects[nCurrentFont].displayValue : '');
+ } else {
+ this.fontLabel.text(aFontSelects[nFontNameRecent] ? aFontSelects[nFontNameRecent].displayValue : '');
+ }
+
+ if(bUpdateTable !== false){
+ //fill fonts combo box
+ this.cmbFonts.setValue(nCurrentFont);
+ }
+
+ //main table
+ var nRowsCount = this.getRowsCount();
+ var nHeight = nRowsCount*CELL_HEIGHT;
+ bScrollMouseUp = false;
+ if(bUpdateTable !== false){
+ //fill table
+ var nSymbol = (nTopSymbol !== null && nTopSymbol !== undefined)? nTopSymbol : nCurrentSymbol;
+ var nRowSkip = this.setTable(nSymbol);
+ //update scroll
+ var nSymbolsCount = this.getAllSymbolsCount(aRanges);
+ var nAllRowsCount = Math.ceil(nSymbolsCount/this.getColsCount());
+ var nFullHeight = nAllRowsCount*CELL_HEIGHT;
+
+ this.previewInner.height(nFullHeight);
+ this.previewPanel.height(nHeight);
+ this.previewScrolled.height(nHeight);
+
+ if (!this.scrollerY) {
+ minScrollbarLength = Math.max((CELL_HEIGHT*2.0/3.0 + 0.5) >> 0, ((nHeight/8.0 + 0.5) >> 0));
+ wheelSpeed = Math.min((Math.floor(this.previewPanel.height()/CELL_HEIGHT) * CELL_HEIGHT)/10, 20);
+ this.scrollerY = new Common.UI.Scroller({
+ el: this.previewScrolled,
+ minScrollbarLength: minScrollbarLength,
+ alwaysVisibleY: true,
+ wheelSpeed: wheelSpeed,
+ useKeyboard: false,
+ onChange: _.bind(function(){
+ if (this.scrollerY) {
+ this._preventUpdateScroll = true;
+ this.onScrollEnd();
+ this._preventUpdateScroll = false;
+ this.previewParent.height(nHeight);
+ this.previewParent.css({top: this.scrollerY.getScrollTop()});
+ }
+ }, this)
+ });
+ }
+ if (!this._preventUpdateScroll) {
+ this.scrollerY.update({
+ minScrollbarLength: minScrollbarLength,
+ wheelSpeed: wheelSpeed
+ });
+ this.scrollerY.scrollTop(nRowSkip*CELL_HEIGHT);
+ }
+
+ var aCells = this.previewPanel.find('.cell');
+ aCells.off('mousedown');
+ aCells.mousedown(_.bind(this.cellClickHandler, this));
+ }
+
+ //fill recent
+ if(bUpdateRecents){
+ this.updateRecents();
+ }
+
+ //reset selection
+ this.$window.find('.cell').removeClass('cell-selected');
+
+ //select current cell
+ if(bMainFocus){
+ this.$window.find('#c' + nCurrentSymbol).addClass('cell-selected');
+ } else {
+ this.$window.find('#r_' + nCurrentSymbol + '_' + nFontNameRecent).addClass('cell-selected');
+ }
+
+ //update input
+ if(bUpdateInput !== false){
+ this.updateInput();
+ }
+ },
+
+ onScrollEnd: function(){
+ if(this.scrollerY.getScrollTop() === nLastScroll){
+ return;
+ }
+
+ var nSymbolsCount = this.getAllSymbolsCount(aRanges);
+ var nColsCount = this.getColsCount();
+ var nRows = this.getRowsCount();
+ var nAllRowsCount = Math.ceil(nSymbolsCount/nColsCount);
+ var nFullHeight = nAllRowsCount*CELL_HEIGHT;
+ var nRowSkip = Math.max(0, Math.min(nAllRowsCount - nRows, (nAllRowsCount*this.scrollerY.getScrollTop()/nFullHeight + 0.5) >> 0));
+ nLastScroll = this.scrollerY.getScrollTop();
+ if(!bMainFocus){
+ nCurrentSymbol = this.getCodeByLinearIndex(aRanges, nRowSkip*nColsCount);
+ bMainFocus = true;
+ }
+ else{
+ var oFirstCell = this.previewPanel.children()[0];
+ if(oFirstCell){
+ var id = oFirstCell.id;
+ if(id){
+ var nOldFirstCode = parseInt(id.slice(1, id.length));
+ var nOldFirstLinearIndex = this.getLinearIndexByCode(aRanges, nOldFirstCode);
+ var nOldCurrentLinearIndex = this.getLinearIndexByCode(aRanges, nCurrentSymbol);
+ var nDiff = nOldCurrentLinearIndex - nOldFirstLinearIndex;
+ var nNewCurLinearIndex = nRowSkip*nColsCount + nDiff;
+ nCurrentSymbol = this.getCodeByLinearIndex(aRanges, nNewCurLinearIndex);
+ var nFirstIndex = nRowSkip*nColsCount;
+ nNewCurLinearIndex -= nColsCount;
+ while(nCurrentSymbol === -1 && nNewCurLinearIndex >= nFirstIndex){
+ nCurrentSymbol = this.getCodeByLinearIndex(aRanges, nNewCurLinearIndex);
+ nNewCurLinearIndex -= nColsCount;
+ }
+ if(nCurrentSymbol === -1){
+ nCurrentSymbol = this.getCodeByLinearIndex(aRanges, nFirstIndex);
+ }
+ }
+ else{
+ nCurrentSymbol = this.getCodeByLinearIndex(aRanges, nRowSkip*nColsCount);
+ }
+ }
+ }
+ this.updateView(true, this.getCodeByLinearIndex(aRanges, nRowSkip*nColsCount));
+ },
+
+ updateInput: function(){
+ var sVal = nCurrentSymbol.toString(16).toUpperCase();
+ var sValLen = sVal.length;
+ for(var i = sValLen; i < 5; ++i){
+ sVal = '0' + sVal;
+ }
+ this.inputCode.setValue(sVal);
+ },
+
+ updateRangeSelector: function() {
+ var oCurrentRange = this.getRangeBySymbol(aRanges, nCurrentSymbol);
+ if(!oCurrentRange || !oCurrentRange.Name){
+ this.cmbRange.setDisabled(true);
+ this.cmbRange.setValue('');
+ }
+ else{
+ this.cmbRange.setDisabled(false);
+ var oOption, i, data = [];
+ for(i = 0; i < aRanges.length; ++i){
+ data.push({
+ value: aRanges[i].Name,
+ displayValue: oRangeNames[aRanges[i].Name]
+ });
+ }
+ this.cmbRange.setData(data);
+ this.cmbRange.setValue(oCurrentRange.Name);
+ }
+ },
+
+ onKeyDown: function(e){
+ if(document.activeElement){
+ if(document.activeElement.nodeName && document.activeElement.nodeName.toLowerCase() === 'span'){
+ return;
+ }
+ }
+ var value = e.which || e.charCode || e.keyCode || 0;
+ var bFill = true;
+ if(bMainFocus){
+ var nCode = -1;
+ if ( value === Common.UI.Keys.LEFT ){//left
+ nCode = this.getCodeByLinearIndex(aRanges, this.getLinearIndexByCode(aRanges, nCurrentSymbol) - 1);
+ }
+ else if ( value === Common.UI.Keys.UP ){//top
+ nCode = this.getCodeByLinearIndex(aRanges, this.getLinearIndexByCode(aRanges, nCurrentSymbol) - this.getColsCount());
+ }
+ else if ( value === Common.UI.Keys.RIGHT ){//right
+ nCode = this.getCodeByLinearIndex(aRanges, this.getLinearIndexByCode(aRanges, nCurrentSymbol) + 1);
+ }
+ else if ( value === Common.UI.Keys.DOWN ){//bottom
+ nCode = this.getCodeByLinearIndex(aRanges, this.getLinearIndexByCode(aRanges, nCurrentSymbol) + this.getColsCount());
+ }
+ else if(value === Common.UI.Keys.HOME){//home
+ if(aRanges.length > 0){
+ nCode = aRanges[0].Start;
+ }
+ }
+ else if(value === Common.UI.Keys.END){//end
+ if(aRanges.length > 0){
+ nCode = aRanges[aRanges.length - 1].End;
+ }
+ }
+ else{
+ bFill = false;
+ }
+ if(nCode > -1){
+ nCurrentSymbol = nCode;
+ var bUpdateTable = this.$window.find('#c' + nCurrentSymbol).length === 0;
+ this.updateView(bUpdateTable);
+ }
+ }
+ else{
+ var oSelectedCell, aStrings;
+ if ( value === Common.UI.Keys.LEFT ){//left
+ oSelectedCell = this.$window.find('.cell-selected')[0];
+ if(oSelectedCell && oSelectedCell.id[0] === 'r'){
+ var oPresCell = this.$window.find(oSelectedCell).prev();
+ if(oPresCell.length > 0){
+ aStrings = this.$window.find(oPresCell).attr('id').split('_');
+ nCurrentSymbol = parseInt(aStrings[1]);
+ nFontNameRecent = parseInt(aStrings[2]);
+ this.updateView(false);
+ }
+ }
+ }
+ else if ( value === Common.UI.Keys.RIGHT ){//right
+ oSelectedCell = this.$window.find('.cell-selected')[0];
+ if(oSelectedCell && oSelectedCell.id[0] === 'r'){
+ var oNextCell = this.$window.find(oSelectedCell).next();
+ if(oNextCell.length > 0){
+ aStrings = this.$window.find(oNextCell).attr('id').split('_');
+ nCurrentSymbol = parseInt(aStrings[1]);
+ nFontNameRecent = parseInt(aStrings[2]);
+ this.updateView(false);
+ }
+ }
+ }
+ else if(value === Common.UI.Keys.HOME){//home
+ var oFirstCell = this.$window.find('#recent-table').children()[0];
+ if(oFirstCell){
+ aStrings = oFirstCell.id.split('_');
+ nCurrentSymbol = parseInt(aStrings[1]);
+ nFontNameRecent = parseInt(aStrings[2]);
+ this.updateView(false);
+ }
+ }
+ else if(value === Common.UI.Keys.END){//end
+ var aChildren = this.recentPanel.children();
+ var oLastCell = aChildren[aChildren.length - 1];
+ if(oLastCell){
+ aStrings = oLastCell.id.split('_');
+ nCurrentSymbol = parseInt(aStrings[1]);
+ nFontNameRecent = parseInt(aStrings[2]);
+ this.updateView(false);
+ }
+ }
+ else{
+ bFill = false;
+ }
+ }
+
+ if(bFill){
+ lastKeyCode = value;
+ lastTime = (new Date()).getTime();
+ }
+ },
+
+ onKeyPress: function(e){
+ if(document.activeElement){
+ if(document.activeElement.nodeName && document.activeElement.nodeName.toLowerCase() === 'span'){
+ return;
+ }
+ }
+ var value = e.which || e.charCode || e.keyCode || 0;
+ if(lastKeyCode === value){
+ if(Math.abs(lastTime - (new Date()).getTime()) < 1000){
+ return;
+ }
+ }
+ if(!isNaN(value) && value > 0x1F){
+ var oRange = this.getRangeBySymbol(aRanges, value);
+ if(oRange){
+ var bUpdateTable = (this.$window.find("#c" + value).length === 0);
+ nCurrentSymbol = value;
+ bMainFocus = true;
+ this.updateView(bUpdateTable, undefined, true);
+ }
+ }
+ e.preventDefault && e.preventDefault();
+ },
+
+ onWindowResize: function (args) {
+ var size = this.getSize();
+ if (args && args[1]=='start') {
+ this._preventUpdateScroll = true;
+ this.curSize = {resize: false, width: size[0], height: size[1]};
+ } else if (this.curSize.resize) {
+ this._preventUpdateScroll = false;
+ this.curSize.height = size[1] - 264;
+ var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+ height = rows*CELL_HEIGHT;
+
+ this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
+ this.previewPanel.css({'height': height + 'px'});
+ this.previewScrolled.css({'height': height + 'px'});
+ this.scrollerY = null;
+
+ this.updateView(undefined, undefined, undefined, true);
+
+ var valJson = JSON.stringify(size);
+ Common.localStorage.setItem(this.appPrefix + 'settings-size-symbol-table', valJson);
+ Common.Utils.InternalSettings.set(this.appPrefix + 'settings-size-symbol-table', valJson);
+ }
+ },
+
+ onWindowResizing: function () {
+ if (!this.curSize) return;
+
+ var size = this.getSize();
+ if (size[0] !== this.curSize.width || size[1] !== this.curSize.height) {
+ if (!this.curSize.resize)
+ this.curSize.resize = true;
+
+ this.curSize.width = size[0];
+ this.curSize.height = size[1] - 264;
+
+ var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+ height = rows*CELL_HEIGHT;
+
+ this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
+ this.previewPanel.css({'height': height + 'px'});
+ this.previewScrolled.css({'height': height + 'px'});
+
+ this.updateView(undefined, undefined, undefined, true);
+ }
+ },
+
+ textTitle: 'Symbol',
+ textFont: 'Font',
+ textRange: 'Range',
+ textRecent: 'Recently used symbols',
+ textCode: 'Unicode HEX value'
+ }, Common.Views.SymbolTableDialog || {}))
+});
\ No newline at end of file
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 86c6e0c13..1c1de5bcb 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 2348033b5..a3c282cb7 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 5b86386ae..4306a8f1f 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/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less
index fd7e1ab7d..6998fa128 100644
--- a/apps/common/main/resources/less/about.less
+++ b/apps/common/main/resources/less/about.less
@@ -82,4 +82,4 @@
.margin-bottom {
margin-bottom: 20px;
}
-}
\ No newline at end of file
+}
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 59014d21b..8cf20548c 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -431,6 +431,13 @@
}
}
}
+ .dropdown-menu {
+ &.scale-menu {
+ li.disabled {
+ opacity: 0.65;
+ }
+ }
+ }
}
@color-gray: @secondary;
diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less
new file mode 100644
index 000000000..5f0fd3c21
--- /dev/null
+++ b/apps/common/main/resources/less/calendar.less
@@ -0,0 +1,128 @@
+@calendar-bg-color: @tabs-bg-color;
+
+.calendar-window {
+ border-radius: 0;
+ box-shadow: none;
+}
+.calendar-box {
+ width: 198px;
+ height: 220px;
+ border: 1px solid @calendar-bg-color;
+ .top-row {
+ padding: 0 5px;
+ }
+ .btn {
+ background-color: transparent;
+ border: none;
+ height: 20px;
+ width: 20px;
+ margin-top: 4px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .icon {
+ width: 16px;
+ height: 16px;
+ display: block;
+ position: relative;
+ &.arrow-prev {
+ background-position: -55px -96px;
+ }
+ &.arrow-next {
+ background-position: -52px -112px;
+ }
+ }
+ &:hover {
+ background-color: rgba(255,255,255,0.2);
+ cursor: pointer;
+ }
+ }
+ .calendar-header {
+ height: 50px;
+ background-color: @calendar-bg-color;
+ color: #FFFFFF;
+ .top-row {
+ display: flex;
+ justify-content: space-between;
+ }
+ .bottom-row {
+ display: flex;
+ justify-content: space-around;
+ padding: 0;
+ }
+ .title {
+ width: 100%;
+ margin: 4px 6px 3px 6px;
+ text-align: center;
+ font-size: 13px;
+ label {
+ padding: 2px 10px 0;
+ display: block;
+ font-weight: bold;
+ &:not(:last-of-type) {
+ margin-right: 6px;
+ }
+ }
+ .button {
+ height: 100%;
+ width: 100%;
+ &:hover {
+ background-color: rgba(255,255,255,0.2);
+ cursor: pointer;
+ label {
+ cursor: pointer;
+ }
+ }
+ }
+
+ }
+ }
+ .calendar-content {
+ .item {
+ margin: 0;
+ padding: 0;
+ height: auto;
+ width: auto;
+ box-shadow: none;
+ border: 1px solid #fff;
+ .name-month, .name-year {
+ height: 40px;
+ width: 47px;
+ background-color: #F1F1F1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 13px;
+ }
+ .number-day {
+ height: 26px;
+ width: 26px;
+ background-color: #F1F1F1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ &.selected {
+ .number-day, .name-month, .name-year {
+ color: #fff;
+ background-color: #7D858C;
+ }
+ }
+ .weekend {
+ color: #D25252;
+ }
+ .no-current-month, .no-cur-year, .no-current-decade {
+ color: #A5A5A5;
+ }
+ &:not(.disabled):not(.selected) {
+ .number-day, .name-month, .name-year {
+ &:hover {
+ background-color: #D9D9D9;
+ }
+ }
+ }
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 2c5497d8f..965d22f73 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -153,7 +153,7 @@
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 2dppx),
only screen and (min-resolution: 192dpi) {
- background-image: url('@{common-image-path}/header/header-logo@2x.png');
+ background-image: ~"url('@{common-image-const-path}/header/header-logo@2x.png')";
background-size: 86px auto;
}
diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less
index d42350d94..562f15b8f 100644
--- a/apps/common/main/resources/less/multislider-gradient.less
+++ b/apps/common/main/resources/less/multislider-gradient.less
@@ -40,6 +40,10 @@
&.active .thumb-bottom {
border-bottom-width: 2px;
}
+
+ &.remove {
+ opacity: 0.5;
+ }
}
.track {
diff --git a/apps/common/main/resources/less/symboltable.less b/apps/common/main/resources/less/symboltable.less
new file mode 100644
index 000000000..6b064a595
--- /dev/null
+++ b/apps/common/main/resources/less/symboltable.less
@@ -0,0 +1,54 @@
+#symbol-table-scrollable-div, #symbol-table-recent {
+ div{
+ display: inline-block;
+ vertical-align: top;
+ }
+
+ .cell{
+ width: 31px;
+ height: 33px;
+ border-right: 1px solid @gray-soft;
+ border-bottom: 1px solid @gray-soft;
+ background: #ffffff;
+ align-content: center;
+ vertical-align: middle;
+ text-align: center;
+ font-size: 22px;
+ -khtml-user-select: none;
+ user-select: none;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ cursor: default;
+ overflow:hidden;
+ display: inline-block;
+ }
+
+ .cell-selected{
+ background-color: @gray-darker;
+ color: white;
+ }
+}
+
+#symbol-table-recent {
+ width: 100%;
+ height: 32px;
+ overflow: hidden;
+ border: @gray-soft solid 1px;
+}
+
+#symbol-table-scrollable-div {
+ #id-preview {
+ width: 100%;
+ height: 132px;
+ position:relative;
+ overflow:hidden;
+ border: @gray-soft solid 1px;
+ }
+
+ #id-preview-data {
+ width: 100%;
+ height: 132px;
+ position:relative;
+ overflow:hidden;
+ }
+}
diff --git a/apps/common/main/resources/less/tabbar.less b/apps/common/main/resources/less/tabbar.less
index 66af233d2..f7059ca7b 100644
--- a/apps/common/main/resources/less/tabbar.less
+++ b/apps/common/main/resources/less/tabbar.less
@@ -27,6 +27,13 @@
padding-top: 0;
padding-bottom: 0;
white-space: pre-wrap;
+ text-align: center;
+
+ &::after {
+ content: attr(title);
+ font-weight: bold;
+ display: block;
+ }
&:hover, &:focus {
background-color: #7a7a7a;
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index ab26033de..68ac5c873 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -467,6 +467,9 @@
&.borders--small {
border-radius: 2px;
background-color: #fff;
+.button-normal-icon(btn-compare, 82, @toolbar-big-icon-size);
+.button-normal-icon(btn-rem-comment, 83, @toolbar-big-icon-size);
+.button-normal-icon(btn-symbol, 84, @toolbar-big-icon-size);
&:not(:active) {
box-shadow: inset 0 0 0 1px #cbcbcb;
@@ -496,3 +499,137 @@
width: 20px;
height: 20px;
}
+
+// charts
+.menu-insertchart {
+ .group-description {
+ padding-left: 4px;
+ }
+
+ .group-items-container {
+ float: left;
+ position: relative;
+ }
+}
+
+.item-chartlist {
+ .background-ximage('@{common-image-path}/toolbar/charttypes.png', '@{common-image-path}/toolbar/charttypes@2x.png', 250px);
+ width: 50px;
+ height: 50px;
+}
+
+.line-normal {
+ background-position: 0 0;
+}
+
+.line-stack {
+ background-position: -50px 0;
+}
+
+.line-pstack {
+ background-position: -100px 0;
+}
+
+.line-3d {
+ background-position: -150px 0;
+}
+
+.column-normal {
+ background-position: 0 -50px;
+}
+
+.column-stack{
+ background-position: -50px -50px;
+}
+
+.column-pstack{
+ background-position: -100px -50px;
+}
+
+.column-3d-normal {
+ background-position: -150px -50px;
+}
+
+.column-3d-stack{
+ background-position: -200px -50px;
+}
+
+.column-3d-pstack{
+ background-position: -150px -100px;
+}
+
+.column-3d-normal-per{
+ background-position: -200px -100px;
+}
+
+.bar-normal {
+ background-position: 0 -100px;
+}
+
+.bar-stack{
+ background-position: -50px -100px;
+}
+
+.bar-pstack{
+ background-position: -100px -100px;
+}
+
+.bar-3d-normal {
+ background-position: -150px -150px;
+}
+
+.bar-3d-stack{
+ background-position: -200px -150px;
+}
+
+.bar-3d-pstack{
+ background-position: -150px -200px;
+}
+
+.area-normal {
+ background-position: 0 -150px;
+}
+
+.area-stack{
+ background-position: -50px -150px;
+}
+
+.area-pstack{
+ background-position: -100px -150px;
+}
+
+.pie-normal {
+ background-position: 0 -200px;
+}
+
+.pie-3d-normal {
+ background-position: -200px -200px;
+}
+
+.point-normal{
+ background-position: -50px -200px;
+}
+
+.stock-normal{
+ background-position: -100px -200px;
+}
+
+.pie-doughnut{
+ background-position: -200px 0;
+}
+
+.surface-normal{
+ background-position: 0px -300px;
+}
+
+.surface-wireframe{
+ background-position: -50px -300px;
+}
+
+.contour-normal{
+ background-position: -100px -300px;
+}
+
+.contour-wireframe{
+ background-position: -150px -300px;
+}
diff --git a/apps/common/main/resources/symboltable/ru.json b/apps/common/main/resources/symboltable/ru.json
new file mode 100644
index 000000000..c9cded905
--- /dev/null
+++ b/apps/common/main/resources/symboltable/ru.json
@@ -0,0 +1,275 @@
+{
+ "Basic Latin": "Основная латиница",
+ "Latin 1 Supplement": "Дополнительная латиница-1",
+ "Latin Extended A": "Расширенная латиница-A",
+ "Latin Extended B": "Расширенная латиница-B",
+ "IPA Extensions": "Международный фонетический алфавит",
+ "Spacing Modifier Letters": "Некомбинируемые протяжённые символы-модификаторы",
+ "Combining Diacritical Marks": "Комбинируемые диакритические знаки",
+ "Greek and Coptic": "Греческий и коптский алфавиты",
+ "Cyrillic": "Кириллица",
+ "Cyrillic Supplement": "Кириллица. Дополнительные символы",
+ "Armenian": "Армянский алфавит",
+ "Hebrew": "Иврит",
+ "Arabic": "Арабский",
+ "Syriac": "Сирийский",
+ "Arabic Supplement": "Дополнительные символы арабского письма",
+ "Thaana": "Тана",
+ "NKo": "Нко",
+ "Samaritan": "Самаритянское письмо",
+ "Mandaic": "Мандейский алфавит",
+ "Arabic Extended A": "Расширенный набор символов арабского письма-A",
+ "Devanagari": "Деванагари",
+ "Bengali": "Бенгальский",
+ "Gurmukhi": "Гурмукхи",
+ "Gujarati": "Гуджарати",
+ "Oriya": "Ория",
+ "Tamil": "Тамильская письменность",
+ "Telugu": "Телугу",
+ "Kannada": "Каннада",
+ "Malayalam": "Малаялам",
+ "Sinhala": "Сингальская письменность",
+ "Thai": "Тайская письменность",
+ "Lao": "Лаосская письменность",
+ "Tibetan": "Тибетская письменность",
+ "Myanmar": "Бирманский",
+ "Georgian": "Грузинский",
+ "Hangul Jamo": "Хангыль чамо",
+ "Ethiopic": "Эфиопская слоговая письменность",
+ "Ethiopic Supplement": "Дополнительные символы эфиопской письменности",
+ "Cherokee": "Письменность чероки",
+ "Unified Canadian Aboriginal Syllabics": "Канадское слоговое письмо",
+ "Ogham": "Огамическое письмо",
+ "Runic": "Руническая письменность",
+ "Tagalog": "Тагальская письменность. Байбайин",
+ "Hanunoo": "Хануноо",
+ "Buhid": "Бухид",
+ "Tagbanwa": "Тагбанва",
+ "Khmer": "Кхмерская письменность",
+ "Mongolian": "Старомонгольская письменность",
+ "Unified Canadian Aboriginal Syllabics Extended": "Расширенный набор символов канадского слогового письма",
+ "Limbu": "Письменность лимбу",
+ "Tai Le": "Письменность тай лы",
+ "New Tai Lue": "Новый алфавит тай лы",
+ "Khmer Symbols": "Кхмерские символы",
+ "Buginese": "Бугийская письменность. Лонтара",
+ "Tai Tham": "Тай Тхам",
+ "Combining Diacritical Marks Extended": "Комбинируемые диакритические знаки (расширение)",
+ "Balinese": "Балийское письмо",
+ "Sundanese": "Сунданское письмо",
+ "Batak": "Батакское письмо",
+ "Lepcha": "Письмо лепча",
+ "Ol Chiki": "Письменность Ол-чики",
+ "Cyrillic Extended C": "Расширенная кириллица C",
+ "Sundanese Supplement": "Сунданское расширенное письмо",
+ "Vedic Extensions": "Ведические символы",
+ "Phonetic Extensions": "Фонетические расширения",
+ "Phonetic Extensions Supplement": "Дополнительные фонетические расширения",
+ "Combining Diacritical Marks Supplement": "Дополнительные комбинируемые диакритические знаки",
+ "Latin Extended Additional": "Дополнительная расширенная латиница",
+ "Greek Extended": "Расширенный набор символов греческого алфавита",
+ "General Punctuation": "Знаки пунктуации",
+ "Superscripts and Subscripts": "Надстрочные и подстрочные знаки",
+ "Currency Symbols": "Символы валют",
+ "Combining Diacritical Marks for Symbols": "Комбинируемые диакритические знаки для символов",
+ "Letterlike Symbols": "Буквоподобные символы",
+ "Number Forms": "Числовые формы",
+ "Arrows": "Стрелки",
+ "Mathematical Operators": "Математические операторы",
+ "Miscellaneous Technical": "Разнообразные технические символы",
+ "Control Pictures": "Значки управляющих кодов",
+ "Optical Character Recognition": "Символы оптического распознавания",
+ "Enclosed Alphanumerics": "Вложенные буквы и цифры",
+ "Box Drawing": "Символы для рисования рамок",
+ "Block Elements": "Символы заполнения",
+ "Geometric Shapes": "Геометрические фигуры",
+ "Miscellaneous Symbols": "Разнообразные символы",
+ "Dingbats": "Дингбаты",
+ "Miscellaneous Mathematical Symbols A": "Разнообразные математические символы-A",
+ "Supplemental Arrows A": "Дополнительные стрелки-A",
+ "Braille Patterns": "Азбука Брайля",
+ "Supplemental Arrows B": "Дополнительные стрелки-B",
+ "Miscellaneous Mathematical Symbols B": "Разнообразные математические символы-B",
+ "Supplemental Mathematical Operators": "Дополнительные математические операторы",
+ "Miscellaneous Symbols and Arrows": "Разнообразные символы и стрелки",
+ "Glagolitic": "Глаголица",
+ "Latin Extended C": "Расширенная латиница C",
+ "Coptic": "Коптский алфавит",
+ "Georgian Supplement": "Дополнительные символы грузинского алфавита",
+ "Tifinagh": "Тифинаг (Древнеливийское письмо)",
+ "Ethiopic Extended": "Расширенный набор символов эфиопского письма",
+ "Cyrillic Extended A": "Расширенная кириллица A",
+ "Supplemental Punctuation": "Дополнительные знаки пунктуации",
+ "CJK Radicals Supplement": "Дополнительные иероглифические ключи ККЯ",
+ "Kangxi Radicals": "Иероглифические ключи словаря Канси",
+ "Ideographic Description Characters": "Символы описания иероглифов",
+ "CJK Symbols and Punctuation": "Символы и пунктуация ККЯ",
+ "Hiragana": "Хирагана",
+ "Katakana": "Катакана",
+ "Bopomofo": "Чжуинь. Бопомофо",
+ "Hangul Compatibility Jamo": "Комбинируемые чамо Хангыля",
+ "Kanbun": "Канбун(китайский)",
+ "Bopomofo Extended": "Расширенный набор символов бопомофо, чжуинь",
+ "CJK Strokes": "Черты ККЯ",
+ "Katakana Phonetic Extensions": "Фонетические расширения катаканы",
+ "Enclosed CJK Letters and Months": "Вложенные буквы и месяцы ККЯ",
+ "CJK Compatibility": "Знаки совместимости ККЯ",
+ "CJK Unified Ideographs Extension": "Унифицированные иероглифы ККЯ. Расширение А",
+ "Yijing Hexagram Symbols": "Гексаграммы И-Цзин",
+ "CJK Unified Ideographs": "Унифицированные иероглифы ККЯ",
+ "Yi Syllables": "Слоги. Письмо И",
+ "Yi Radicals": "Радикалы. Письмо И",
+ "Lisu": "Лису",
+ "Vai": "Слоговая письменность ваи",
+ "Cyrillic Extended B": "Расширенная кириллица-B",
+ "Bamum": "Письмо бамум",
+ "Modifier Tone Letters": "Символы изменения тона",
+ "Latin Extended D": "Расширенная латиница-D",
+ "Syloti Nagri": "Силоти нагри",
+ "Common Indic Number Forms": "Индийские числовые символы",
+ "Phags pa": "Квадратное письмо Пагба-ламы",
+ "Saurashtra": "Саураштра",
+ "Devanagari Extended": "Расширенный набор символов деванагари",
+ "Kayah Li": "Кайях Ли",
+ "Rejang": "Реджанг",
+ "Hangul Jamo Extended A": "Хангыль",
+ "Javanese": "Яванская письменность",
+ "Myanmar Extended B": "Расширенный бирманский-B",
+ "Cham": "Чамское письмо",
+ "Myanmar Extended A": "Мьянманская письменность. Расширение A",
+ "Tai Viet": "Письменность Тай Вьет",
+ "Meetei Mayek Extensions": "Мейтей расширенная",
+ "Ethiopic Extended A": "Набор расширенных символов эфиопского письма-А",
+ "Latin Extended E": "Расширенная латиница-E",
+ "Cherokee Supplement": "Письменность чероки (дополнение)",
+ "Meetei Mayek": "Мейтей (Манипури)",
+ "Hangul Syllables": "Слоги Хангыля",
+ "Hangul Jamo Extended B": "Расширенные хангыль чамо B",
+ "High Surrogates": "Верхняя часть суррогатных пар",
+ "High Private Use Surrogates": "Верхняя часть суррогатных пар для частного использования",
+ "Low Surrogates": "Нижняя часть суррогатных пар",
+ "Private Use Area": "Область для частного использования",
+ "CJK Compatibility Ideographs": "Совместимые иероглифы ККЯ",
+ "Alphabetic Presentation Forms": "Алфавитные формы представления",
+ "Arabic Presentation Forms A": "Формы представления арабских букв-A",
+ "Variation Selectors": "Селекторы вариантов начертания",
+ "Vertical Forms": "Вертикальные формы",
+ "Combining Half Marks": "Комбинируемые половинки символов",
+ "CJK Compatibility Forms": "Формы совместимости ККЯ",
+ "Small Form Variants": "Варианты малого размера",
+ "Arabic Presentation Forms B": "Формы представления арабских букв-B",
+ "Halfwidth and Fullwidth Forms": "Полуширинные и полноширинные формы",
+ "Specials": "Специальные символы",
+ "Linear B Syllabary": "Слоги линейного письма Б",
+ "Linear B Ideograms": "Идеограммы линейного письма Б",
+ "Aegean Numbers": "Эгейские цифры",
+ "Ancient Greek Numbers": "Древнегреческие единицы измерения",
+ "Ancient Symbols": "Древние символы",
+ "Phaistos Disc": "Символы фестского диска",
+ "Lycian": "Ликийский алфавит",
+ "Carian": "Алфавит карийского языка",
+ "Coptic Epact Numbers": "Коптские числа епакты",
+ "Old Italic": "Этрусский (староитальянский) алфавит",
+ "Gothic": "Готский алфавит",
+ "Old Permic": "Древнепермское письмо",
+ "Ugaritic": "Угаритский алфавит",
+ "Old Persian": "Древнеперсидский клинописный алфавит",
+ "Deseret": "Дезеретский алфавит",
+ "Shavian": "Алфавит Бернарда Шоу",
+ "Osmanya": "Османья (сомалийский алфавит)",
+ "Osage": "Оседж",
+ "Elbasan": "Эльбасанское письмо",
+ "Caucasian Albanian": "Агванское письмо (Кавказская Албания)",
+ "Linear A": "Линейное письмо А",
+ "Cypriot Syllabary": "Слоговая письменность острова Кипр",
+ "Imperial Aramaic": "Имперское арамейское письмо",
+ "Palmyrene": "Пальмирский алфавит",
+ "Nabataean": "Набатейское письмо",
+ "Hatran": "Хатран",
+ "Phoenician": "Финикийское письмо",
+ "Lydian": "Лидийский алфавит",
+ "Meroitic Hieroglyphs": "Лидийский алфавит",
+ "Meroitic Cursive": "Курсивное мероитское письмо",
+ "Kharoshthi": "Кхароштхи",
+ "Old South Arabian": "Старый южноаравийский алфавит",
+ "Old North Arabian": "Старый североаравийский алфавит",
+ "Manichaean": "Манихейское письмо",
+ "Avestan": "Авестийский алфавит",
+ "Inscriptional Parthian": "Пехлевийское письмо для парфянского языка",
+ "Inscriptional Pahlavi": "Эпиграфическое пехлевийское письмо",
+ "Psalter Pahlavi": "Псалтырь пехлеви",
+ "Old Turkic": "Древнетюркское руническое письмо",
+ "Old Hungarian": "Венгерские руны",
+ "Rumi Numeral Symbols": "Цифры системы руми",
+ "Brahmi": "Брахмическая письменность",
+ "Kaithi": "Кайтхи",
+ "Sora Sompeng": "Соранг сомпенг",
+ "Chakma": "Чакма",
+ "Mahajani": "Махаяни",
+ "Sharada": "Шарада",
+ "Sinhala Archaic Numbers": "Сингальские архаические цифры",
+ "Khojki": "Кходжики",
+ "Multani": "Мултани",
+ "Khudawadi": "Кхудабади",
+ "Grantha": "Грантха",
+ "Newa": "Нева",
+ "Tirhuta": "Тирхута",
+ "Siddham": "Сиддхаматрика",
+ "Modi": "Моди",
+ "Mongolian Supplement": "Монгольский (дополнение)",
+ "Takri": "Такри",
+ "Ahom": "Письмо ахом",
+ "Warang Citi": "Варанг-кшити",
+ "Pau Cin Hau": "Пау Цин Хау",
+ "Bhaiksuki": "Байсаки",
+ "Marchen": "Марчен",
+ "Cuneiform": "Клинопись",
+ "Cuneiform Numbers and Punctuation": "Клинописные цифры и знаки препинания",
+ "Early Dynastic Cuneiform": "Ранняя династическая клинопись",
+ "Egyptian Hieroglyphs": "Египетские иероглифы",
+ "Anatolian Hieroglyphs": "Анатолийские иероглифы",
+ "Bamum Supplement": "Письмо бамум (дополнение)",
+ "Mro": "Мру",
+ "Bassa Vah": "Письмо басса",
+ "Pahawh Hmong": "Пахау хмонг",
+ "Miao": "Письмо Полларда (миао)",
+ "Ideographic Symbols and Punctuation": "Идеографические символы и знаки препинания",
+ "Tangut": "Тангутское письмо",
+ "Tangut Components": "Компоненты тангутского письма",
+ "Kana Supplement": "Кана (дополнение)",
+ "Duployan": "Дюплойе",
+ "Shorthand Format Controls": "Форматирующие символы стенографии",
+ "Byzantine Musical Symbols": "Византийские музыкальные символы",
+ "Musical Symbols": "Музыкальные символы",
+ "Ancient Greek Musical Notation": "Древнегреческие музыкальные символы",
+ "Tai Xuan Jing Symbols": "Символы Тай Сюань Цзин",
+ "Counting Rod Numerals": "Счётные палочки",
+ "Mathematical Alphanumeric Symbols": "Математические буквенно-цифровые символы",
+ "Sutton SignWriting": "Жестовая письменность Саттон",
+ "Glagolitic Supplement": "Глаголица (расширение)",
+ "Mende Kikakui": "Письмо кикакуи для языка менде",
+ "Adlam": "Адлам",
+ "Arabic Mathematical Alphabetic Symbols": "Арабские математические буквенно-цифровые символы",
+ "Mahjong Tiles": "Кости для маджонга",
+ "Domino Tiles": "Кости для домино",
+ "Playing Cards": "Игральные карты",
+ "Enclosed Alphanumeric Supplement": "Вложенные буквенно-цифровые символы (дополнение)",
+ "Enclosed Ideographic Supplement": "Вложенные идеографические символы (дополнение)",
+ "Miscellaneous Symbols and Pictographs": "Различные символы и пиктограммы",
+ "Emoticons": "Эмотикон (эмоджи)",
+ "Ornamental Dingbats": "Элементы орнамента",
+ "Transport and Map Symbols": "Транспортные и картографические символы",
+ "Alchemical Symbols": "Алхимические символы",
+ "Geometric Shapes Extended": "Геометрические фигуры (расширение)",
+ "Supplemental Arrows C": "Дополнительные стрелки-С",
+ "Supplemental Symbols and Pictographs": "Символы и пиктограммы (дополнение)",
+ "CJK Unified Ideographs Extension B": "Унифицированные иероглифы ККЯ. Расширение B",
+ "CJK Unified Ideographs Extension C": "Унифицированные иероглифы ККЯ. Расширение C",
+ "CJK Unified Ideographs Extension D": "Унифицированные иероглифы ККЯ. Расширение D",
+ "CJK Unified Ideographs Extension E": "Унифицированные иероглифы ККЯ. Расширение E",
+ "CJK Compatibility Ideographs Supplement": "Унифицированные иероглифы ККЯ (дополнение)",
+ "Tags": "Теги",
+ "Variation Selectors Supplement": "Селекторы вариантов начертания (дополнение)",
+ "Supplementary Private Use Area A": "Дополнительная область для частного использования — A",
+ "Supplementary Private Use Area B": "Дополнительная область для частного использования — B"
+}
\ No newline at end of file
diff --git a/apps/common/mobile/lib/component/HsbColorPicker.js b/apps/common/mobile/lib/component/HsbColorPicker.js
new file mode 100644
index 000000000..22d461934
--- /dev/null
+++ b/apps/common/mobile/lib/component/HsbColorPicker.js
@@ -0,0 +1,327 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ * HsbColorPicker.js
+ *
+ * Created by Julia Svinareva on 02/10/19
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+ var Common = {};
+
+Common.UI = Common.UI || {};
+
+define([
+ 'jquery',
+ 'underscore',
+ 'backbone'
+], function ($, _, Backbone) {
+ 'use strict';
+
+ Common.UI.HsbColorPicker = Backbone.View.extend(_.extend({
+ options: {
+ color: '#000000'
+ },
+ template: _.template([
+ ''
+ ].join('')),
+
+ initialize : function(options) {
+ var me = this,
+ el = $(me.el);
+ me.currentColor = options.color;
+ if(_.isObject(me.currentColor)) {
+ me.currentColor = me.currentColor.color;
+ }
+ if (!me.currentColor) {
+ me.currentColor = me.options.color;
+ }
+ if (me.currentColor === 'transparent') {
+ me.currentColor = 'ffffff';
+ }
+ var colorRgb = me.colorHexToRgb(me.currentColor);
+ me.currentHsl = me.colorRgbToHsl(colorRgb[0],colorRgb[1],colorRgb[2]);
+ me.currentHsb = me.colorHslToHsb(me.currentHsl[0],me.currentHsl[1],me.currentHsl[2]);
+ me.currentHue = [];
+
+ me.options = _({}).extend(me.options, options);
+ me.render();
+ },
+
+ render: function () {
+ var me = this;
+
+ var total = 256,
+ circles = '';
+ for (var i = total; i > 0; i -= 1) {
+ var angle = i * Math.PI / (total / 2);
+ var hue = 360 / total * i;
+ circles += '
',
'',
'',
+ '',
+ '
'
+ ].join('');
+
+ this.props = options.props;
+ this.options.tpl = _.template(this.template)(this.options);
+
+ Common.UI.Window.prototype.initialize.call(this, this.options);
+ },
+
+ render: function() {
+ Common.UI.Window.prototype.render.call(this);
+
+ var me = this,
+ $window = this.getChild();
+ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+ this.spnSize = new Common.UI.MetricSpinner({
+ el : $window.find('#id-dlg-list-size'),
+ step : 1,
+ width : 53,
+ value : 100,
+ defaultUnit : '',
+ maxValue : 400,
+ minValue : 25,
+ allowDecimal: false
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ if (me._changedProps) {
+ me._changedProps.asc_putBulletSize(field.getNumberValue());
+ }
+ });
+
+ this.btnColor = new Common.UI.ColorButton({
+ style: "width:53px;",
+ menu : new Common.UI.Menu({
+ additionalAlign: this.menuAddAlign,
+ items: [
+ { template: _.template('') },
+ { template: _.template('' + this.textNewColor + '') }
+ ]
+ })
+ });
+ this.btnColor.on('render:after', function(btn) {
+ me.colors = new Common.UI.ThemeColorPalette({
+ el: $('#id-dlg-list-color-menu'),
+ transparent: false
+ });
+ me.colors.on('select', _.bind(me.onColorsSelect, me));
+ });
+ this.btnColor.render($window.find('#id-dlg-list-color'));
+ $('#id-dlg-list-color-new').on('click', _.bind(this.addNewColor, this, this.colors));
+
+ this.menuAddAlign = function(menuRoot, left, top) {
+ var self = this;
+ if (!$window.hasClass('notransform')) {
+ $window.addClass('notransform');
+ menuRoot.addClass('hidden');
+ setTimeout(function() {
+ menuRoot.removeClass('hidden');
+ menuRoot.css({left: left, top: top});
+ self.options.additionalAlign = null;
+ }, 300);
+ } else {
+ menuRoot.css({left: left, top: top});
+ self.options.additionalAlign = null;
+ }
+ };
+
+ this.spnStart = new Common.UI.MetricSpinner({
+ el : $window.find('#id-dlg-list-start'),
+ step : 1,
+ width : 53,
+ value : 1,
+ defaultUnit : '',
+ maxValue : 32767,
+ minValue : 1,
+ allowDecimal: false
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ if (me._changedProps) {
+ me._changedProps.put_NumStartAt(field.getNumberValue());
+ }
+ });
+
+ this.btnEdit = new Common.UI.Button({
+ el: $window.find('#id-dlg-list-edit'),
+ hint: this.tipChange
+ });
+ this.btnEdit.on('click', _.bind(this.onEditBullet, this));
+ this.btnEdit.cmpEl.css({'font-size': '12px'});
+
+ this.afterRender();
+ },
+
+ afterRender: function() {
+ this.updateThemeColors();
+ this._setDefaults(this.props);
+ },
+
+ updateThemeColors: function() {
+ this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
+ },
+
+ addNewColor: function(picker, btn) {
+ picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
+ },
+
+ onColorsSelect: function(picker, color) {
+ this.btnColor.setColor(color);
+ if (this._changedProps) {
+ this._changedProps.asc_putBulletColor(Common.Utils.ThemeColor.getRgbColor(color));
+ }
+ },
+
+ onEditBullet: function() {
+ var me = this,
+ props = me.bulletProps,
+ handler = function(dlg, result, settings) {
+ if (result == 'ok') {
+ props.changed = true;
+ props.code = settings.code;
+ props.font = settings.font;
+ props.symbol = settings.symbol;
+ props.font && me.btnEdit.cmpEl.css('font-family', props.font);
+ settings.symbol && me.btnEdit.setCaption(settings.symbol);
+ if (me._changedProps) {
+ me._changedProps.asc_putBulletFont(props.font);
+ me._changedProps.asc_putBulletSymbol(props.symbol);
+ }
+ }
+ },
+ win = new Common.Views.SymbolTableDialog({
+ api: me.options.api,
+ lang: me.options.interfaceLang,
+ modal: true,
+ type: 0,
+ font: props.font,
+ symbol: props.symbol,
+ handler: handler
+ });
+ win.show();
+ win.on('symbol:dblclick', handler);
+ },
+
+ _handleInput: function(state) {
+ if (this.options.handler) {
+ this.options.handler.call(this, state, this._changedProps);
+ }
+ this.close();
+ },
+
+ onBtnClick: function(event) {
+ this._handleInput(event.currentTarget.attributes['result'].value);
+ },
+
+ onPrimary: function(event) {
+ this._handleInput('ok');
+ return false;
+ },
+
+ _setDefaults: function (props) {
+ if (props) {
+ this.spnSize.setValue(props.asc_getBulletSize() || '', true);
+ this.spnStart.setValue(props.get_NumStartAt() || '', true);
+ var color = props.asc_getBulletColor();
+ if (color) {
+ if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
+ color = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()};
+ } else {
+ color = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b());
+ }
+ } else
+ color = 'transparent';
+ this.btnColor.setColor(color);
+ if ( typeof(color) == 'object' ) {
+ var isselected = false;
+ for (var i=0; i<10; i++) {
+ if ( Common.Utils.ThemeColor.ThemeValues[i] == color.effectValue ) {
+ this.colors.select(color,true);
+ isselected = true;
+ break;
+ }
+ }
+ if (!isselected) this.colors.clearSelection();
+ } else
+ this.colors.select(color,true);
+
+ if (this.type==0) {
+ this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()};
+ this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font);
+ this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol);
+ }
+ }
+ this._changedProps = new Asc.asc_CParagraphProperty();
+ },
+
+ txtTitle: 'List Settings',
+ txtSize: 'Size',
+ txtColor: 'Color',
+ txtOfText: '% of text',
+ textNewColor: 'Add New Custom Color',
+ txtStart: 'Start at',
+ txtBullet: 'Bullet',
+ tipChange: 'Change bullet'
+ }, Common.Views.ListSettingsDialog || {}))
+});
\ No newline at end of file
diff --git a/apps/common/main/lib/view/RenameDialog.js b/apps/common/main/lib/view/RenameDialog.js
index 023cff6ba..7b89225f5 100644
--- a/apps/common/main/lib/view/RenameDialog.js
+++ b/apps/common/main/lib/view/RenameDialog.js
@@ -48,8 +48,7 @@ define([
header: false,
cls: 'modal-dlg',
filename: '',
- buttons: ['ok', 'cancel'],
- footerCls: 'right'
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js
index fed83ae7a..33d0883e5 100644
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@@ -64,6 +64,7 @@ define([
'' +
'',
+ '',
+ '
',
+ '',
+ '',
+ '
',
+ '<% if (type == 0) { %>',
+ '',
+ '',
+ '',
+ '
',
+ '<% } %>',
+ '<% if (type == 1) { %>',
+ '',
+ '',
+ '
',
+ '<% } %>',
+ '' +
'' +
+ '' +
'
' +
'' +
'' +
@@ -79,6 +80,10 @@ define([
'' +
'
' +
'' +
+ '' +
+ '' +
+ '
' +
+ '' +
'' +
'' +
'
' +
@@ -115,6 +120,16 @@ define([
me.fireEvent('reviewchange:reject', [menu, item]);
});
+ if (me.appConfig.canFeatureComparison) {
+ this.btnCompare.on('click', function (e) {
+ me.fireEvent('reviewchange:compare', ['file']);
+ });
+
+ this.btnCompare.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('reviewchange:compare', [item.value]);
+ });
+ }
+
this.btnsTurnReview.forEach(function (button) {
button.on('click', _click_turnpreview.bind(me));
});
@@ -129,7 +144,7 @@ define([
});
this.btnReviewView && this.btnReviewView.menu.on('item:click', function (menu, item, e) {
- me.fireEvent('reviewchanges:view', [menu, item]);
+ me.fireEvent('reviewchange:view', [menu, item]);
});
}
@@ -161,6 +176,16 @@ define([
this.btnChat && this.btnChat.on('click', function (btn, e) {
me.fireEvent('collaboration:chat', [btn.pressed]);
});
+
+ if (this.btnCommentRemove) {
+ this.btnCommentRemove.on('click', function (e) {
+ me.fireEvent('comment:removeComments', ['current']);
+ });
+
+ this.btnCommentRemove.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('comment:removeComments', [item.value]);
+ });
+ }
}
return {
@@ -188,6 +213,14 @@ define([
iconCls: 'toolbar__icon btn-review-deny'
});
+ if (this.appConfig.canFeatureComparison)
+ this.btnCompare = new Common.UI.Button({
+ cls : 'btn-toolbar x-huge icon-top',
+ caption : this.txtCompare,
+ split : true,
+ iconCls: 'btn-compare'
+ });
+
this.btnTurnOn = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-review',
@@ -291,6 +324,15 @@ define([
});
}
+ if ( this.appConfig.canCoAuthoring && this.appConfig.canComments ) {
+ this.btnCommentRemove = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ caption: this.txtCommentRemove,
+ split: true,
+ iconCls: 'btn-rem-comment'
+ });
+ }
+
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
@@ -348,6 +390,20 @@ define([
);
me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]);
+ if (config.canFeatureComparison) {
+ me.btnCompare.setMenu(new Common.UI.Menu({
+ items: [
+ {caption: me.mniFromFile, value: 'file'},
+ {caption: me.mniFromUrl, value: 'url'},
+ {caption: me.mniFromStorage, value: 'storage'}
+ // ,{caption: '--'},
+ // {caption: me.mniSettings, value: 'settings'}
+ ]
+ }));
+ me.btnCompare.menu.items[2].setVisible(me.appConfig.canRequestCompareFile || me.appConfig.fileChoiceUrl && me.appConfig.fileChoiceUrl.indexOf("{documentType}")>-1);
+ me.btnCompare.updateHint(me.tipCompare);
+ }
+
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
}
@@ -397,9 +453,32 @@ define([
me.turnCoAuthMode((value===null || parseInt(value) == 1) && !(config.isDesktopApp && config.isOffline) && config.canCoAuthoring);
}
+ if (me.btnCommentRemove) {
+ var items = [
+ {
+ caption: config.canEditComments ? me.txtCommentRemCurrent : me.txtCommentRemMyCurrent,
+ value: 'current'
+ },
+ {
+ caption: me.txtCommentRemMy,
+ value: 'my'
+ }
+ ];
+ if (config.canEditComments)
+ items.push({
+ caption: me.txtCommentRemAll,
+ value: 'all'
+ });
+ me.btnCommentRemove.setMenu(
+ new Common.UI.Menu({items: items})
+ );
+ me.btnCommentRemove.updateHint([me.tipCommentRemCurrent, me.tipCommentRem]);
+ }
+
var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
+ separator_compare = !(config.canReview && config.canFeatureComparison) ? me.$el.find('.separator.compare') : '.separator.compare',
separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat',
separator_last;
@@ -418,6 +497,11 @@ define([
else
separator_last = separator_review;
+ if (typeof separator_compare == 'object')
+ separator_compare.hide().prev('.group').hide();
+ else
+ separator_last = separator_compare;
+
if (typeof separator_chat == 'object')
separator_chat.hide().prev('.group').hide();
else
@@ -426,7 +510,7 @@ define([
if (!me.btnHistory && separator_last)
me.$el.find(separator_last).hide();
- Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview);
+ Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments);
setEvents.call(me);
});
@@ -438,6 +522,7 @@ define([
if ( this.appConfig.canReview ) {
this.btnAccept.render(this.$el.find('#btn-change-accept'));
this.btnReject.render(this.$el.find('#btn-change-reject'));
+ this.appConfig.canFeatureComparison && this.btnCompare.render(this.$el.find('#btn-compare'));
this.btnTurnOn.render(this.$el.find('#btn-review-on'));
}
this.btnPrev && this.btnPrev.render(this.$el.find('#btn-change-prev'));
@@ -448,6 +533,7 @@ define([
this.btnCoAuthMode && this.btnCoAuthMode.render(this.$el.find('#slot-btn-coauthmode'));
this.btnHistory && this.btnHistory.render(this.$el.find('#slot-btn-history'));
this.btnChat && this.btnChat.render(this.$el.find('#slot-btn-chat'));
+ this.btnCommentRemove && this.btnCommentRemove.render(this.$el.find('#slot-comment-remove'));
return this.$el;
},
@@ -561,6 +647,7 @@ define([
}
}, this);
this.btnChat && this.btnChat.setDisabled(state);
+ this.btnCommentRemove && this.btnCommentRemove.setDisabled(state);
},
onLostEditRights: function() {
@@ -609,7 +696,20 @@ define([
txtFinalCap: 'Final',
txtOriginalCap: 'Original',
strFastDesc: 'Real-time co-editing. All changes are saved automatically.',
- strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.'
+ strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.',
+ txtCompare: 'Compare',
+ tipCompare: 'Compare current document with another one',
+ mniFromFile: 'Document from File',
+ mniFromUrl: 'Document from URL',
+ mniFromStorage: 'Document from Storage',
+ mniSettings: 'Comparison Settings',
+ txtCommentRemove: 'Remove',
+ tipCommentRemCurrent: 'Remove current comments',
+ tipCommentRem: 'Remove comments',
+ txtCommentRemCurrent: 'Remove Current Comments',
+ txtCommentRemMyCurrent: 'Remove My Current Comments',
+ txtCommentRemMy: 'Remove My Comments',
+ txtCommentRemAll: 'Remove All Comments'
}
}()), Common.Views.ReviewChanges || {}));
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index a3f507da5..aba4efc0b 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -469,7 +469,7 @@ define([
});
this.emailMenu = new Common.UI.Menu({
- maxHeight: 190,
+ maxHeight: 200,
cyclic: false,
items: []
}).on('render:after', function(mnu) {
@@ -1014,6 +1014,8 @@ define([
});
}
}, this);
+ if (this.emailMenu && this.emailMenu.rendered)
+ this.emailMenu.cmpEl.css('display', 'none');
},
isCommentsViewMouseOver: function () {
@@ -1121,7 +1123,10 @@ define([
return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
});
}
- var tpl = _.template('<%= Common.Utils.String.htmlEncode(caption) %>
<%= Common.Utils.String.htmlEncode(options.value) %>
'),
+ var tpl = _.template('' +
+ '' +
+ '' +
+ ''),
divider = false;
_.each(users, function(menuItem, index) {
if (divider && !menuItem.hasAccess) {
@@ -1160,8 +1165,10 @@ define([
},
insertEmailToTextbox: function(str, left, right) {
- var textBox = this.commentsView.getTextBox(),
- val = textBox.val();
+ var textBox = this.commentsView.getTextBox();
+ if (!textBox) return;
+
+ var val = textBox.val();
textBox.val(val.substring(0, left) + '+' + str + ' ' + val.substring(right+1, val.length));
setTimeout(function(){
textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 2;
diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js
new file mode 100644
index 000000000..a0e808329
--- /dev/null
+++ b/apps/common/main/lib/view/SymbolTableDialog.js
@@ -0,0 +1,1352 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ * SymbolTableDialog.js
+ *
+ * Created by Julia Radzhabova on 07.11.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+if (Common === undefined)
+ var Common = {};
+define([
+ 'common/main/lib/util/utils',
+ 'common/main/lib/util/character',
+ 'common/main/lib/component/InputField',
+ 'common/main/lib/component/Window'
+], function () { 'use strict';
+
+ var oRangeNames = {};
+ oRangeNames[1] = 'Basic Latin';
+ oRangeNames[2] = 'Latin 1 Supplement';
+ oRangeNames[3] = 'Latin Extended A';
+ oRangeNames[4] = 'Latin Extended B';
+ oRangeNames[5] = 'IPA Extensions';
+ oRangeNames[6] = 'Spacing Modifier Letters';
+ oRangeNames[7] = 'Combining Diacritical Marks';
+ oRangeNames[8] = 'Greek and Coptic';
+ oRangeNames[9] = 'Cyrillic';
+ oRangeNames[10] = 'Cyrillic Supplement';
+ oRangeNames[11] = 'Armenian';
+ oRangeNames[12] = 'Hebrew';
+ oRangeNames[13] = 'Arabic';
+ oRangeNames[14] = 'Syriac';
+ oRangeNames[15] = 'Arabic Supplement';
+ oRangeNames[16] = 'Thaana';
+ oRangeNames[17] = 'NKo';
+ oRangeNames[18] = 'Samaritan';
+ oRangeNames[19] = 'Mandaic';
+ oRangeNames[20] = 'Arabic Extended A';
+ oRangeNames[21] = 'Devanagari';
+ oRangeNames[22] = 'Bengali';
+ oRangeNames[23] = 'Gurmukhi';
+ oRangeNames[24] = 'Gujarati';
+ oRangeNames[25] = 'Oriya';
+ oRangeNames[26] = 'Tamil';
+ oRangeNames[27] = 'Telugu';
+ oRangeNames[28] = 'Kannada';
+ oRangeNames[29] = 'Malayalam';
+ oRangeNames[30] = 'Sinhala';
+ oRangeNames[31] = 'Thai';
+ oRangeNames[32] = 'Lao';
+ oRangeNames[33] = 'Tibetan';
+ oRangeNames[34] = 'Myanmar';
+ oRangeNames[35] = 'Georgian';
+ oRangeNames[36] = 'Hangul Jamo';
+ oRangeNames[37] = 'Ethiopic';
+ oRangeNames[38] = 'Ethiopic Supplement';
+ oRangeNames[39] = 'Cherokee';
+ oRangeNames[40] = 'Unified Canadian Aboriginal Syllabics';
+ oRangeNames[41] = 'Ogham';
+ oRangeNames[42] = 'Runic';
+ oRangeNames[43] = 'Tagalog';
+ oRangeNames[44] = 'Hanunoo';
+ oRangeNames[45] = 'Buhid';
+ oRangeNames[46] = 'Tagbanwa';
+ oRangeNames[47] = 'Khmer';
+ oRangeNames[48] = 'Mongolian';
+ oRangeNames[49] = 'Unified Canadian Aboriginal Syllabics Extended';
+ oRangeNames[50] = 'Limbu';
+ oRangeNames[51] = 'Tai Le';
+ oRangeNames[52] = 'New Tai Lue';
+ oRangeNames[53] = 'Khmer Symbols';
+ oRangeNames[54] = 'Buginese';
+ oRangeNames[55] = 'Tai Tham';
+ oRangeNames[56] = 'Combining Diacritical Marks Extended';
+ oRangeNames[57] = 'Balinese';
+ oRangeNames[58] = 'Sundanese';
+ oRangeNames[59] = 'Batak';
+ oRangeNames[60] = 'Lepcha';
+ oRangeNames[61] = 'Ol Chiki';
+ oRangeNames[62] = 'Cyrillic Extended C';
+ oRangeNames[63] = 'Sundanese Supplement';
+ oRangeNames[64] = 'Vedic Extensions';
+ oRangeNames[65] = 'Phonetic Extensions';
+ oRangeNames[66] = 'Phonetic Extensions Supplement';
+ oRangeNames[67] = 'Combining Diacritical Marks Supplement';
+ oRangeNames[68] = 'Latin Extended Additional';
+ oRangeNames[69] = 'Greek Extended';
+ oRangeNames[70] = 'General Punctuation';
+ oRangeNames[71] = 'Superscripts and Subscripts';
+ oRangeNames[72] = 'Currency Symbols';
+ oRangeNames[73] = 'Combining Diacritical Marks for Symbols';
+ oRangeNames[74] = 'Letterlike Symbols';
+ oRangeNames[75] = 'Number Forms';
+ oRangeNames[76] = 'Arrows';
+ oRangeNames[77] = 'Mathematical Operators';
+ oRangeNames[78] = 'Miscellaneous Technical';
+ oRangeNames[79] = 'Control Pictures';
+ oRangeNames[80] = 'Optical Character Recognition';
+ oRangeNames[81] = 'Enclosed Alphanumerics';
+ oRangeNames[82] = 'Box Drawing';
+ oRangeNames[83] = 'Block Elements';
+ oRangeNames[84] = 'Geometric Shapes';
+ oRangeNames[85] = 'Miscellaneous Symbols';
+ oRangeNames[86] = 'Dingbats';
+ oRangeNames[87] = 'Miscellaneous Mathematical Symbols A';
+ oRangeNames[88] = 'Supplemental Arrows A';
+ oRangeNames[89] = 'Braille Patterns';
+ oRangeNames[90] = 'Supplemental Arrows B';
+ oRangeNames[91] = 'Miscellaneous Mathematical Symbols B';
+ oRangeNames[92] = 'Supplemental Mathematical Operators';
+ oRangeNames[93] = 'Miscellaneous Symbols and Arrows';
+ oRangeNames[94] = 'Glagolitic';
+ oRangeNames[95] = 'Latin Extended C';
+ oRangeNames[96] = 'Coptic';
+ oRangeNames[97] = 'Georgian Supplement';
+ oRangeNames[98] = 'Tifinagh';
+ oRangeNames[99] = 'Ethiopic Extended';
+ oRangeNames[100] = 'Cyrillic Extended A';
+ oRangeNames[101] = 'Supplemental Punctuation';
+ oRangeNames[102] = 'CJK Radicals Supplement';
+ oRangeNames[103] = 'Kangxi Radicals';
+ oRangeNames[104] = 'Ideographic Description Characters';
+ oRangeNames[105] = 'CJK Symbols and Punctuation';
+ oRangeNames[106] = 'Hiragana';
+ oRangeNames[107] = 'Katakana';
+ oRangeNames[108] = 'Bopomofo';
+ oRangeNames[109] = 'Hangul Compatibility Jamo';
+ oRangeNames[110] = 'Kanbun';
+ oRangeNames[111] = 'Bopomofo Extended';
+ oRangeNames[112] = 'CJK Strokes';
+ oRangeNames[113] = 'Katakana Phonetic Extensions';
+ oRangeNames[114] = 'Enclosed CJK Letters and Months';
+ oRangeNames[115] = 'CJK Compatibility';
+ oRangeNames[116] = 'CJK Unified Ideographs Extension';
+ oRangeNames[117] = 'Yijing Hexagram Symbols';
+ oRangeNames[118] = 'CJK Unified Ideographs';
+ oRangeNames[119] = 'Yi Syllables';
+ oRangeNames[120] = 'Yi Radicals';
+ oRangeNames[121] = 'Lisu';
+ oRangeNames[122] = 'Vai';
+ oRangeNames[123] = 'Cyrillic Extended B';
+ oRangeNames[124] = 'Bamum';
+ oRangeNames[125] = 'Modifier Tone Letters';
+ oRangeNames[126] = 'Latin Extended D';
+ oRangeNames[127] = 'Syloti Nagri';
+ oRangeNames[128] = 'Common Indic Number Forms';
+ oRangeNames[129] = 'Phags pa';
+ oRangeNames[130] = 'Saurashtra';
+ oRangeNames[131] = 'Devanagari Extended';
+ oRangeNames[132] = 'Kayah Li';
+ oRangeNames[133] = 'Rejang';
+ oRangeNames[134] = 'Hangul Jamo Extended A';
+ oRangeNames[135] = 'Javanese';
+ oRangeNames[136] = 'Myanmar Extended B';
+ oRangeNames[137] = 'Cham';
+ oRangeNames[138] = 'Myanmar Extended A';
+ oRangeNames[139] = 'Tai Viet';
+ oRangeNames[140] = 'Meetei Mayek Extensions';
+ oRangeNames[141] = 'Ethiopic Extended A';
+ oRangeNames[142] = 'Latin Extended E';
+ oRangeNames[143] = 'Cherokee Supplement';
+ oRangeNames[144] = 'Meetei Mayek';
+ oRangeNames[145] = 'Hangul Syllables';
+ oRangeNames[146] = 'Hangul Jamo Extended B';
+ oRangeNames[147] = 'High Surrogates';
+ oRangeNames[148] = 'High Private Use Surrogates';
+ oRangeNames[149] = 'Low Surrogates';
+ oRangeNames[150] = 'Private Use Area';
+ oRangeNames[151] = 'CJK Compatibility Ideographs';
+ oRangeNames[152] = 'Alphabetic Presentation Forms';
+ oRangeNames[153] = 'Arabic Presentation Forms A';
+ oRangeNames[154] = 'Variation Selectors';
+ oRangeNames[155] = 'Vertical Forms';
+ oRangeNames[156] = 'Combining Half Marks';
+ oRangeNames[157] = 'CJK Compatibility Forms';
+ oRangeNames[158] = 'Small Form Variants';
+ oRangeNames[159] = 'Arabic Presentation Forms B';
+ oRangeNames[160] = 'Halfwidth and Fullwidth Forms';
+ oRangeNames[161] = 'Specials';
+ oRangeNames[162] = 'Linear B Syllabary';
+ oRangeNames[163] = 'Linear B Ideograms';
+ oRangeNames[164] = 'Aegean Numbers';
+ oRangeNames[165] = 'Ancient Greek Numbers';
+ oRangeNames[166] = 'Ancient Symbols';
+ oRangeNames[167] = 'Phaistos Disc';
+ oRangeNames[168] = 'Lycian';
+ oRangeNames[169] = 'Carian';
+ oRangeNames[170] = 'Coptic Epact Numbers';
+ oRangeNames[171] = 'Old Italic';
+ oRangeNames[172] = 'Gothic';
+ oRangeNames[173] = 'Old Permic';
+ oRangeNames[174] = 'Ugaritic';
+ oRangeNames[175] = 'Old Persian';
+ oRangeNames[176] = 'Deseret';
+ oRangeNames[177] = 'Shavian';
+ oRangeNames[178] = 'Osmanya';
+ oRangeNames[179] = 'Osage';
+ oRangeNames[180] = 'Elbasan';
+ oRangeNames[181] = 'Caucasian Albanian';
+ oRangeNames[182] = 'Linear A';
+ oRangeNames[183] = 'Cypriot Syllabary';
+ oRangeNames[184] = 'Imperial Aramaic';
+ oRangeNames[185] = 'Palmyrene';
+ oRangeNames[186] = 'Nabataean';
+ oRangeNames[187] = 'Hatran';
+ oRangeNames[188] = 'Phoenician';
+ oRangeNames[189] = 'Lydian';
+ oRangeNames[190] = 'Meroitic Hieroglyphs';
+ oRangeNames[191] = 'Meroitic Cursive';
+ oRangeNames[192] = 'Kharoshthi';
+ oRangeNames[193] = 'Old South Arabian';
+ oRangeNames[194] = 'Old North Arabian';
+ oRangeNames[195] = 'Manichaean';
+ oRangeNames[196] = 'Avestan';
+ oRangeNames[197] = 'Inscriptional Parthian';
+ oRangeNames[198] = 'Inscriptional Pahlavi';
+ oRangeNames[199] = 'Psalter Pahlavi';
+ oRangeNames[200] = 'Old Turkic';
+ oRangeNames[201] = 'Old Hungarian';
+ oRangeNames[202] = 'Rumi Numeral Symbols';
+ oRangeNames[203] = 'Brahmi';
+ oRangeNames[204] = 'Kaithi';
+ oRangeNames[205] = 'Sora Sompeng';
+ oRangeNames[206] = 'Chakma';
+ oRangeNames[207] = 'Mahajani';
+ oRangeNames[208] = 'Sharada';
+ oRangeNames[209] = 'Sinhala Archaic Numbers';
+ oRangeNames[210] = 'Khojki';
+ oRangeNames[211] = 'Multani';
+ oRangeNames[212] = 'Khudawadi';
+ oRangeNames[213] = 'Grantha';
+ oRangeNames[214] = 'Newa';
+ oRangeNames[215] = 'Tirhuta';
+ oRangeNames[216] = 'Siddham';
+ oRangeNames[217] = 'Modi';
+ oRangeNames[218] = 'Mongolian Supplement';
+ oRangeNames[219] = 'Takri';
+ oRangeNames[220] = 'Ahom';
+ oRangeNames[221] = 'Warang Citi';
+ oRangeNames[222] = 'Pau Cin Hau';
+ oRangeNames[223] = 'Bhaiksuki';
+ oRangeNames[224] = 'Marchen';
+ oRangeNames[225] = 'Cuneiform';
+ oRangeNames[226] = 'Cuneiform Numbers and Punctuation';
+ oRangeNames[227] = 'Early Dynastic Cuneiform';
+ oRangeNames[228] = 'Egyptian Hieroglyphs';
+ oRangeNames[229] = 'Anatolian Hieroglyphs';
+ oRangeNames[230] = 'Bamum Supplement';
+ oRangeNames[231] = 'Mro';
+ oRangeNames[232] = 'Bassa Vah';
+ oRangeNames[233] = 'Pahawh Hmong';
+ oRangeNames[234] = 'Miao';
+ oRangeNames[235] = 'Ideographic Symbols and Punctuation';
+ oRangeNames[236] = 'Tangut';
+ oRangeNames[237] = 'Tangut Components';
+ oRangeNames[238] = 'Kana Supplement';
+ oRangeNames[239] = 'Duployan';
+ oRangeNames[240] = 'Shorthand Format Controls';
+ oRangeNames[241] = 'Byzantine Musical Symbols';
+ oRangeNames[242] = 'Musical Symbols';
+ oRangeNames[243] = 'Ancient Greek Musical Notation';
+ oRangeNames[244] = 'Tai Xuan Jing Symbols';
+ oRangeNames[245] = 'Counting Rod Numerals';
+ oRangeNames[246] = 'Mathematical Alphanumeric Symbols';
+ oRangeNames[247] = 'Sutton SignWriting';
+ oRangeNames[248] = 'Glagolitic Supplement';
+ oRangeNames[249] = 'Mende Kikakui';
+ oRangeNames[250] = 'Adlam';
+ oRangeNames[251] = 'Arabic Mathematical Alphabetic Symbols';
+ oRangeNames[252] = 'Mahjong Tiles';
+ oRangeNames[253] = 'Domino Tiles';
+ oRangeNames[254] = 'Playing Cards';
+ oRangeNames[255] = 'Enclosed Alphanumeric Supplement';
+ oRangeNames[256] = 'Enclosed Ideographic Supplement';
+ oRangeNames[257] = 'Miscellaneous Symbols and Pictographs';
+ oRangeNames[258] = 'Emoticons';
+ oRangeNames[259] = 'Ornamental Dingbats';
+ oRangeNames[260] = 'Transport and Map Symbols';
+ oRangeNames[261] = 'Alchemical Symbols';
+ oRangeNames[262] = 'Geometric Shapes Extended';
+ oRangeNames[263] = 'Supplemental Arrows C';
+ oRangeNames[264] = 'Supplemental Symbols and Pictographs';
+ oRangeNames[265] = 'CJK Unified Ideographs Extension B';
+ oRangeNames[266] = 'CJK Unified Ideographs Extension C';
+ oRangeNames[267] = 'CJK Unified Ideographs Extension D';
+ oRangeNames[268] = 'CJK Unified Ideographs Extension E';
+ oRangeNames[269] = 'CJK Compatibility Ideographs Supplement';
+ oRangeNames[270] = 'Tags';
+ oRangeNames[271] = 'Variation Selectors Supplement';
+ oRangeNames[272] = 'Supplementary Private Use Area A';
+ oRangeNames[273] = 'Supplementary Private Use Area B';
+
+ var CELL_WIDTH = 31;
+ var CELL_HEIGHT = 33;
+
+ var aFontSelects = [];
+ var aRanges = [];
+ var aRecents = [];
+ var nCurrentFont = -1;// индекс в aFontSelects
+ var nCurrentSymbol = -1;// code
+ var bMainFocus = true;//фокус в основной таблице
+ var nFontNameRecent = -1;
+
+ var nMaxRecent = 36;
+ var bScrollMouseUp = false;
+
+ var sInitFont = "";
+ var sInitSymbol = "";
+
+ var nLastScroll = -1000;
+
+ var sLastId = "";
+ var nLastTime = -1000;
+
+ var lastTime = -1;
+ var lastKeyCode = -1;
+
+ var minScrollbarLength = 20;
+ var wheelSpeed = 20;
+
+
+ var loadTranslation = function(lang, callback) {
+ lang = lang.split(/[\-_]/)[0].toLocaleLowerCase();
+ Common.Utils.loadConfig('resources/symboltable/' + lang + '.json', function (langJson) {
+ for (var i=1; i<274; i++) {
+ var val = oRangeNames[i];
+ oRangeNames[i] = langJson[val] || val;
+ }
+ callback && callback();
+ });
+ };
+
+ Common.Views.SymbolTableDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ resizable : true,
+ minwidth : 448,
+ minheight : 396,
+ width: 448,
+ height: 396,
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel']
+ },
+
+ initialize : function(options) {
+ var filter = Common.localStorage.getKeysFilter();
+ this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
+
+ var path = this.appPrefix + 'settings-size-symbol-table',
+ size = Common.Utils.InternalSettings.get(path);
+ if (size==null || size==undefined) {
+ size = Common.localStorage.getItem(path) || '';
+ Common.Utils.InternalSettings.set(path, size);
+ }
+ size = size ? JSON.parse(size) : [];
+
+ _.extend(this.options, {
+ title: this.textTitle,
+ width : size[0] || 448,
+ height : size[1] || 396
+ }, options || {});
+
+ this.template = [
+ '',
+ '',
+ '
',
+ '',
+ '
',
+ '',
+ '
',
+ '
'
+ ].join('');
+
+ this.options.tpl = _.template(this.template)(this.options);
+ this.api = this.options.api;
+ this.type = this.options.type || 0; // 0 - close on OK, single adding symbol
+
+ var init = (aFontSelects.length<1);
+ init && this.initFonts();
+
+ if (options.font) {
+ for(var i = 0; i < aFontSelects.length; ++i){
+ if(aFontSelects[i].displayValue === options.font){
+ nCurrentFont = i;
+ break;
+ }
+ }
+ }
+
+ if (nCurrentFont < 0)
+ nCurrentFont = 0;
+
+ aRanges = this.getArrRangesByFont(nCurrentFont);
+ if(sInitSymbol && sInitSymbol.length > 0){
+ nCurrentSymbol = this.fixedCharCodeAt(sInitSymbol, 0);
+ if(false === nCurrentSymbol){
+ nCurrentSymbol = -1;
+ }
+ else{
+ for(var i = 0; i < aRanges.length; ++i){
+ if(nCurrentSymbol >= aRanges[i].Start && nCurrentSymbol <= aRanges[i].End){
+ break;
+ }
+ }
+ if(i === aRanges.length){
+ nCurrentSymbol = -1;
+ }
+ }
+ }
+ if(nCurrentSymbol === -1){
+ nCurrentSymbol = aRanges[0].Start;
+ }
+
+ if (options.code) {
+ nCurrentSymbol = options.code;
+ } else if (options.symbol) {
+ nCurrentSymbol = this.fixedCharCodeAt(options.symbol, 0);
+ }
+
+ if (init && this.options.lang && this.options.lang != 'en') {
+ var me = this;
+ loadTranslation(this.options.lang, function(){
+ me.updateRangeSelector();
+ });
+ }
+
+ Common.UI.Window.prototype.initialize.call(this, this.options);
+
+ this.on('resizing', _.bind(this.onWindowResizing, this));
+ this.on('resize', _.bind(this.onWindowResize, this));
+ },
+
+ initFonts: function() {
+ var fontList = this.api.pluginMethod_GetFontList();
+ fontList.sort(function(a, b){
+ if(a.m_wsFontName < b.m_wsFontName) return -1;
+ if(a.m_wsFontName > b.m_wsFontName) return 1;
+ return 0;
+ });
+
+ var oCurFont, oLastFont;
+ var data = [];
+ var oFontsByName = {};
+ var sCurFontNameInMap;
+ for(var i = 0; i < fontList.length; ++i){
+ oCurFont = fontList[i];
+ sCurFontNameInMap = oCurFont.m_wsFontName;
+ oLastFont = oFontsByName[sCurFontNameInMap];
+ if(!oLastFont){
+ oFontsByName[sCurFontNameInMap] = oCurFont;
+ }
+ else{
+ if(oLastFont.m_bBold && oLastFont.m_bItalic){
+ oFontsByName[sCurFontNameInMap] = oCurFont;
+ }
+ else if(oLastFont.m_bBold && !oCurFont.m_bBold){
+ oFontsByName[sCurFontNameInMap] = oCurFont;
+ }
+ else if(oLastFont.m_bItalic && !oCurFont.m_bBold && !oCurFont.m_bItalic){
+ oFontsByName[sCurFontNameInMap] = oCurFont;
+ }
+ }
+ }
+ delete oFontsByName['ASCW3'];
+ var i = 0;
+ for(var key in oFontsByName){
+ if(oFontsByName.hasOwnProperty(key)){
+ data.push(oFontsByName[key]);
+ data[data.length-1].displayValue = oFontsByName[key].m_wsFontName;
+ }
+ }
+
+ //initialize params
+ aFontSelects = data;
+ aFontSelects.sort(function(a, b){return (a.displayValue.toLowerCase() > b.displayValue.toLowerCase()) ? 1 : -1;});
+ for(i = 0; i < aFontSelects.length; ++i){
+ aFontSelects[i].value = i;
+ }
+
+ if(!oFontsByName[sInitFont]){
+ if(oFontsByName['Cambria Math']){
+ sInitFont = 'Cambria Math';
+ }
+ else if(oFontsByName['Asana-Math']){
+ sInitFont = 'Asana-Math';
+ }
+ }
+ if(oFontsByName[sInitFont]){
+ for(i = 0; i < aFontSelects.length; ++i){
+ if(aFontSelects[i].displayValue === sInitFont){
+ nCurrentFont = i;
+ break;
+ }
+ }
+ }
+ },
+
+ render: function() {
+ Common.UI.Window.prototype.render.call(this);
+
+ var me = this,
+ $window = this.getChild();
+
+ var $border = $window.find('.resize-border');
+ $border.css({'background': 'none', 'border': 'none'});
+
+ this.cmbFonts = new Common.UI.ComboBox({
+ el : $window.find('#symbol-table-cmb-fonts'),
+ cls : 'input-group-nr',
+ data : aFontSelects,
+ editable : false,
+ search : true,
+ menuStyle : 'min-width: 100%; max-height: 209px;'
+ }).on('selected', function(combo, record) {
+ var oCurrentRange = me.getRangeBySymbol(aRanges, nCurrentSymbol);
+ nCurrentFont = record.value;
+ aRanges = me.getArrRangesByFont(nCurrentFont);
+ if(oCurrentRange){
+ for(var i = 0; i < aRanges.length; ++i){
+ if(oCurrentRange.Name === aRanges[i].Name){
+ break;
+ }
+ }
+ if(i === aRanges.length){
+ nCurrentSymbol = aRanges[0].Start;
+ }
+ }
+ else{
+ nCurrentSymbol = aRanges[0].Start;
+ }
+ bMainFocus = true;
+ me.updateView();
+ setTimeout(function(){
+ me.previewPanel.focus();
+ }, 1);
+ });
+ this.cmbFonts.setValue(nCurrentFont);
+
+ this.cmbRange = new Common.UI.ComboBox({
+ el : $window.find('#symbol-table-cmb-range'),
+ cls : 'input-group-nr',
+ editable : false,
+ search : true,
+ menuStyle : 'min-width: 100%; max-height: 209px;'
+ }).on('selected', function(combo, record) {
+ var oCurrentRange = me.getRangeByName(aRanges, parseInt(record.value));
+ nCurrentSymbol = oCurrentRange.Start;
+ bMainFocus = true;
+ me.updateView(undefined, undefined, undefined, undefined, false);
+ setTimeout(function(){
+ me.previewPanel.focus();
+ }, 1);
+ });
+ this.updateRangeSelector();
+
+ me.inputCode = new Common.UI.InputField({
+ el : $window.find('#symbol-table-text-code'),
+ allowBlank : false,
+ blankError : me.txtEmpty,
+ style : 'width: 100%;',
+ validateOnBlur: false,
+ validateOnChange: true
+ }).on('changing', function(cmp, newValue, oldValue) {
+ var value = parseInt(newValue, 16);
+ if(!isNaN(value) && value > 0x1F){
+ var oRange = me.getRangeBySymbol(aRanges, value);
+ if(oRange){
+ var bUpdateTable = ($window.find("#c" + value).length === 0);
+ nCurrentSymbol = value;
+ bMainFocus = true;
+ me.updateView(bUpdateTable, undefined, false);
+ }
+ }
+ }).on('change:after', function(cmp, newValue, oldValue) {
+ me.updateInput();
+ });
+
+ //fill recents
+ this.fillRecentSymbols();
+
+ this.symbolTablePanel = $window.find('#symbol-table-scrollable-div');
+ this.previewPanel = $window.find('#id-preview-data');
+ this.previewParent = this.previewPanel.parent();
+ this.previewScrolled = $window.find('#id-preview');
+ this.previewInner = this.previewScrolled.find('div:first-child');
+ this.recentPanel = $window.find('#symbol-table-recent');
+ this.fontLabel = $window.find("#symbol-table-label-font");
+ this.boxPanel = $window.find('.box');
+ this.updateView(undefined, undefined, undefined, true);
+
+ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+ },
+
+ show: function() {
+ Common.UI.Window.prototype.show.apply(this, arguments);
+
+ if (!this.binding)
+ this.binding = {};
+ this.binding.keydownSymbols = _.bind(this.onKeyDown,this);
+ this.binding.keypressSymbols = _.bind(this.onKeyPress,this);
+ $(document).on('keydown.' + this.cid, '#symbol-table-scrollable-div #id-preview-data, #symbol-table-recent', this.binding.keydownSymbols);
+ $(document).on('keypress.' + this.cid, '#symbol-table-scrollable-div #id-preview-data, #symbol-table-recent', this.binding.keypressSymbols);
+
+ var me = this;
+ _.delay(function(){
+ me.previewPanel.focus();
+ },50);
+ },
+
+ close: function(suppressevent) {
+ $(document).off('keydown.' + this.cid, this.binding.keydownSymbols);
+ $(document).off('keypress.' + this.cid, this.binding.keypressSymbols);
+
+ Common.UI.Window.prototype.close.apply(this, arguments);
+ },
+
+ getPasteSymbol: function(cellId) {
+ var bUpdateRecents = cellId[0] === 'c';
+ var sFont;
+ if(bUpdateRecents){
+ sFont = aFontSelects[nCurrentFont].displayValue;
+ } else {
+ var nFontId = parseInt(cellId.split('_')[2]);
+ sFont = aFontSelects[nFontId].displayValue;
+ }
+ return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents};
+ },
+
+ onBtnClick: function(event) {
+ this._handleInput(event.currentTarget.attributes['result'].value);
+ },
+
+ onPrimary: function(event) {
+ this._handleInput('ok');
+ return false;
+ },
+
+ _handleInput: function(state) {
+ var settings = this.getPasteSymbol(this.$window.find('.cell-selected').attr('id'));
+ if (this.options.handler) {
+ this.options.handler.call(this, this, state, settings);
+ }
+ if (state=='ok') {
+ settings.updateRecents && this.checkRecent(nCurrentSymbol, settings.font);
+ settings.updateRecents && this.updateRecents();
+ if (this.type)
+ return;
+ }
+ this.close();
+ },
+
+ encodeSurrogateChar: function(nUnicode) {
+ if (nUnicode < 0x10000)
+ {
+ return String.fromCharCode(nUnicode);
+ }
+ else
+ {
+ nUnicode = nUnicode - 0x10000;
+ var nLeadingChar = 0xD800 | (nUnicode >> 10);
+ var nTrailingChar = 0xDC00 | (nUnicode & 0x3FF);
+ return String.fromCharCode(nLeadingChar) + String.fromCharCode(nTrailingChar);
+ }
+ },
+
+ fixedCharCodeAt: function(str, idx) {
+ idx = idx || 0;
+ var code = str.charCodeAt(idx);
+ var hi, low;
+ if (0xD800 <= code && code <= 0xDBFF) {
+ hi = code;
+ low = str.charCodeAt(idx + 1);
+ if (isNaN(low)) {
+ throw 'Старшая часть суррогатной пары без следующей младшей в fixedCharCodeAt()';
+ }
+ return ((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;
+ }
+ if (0xDC00 <= code && code <= 0xDFFF) {
+ return false;
+ }
+ return code;
+ },
+
+ getArrRangesByFont: function(nFontName){
+ var _ret = getSupportedRangesByFont(aFontSelects[nFontName]);
+ if(_ret.length === 0){
+ _ret.push({Start:0x20, End: 0xFF});
+ }
+ if(_ret[0].Start < 0x20){
+ _ret[0].Start = 0x20;
+ }
+ return _ret;
+ },
+
+ getRangeBySymbol: function(arrRanges, nCode){
+ for(var i = 0; i < arrRanges.length; ++i){
+ if(arrRanges[i].Start <= nCode && arrRanges[i].End >= nCode){
+ return arrRanges[i];
+ }
+ }
+ return null;
+ },
+
+ getRangeByName: function(arrRanges, nName){
+ for(var i = 0; i < arrRanges.length; ++i){
+ if(arrRanges[i].Name === nName){
+ return arrRanges[i];
+ }
+ }
+ return null;
+ },
+
+ getLinearIndexByCode: function(arrRanges, nCode){
+ var nLinearIndex = -1;
+ var nCounter = 0;
+ var oCurRange;
+ for(var i = 0; i < arrRanges.length; ++i){
+ oCurRange = arrRanges[i];
+ if(oCurRange.Start > nCode){
+ return -1;
+ }
+ if(oCurRange.Start <= nCode && oCurRange.End >= nCode){
+ return nCounter + (nCode - oCurRange.Start);
+ }
+ nCounter += (oCurRange.End - oCurRange.Start + 1);
+ }
+ return nLinearIndex;
+ },
+
+ getCodeByLinearIndex: function(arrRanges, nIndex){
+ if(nIndex < 0){
+ return -1;
+ }
+ var nCount = 0;
+ var oCurRange = arrRanges[0];
+ var nDiff;
+ for(var i = 0; i < arrRanges.length; ++i){
+ oCurRange = arrRanges[i];
+ nDiff = oCurRange.End - oCurRange.Start + 1;
+ if(nCount + nDiff > nIndex){
+ return oCurRange.Start + nIndex - nCount;
+ }
+ nCount += nDiff;
+ }
+ return -1;
+ },
+
+ createTable: function(arrSym, nRowsCount, nColsCount){
+ var nDivCount = nRowsCount*nColsCount;
+ var nCellsCounter = 0;
+ var sInnerHtml = '';
+ var sId;
+ var sStyle = 'style=\'border-bottom: none\'';
+ var sCellStyle;
+ for(var i = 0; i < nDivCount; ++i){
+
+
+ if(((i / nColsCount) >> 0) === (nRowsCount - 1)){
+ sCellStyle = sStyle;
+ }
+ else{
+ sCellStyle = '';
+ }
+ if(i < arrSym.length){
+ sId = 'c' + arrSym[i];
+ sInnerHtml += '| ', + '', + '', + ' | ', + '', + '', + '', + ' | ', + '
| ',
+ ' ',
+ ' ',
+ '',
+ ' ',
+ '',
+ ' ',
+ '',
+ ' ',
+ '',
+ ' | ',
+ '
| ', + '', + '', + ' | ', + '
| ', + '', + ' | ', + '', + ' | ', + '
| ', + '', + ' | ', + '', + '', + ' | ', + '
' + '&#' + arrSym[i].toString(10) + '
';
+ }
+ else{
+ sInnerHtml += '';
+ }
+ ++nCellsCounter;
+ if(nCellsCounter >= nColsCount){
+ sInnerHtml += ''; + nCellsCounter = 0; + } + } + this.previewPanel.html(sInnerHtml); + }, + + fillRecentSymbols: function(){ + var sRecents = Common.localStorage.getItem(this.appPrefix + 'recentSymbols'); + var aRecentCookies; + if(sRecents != ''){ + aRecentCookies = JSON.parse(sRecents); + } + if(_.isArray(aRecentCookies)){ + aRecents = aRecentCookies; + } + }, + + saveRecent: function(){ + var sJSON = JSON.stringify(aRecents); + Common.localStorage.setItem(this.appPrefix + 'recentSymbols', sJSON); + }, + + checkRecent: function(sSymbol, sFont){ + if(aRecents.length === 0){ + aRecents.push({symbol: sSymbol, font: sFont}); + return; + } + for(var i = 0; i < aRecents.length; ++i){ + if(aRecents[i].symbol === sSymbol && aRecents[i].font === sFont){ + aRecents.splice(i, 1); + break; + } + } + aRecents.splice(0, 0, {symbol: sSymbol, font: sFont}); + if(aRecents.length > nMaxRecent){ + aRecents.splice(nMaxRecent, aRecents.length - nMaxRecent); + } + this.saveRecent(); + }, + + createCell: function(nSymbolCode, sFontName){ + var sId = '', + symbol = ''; + if(sFontName){ + var nFontIndex = 0; + for(var i = 0; i < aFontSelects.length; ++i){ + if(aFontSelects[i].displayValue === sFontName){ + nFontIndex = i; + break; + } + } + sId = 'r_' + nSymbolCode + '_' + nFontIndex; + symbol = '&#' + nSymbolCode.toString(); + } else if (nSymbolCode!==undefined) { + sId = 'r' + nSymbolCode; + symbol = '&#' + nSymbolCode.toString(); + } + var _ret = $('
' + symbol + '
');
+ _ret.addClass('cell');
+ _ret.addClass('noselect');
+ _ret.mousedown(_.bind(this.cellClickHandler, this));
+ if(sFontName){
+ _ret.css('font-family', '\'' + sFontName + '\'');
+ }
+ return _ret;
+ },
+
+ cellClickHandler: function (e) {
+ var id = $(e.target).attr('id');
+ if(!id){
+ return;
+ }
+ var nTime = (new Date()).getTime();
+ if(id === sLastId && (nTime - nLastTime) < 300 ){
+ this.cellDblClickHandler(e)
+ }
+ else{
+ if(id[0] === 'c'){
+ nCurrentSymbol = parseInt(id.slice(1, id.length));
+ bMainFocus = true;
+ }
+ else{
+ var aStrings = id.split('_');
+ nCurrentSymbol = parseInt(aStrings[1]);
+ nFontNameRecent = parseInt(aStrings[2]);
+ bMainFocus = false;
+ }
+ this.updateView(false);
+ }
+ sLastId = e.target.id;
+ nLastTime = nTime;
+ },
+
+ cellDblClickHandler: function (e){
+ if (!this.type)
+ this._handleInput('ok');
+ else {
+ var settings = this.getPasteSymbol($(e.target).attr('id'));
+ settings.updateRecents && this.checkRecent(nCurrentSymbol, settings.font);
+ settings.updateRecents && this.updateView(false, undefined, undefined, true);
+ this.fireEvent('symbol:dblclick', this, 'ok', settings);
+ }
+ },
+
+ updateRecents: function(){
+ var oRecentsDiv = this.recentPanel;
+ oRecentsDiv.empty();
+ var nCols = this.getColsCount(),
+ nRecents = aRecents.length;
+ oRecentsDiv.width(nCols * CELL_WIDTH);
+ for(var i = 0; i < nCols; ++i){
+ var oCell = (i<%= me.textCustomColors %>
',
+ '',
+ 'Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index 91cd7c4b4..a36be77b1 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -22,6 +22,7 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtEmbed": "Embed", "DE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/documenteditor/embed/locale/fr.json b/apps/documenteditor/embed/locale/fr.json index 1145973e3..f06efef7c 100644 --- a/apps/documenteditor/embed/locale/fr.json +++ b/apps/documenteditor/embed/locale/fr.json @@ -12,6 +12,7 @@ "DE.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.
Veuillez contacter l'administrateur de Document Server.", "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1", "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.", + "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.
Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information. ", "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.", "DE.ApplicationController.notcriticalErrorTitle": "Avertissement", "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", diff --git a/apps/documenteditor/embed/locale/it.json b/apps/documenteditor/embed/locale/it.json index 327a968e2..f35b88f9b 100644 --- a/apps/documenteditor/embed/locale/it.json +++ b/apps/documenteditor/embed/locale/it.json @@ -12,6 +12,7 @@ "DE.ApplicationController.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.
Si prega di contattare l'amministratore del Server dei Documenti.", "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1", "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", + "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.
Per i dettagli, contatta l'amministratore del Document server.", "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.", "DE.ApplicationController.notcriticalErrorTitle": "Avviso", "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.", diff --git a/apps/documenteditor/embed/locale/ru.json b/apps/documenteditor/embed/locale/ru.json index ea575e0d1..6fc73f817 100644 --- a/apps/documenteditor/embed/locale/ru.json +++ b/apps/documenteditor/embed/locale/ru.json @@ -12,6 +12,7 @@ "DE.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
Пожалуйста, обратитесь к администратору Сервера документов.", "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1", "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", + "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.
Обратитесь к администратору Сервера документов для получения дополнительной информации.", "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.", "DE.ApplicationController.notcriticalErrorTitle": "Внимание", "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index fd86037ef..6ebac79fd 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -62,7 +62,6 @@ define([ 'hide': _.bind(this.onHideChat, this) }, 'Common.Views.Header': { - 'click:users': _.bind(this.clickStatusbarUsers, this), 'file:settings': _.bind(this.clickToolbarSettings,this), 'history:show': function () { if ( !this.leftMenu.panelHistory.isVisible() ) @@ -468,6 +467,7 @@ define([ if (this.mode.canViewComments && this.leftMenu.panelComments.isVisible()) value = resolved = true; (value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); + this.getApplication().getController('Common.Controllers.ReviewChanges').commentsShowHide(value ? 'show' : 'hide'); /** coauthoring end **/ value = Common.localStorage.getItem("de-settings-fontrender"); @@ -532,10 +532,6 @@ define([ }, /** coauthoring begin **/ - clickStatusbarUsers: function() { - this.leftMenu.menuFile.panels['rights'].changeAccessRights(); - }, - onHideChat: function() { $(this.leftMenu.btnChat.el).blur(); Common.NotificationCenter.trigger('layout:changed', 'leftmenu'); diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index f6d37fd4c..05b657ec5 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -41,6 +41,7 @@ define([ 'core', + 'common/main/lib/component/Calendar', 'documenteditor/main/app/view/Links', 'documenteditor/main/app/view/NoteSettingsDialog', 'documenteditor/main/app/view/HyperlinkSettingsDialog', @@ -129,7 +130,8 @@ define([ in_header = false, in_equation = false, in_image = false, - in_table = false; + in_table = false, + frame_pr = null; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); @@ -137,6 +139,7 @@ define([ if (type === Asc.c_oAscTypeSelectElement.Paragraph) { paragraph_locked = pr.get_Locked(); + frame_pr = pr; } else if (type === Asc.c_oAscTypeSelectElement.Header) { header_locked = pr.get_Locked(); in_header = true; @@ -153,12 +156,19 @@ define([ var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; - var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain; + var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock; this.view.btnsNotes.setDisabled(need_disable); need_disable = paragraph_locked || header_locked || in_header || control_plain; this.view.btnBookmarks.setDisabled(need_disable); + + need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; + this.view.btnsContents.setDisabled(need_disable); }, onApiCanAddHyperlink: function(value) { @@ -351,8 +361,9 @@ define([ })).show(); }, - onShowContentControlsActions: function(action, x, y) { - var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu, + onShowTOCActions: function(obj, x, y) { + var action = obj.button, + menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu, documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)), me = this; @@ -391,6 +402,155 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + this.view.listControlMenu && this.view.listControlMenu.isVisible() && this.view.listControlMenu.hide(); + var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); + if (controlsContainer.is(':visible')) + controlsContainer.hide(); + }, + + onShowDateActions: function(obj, x, y) { + var props = obj.pr, + specProps = props.get_DateTimePr(), + documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'), + me = this; + + this._state.dateObj = props; + + if (controlsContainer.length < 1) { + controlsContainer = $('
');
+ documentHolderView.cmpEl.append(controlsContainer);
+ }
+
+ Common.UI.Menu.Manager.hideAll();
+
+ controlsContainer.css({left: x, top : y});
+ controlsContainer.show();
+
+ if (!this.cmpCalendar) {
+ this.cmpCalendar = new Common.UI.Calendar({
+ el: documentHolderView.cmpEl.find('#id-document-calendar-control'),
+ enableKeyEvents: true,
+ firstday: 1
+ });
+ this.cmpCalendar.on('date:click', function (cmp, date) {
+ var props = me._state.dateObj,
+ specProps = props.get_DateTimePr(),
+ id = props.get_InternalId();
+ specProps.put_FullDate(new Date(date));
+ me.api.asc_SetContentControlProperties(props, id);
+ controlsContainer.hide();
+ me.api.asc_UncheckContentControlButtons();
+ });
+ this.cmpCalendar.on('calendar:keydown', function (cmp, e) {
+ if (e.keyCode==Common.UI.Keys.ESC) {
+ controlsContainer.hide();
+ me.api.asc_UncheckContentControlButtons();
+ }
+ });
+ }
+ this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined));
+
+ // align
+ var offset = controlsContainer.offset(),
+ docW = Common.Utils.innerWidth(),
+ docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number
+ menuW = this.cmpCalendar.cmpEl.outerWidth(),
+ menuH = this.cmpCalendar.cmpEl.outerHeight(),
+ buttonOffset = 22,
+ left = offset.left - menuW,
+ top = offset.top;
+ if (top + menuH > docH) {
+ top = docH - menuH;
+ left -= buttonOffset;
+ }
+ if (top < 0)
+ top = 0;
+ if (left + menuW > docW)
+ left = docW - menuW;
+ this.cmpCalendar.cmpEl.css({left: left, top : top});
+
+ documentHolderView._preventClick = true;
+ },
+
+ onShowListActions: function(obj, x, y) {
+ var type = obj.type,
+ props = obj.pr,
+ specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(),
+ menu = this.view.listControlMenu,
+ documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder,
+ menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
+ me = this;
+
+ this._state.listObj = props;
+
+ this._fromShowContentControls = true;
+ Common.UI.Menu.Manager.hideAll();
+
+ if (!menu) {
+ this.view.listControlMenu = menu = new Common.UI.Menu({
+ menuAlign: 'tr-bl',
+ items: []
+ });
+ menu.on('item:click', function(menu, item) {
+ setTimeout(function(){
+ me.api.asc_SelectContentControlListItem(item.value, me._state.listObj.get_InternalId());
+ }, 1);
+ });
+
+ // Prepare menu container
+ if (!menuContainer || menuContainer.length < 1) {
+ menuContainer = $(Common.Utils.String.format('', menu.id));
+ documentHolderView.cmpEl.append(menuContainer);
+ }
+
+ menu.render(menuContainer);
+ menu.cmpEl.attr({tabindex: "-1"});
+ menu.on('hide:after', function(){
+ me.view.listControlMenu.removeAll();
+ if (!me._fromShowContentControls)
+ me.api.asc_UncheckContentControlButtons();
+ });
+ }
+ if (specProps) {
+ var count = specProps.get_ItemsCount();
+ for (var i=0; i
' + ''.repeat(20) + '
');
}
Common.Controllers.Desktop.init(this.appOptions);
@@ -596,7 +601,7 @@ define([
docId: version.key,
docIdPrev: docIdPrev,
selected: false,
- canRestore: this.appOptions.canHistoryRestore,
+ canRestore: this.appOptions.canHistoryRestore && this.appOptions.canDownload,
isRevision: false,
isVisible: true,
serverVersion: version.serverVersion
@@ -646,11 +651,16 @@ define([
goBack: function(current) {
if ( !Common.Controllers.Desktop.process('goback') ) {
- var href = this.appOptions.customization.goback.url;
- if (!current && this.appOptions.customization.goback.blank!==false) {
- window.open(href, "_blank");
+ if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) {
+ Common.Gateway.requestClose();
+ // Common.Controllers.Desktop.requestClose();
} else {
- parent.location.href = href;
+ var href = this.appOptions.customization.goback.url;
+ if (!current && this.appOptions.customization.goback.blank!==false) {
+ window.open(href, "_blank");
+ } else {
+ parent.location.href = href;
+ }
}
}
},
@@ -1057,6 +1067,7 @@ define([
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
Common.Gateway.documentReady();
+ $('#editor-container').css('overflow', '');
$('.doc-placeholder').remove();
},
@@ -1155,7 +1166,6 @@ define([
this.appOptions.isOffline = this.api.asc_isOffline();
this.appOptions.isReviewOnly = this.permissions.review === true && this.permissions.edit === false;
this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;
- this.appOptions.canRequestClose = this.editorConfig.canRequestClose;
this.appOptions.canEdit = (this.permissions.edit !== false || this.permissions.review === true) && // can edit or review
(this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
(!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
@@ -1263,13 +1273,13 @@ define([
var me = this,
application = this.getApplication(),
reviewController = application.getController('Common.Controllers.ReviewChanges');
- reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
+ reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api).loadDocument({doc:me.document});
if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode
var toolbarController = application.getController('Toolbar');
toolbarController && toolbarController.setApi(me.api);
- if (this.appOptions.isRestrictedEdit) return;
+ if (!this.appOptions.isEdit) return;
var rightmenuController = application.getController('RightMenu'),
fontsControllers = application.getController('Common.Controllers.Fonts');
@@ -1387,6 +1397,18 @@ define([
config.msg = this.uploadImageFileCountMessage;
break;
+ case Asc.c_oAscError.ID.UplDocumentSize:
+ config.msg = this.uploadDocSizeMessage;
+ break;
+
+ case Asc.c_oAscError.ID.UplDocumentExt:
+ config.msg = this.uploadDocExtMessage;
+ break;
+
+ case Asc.c_oAscError.ID.UplDocumentFileCount:
+ config.msg = this.uploadDocFileCountMessage;
+ break;
+
case Asc.c_oAscError.ID.SplitCellMaxRows:
config.msg = this.splitMaxRowsErrorText.replace('%1', errData.get_Value());
break;
@@ -1450,7 +1472,7 @@ define([
break;
case Asc.c_oAscError.ID.Warning:
- config.msg = this.errorConnectToServer.replace('%1', '{{API_URL_EDITING_CALLBACK}}');
+ config.msg = this.errorConnectToServer;
config.closable = false;
break;
@@ -1499,6 +1521,11 @@ define([
config.msg = this.errorFileSizeExceed;
break;
+ case Asc.c_oAscError.ID.UpdateVersion:
+ config.msg = this.errorUpdateVersionOnDisconnect;
+ config.maxwidth = 600;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -2076,7 +2103,8 @@ define([
var filemenu = this.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file');
filemenu.loadDocument({doc:this.document});
- filemenu.panels['info'].updateInfo(this.document);
+ filemenu.panels && filemenu.panels['info'] && filemenu.panels['info'].updateInfo(this.document);
+ this.getApplication().getController('Common.Controllers.ReviewChanges').loadDocument({doc:this.document});
Common.Gateway.metaChange(meta);
},
@@ -2159,7 +2187,7 @@ define([
uploadImageTextText: 'Uploading image...',
savePreparingText: 'Preparing to save',
savePreparingTitle: 'Preparing to save. Please wait...',
- uploadImageSizeMessage: 'Maximium image size limit exceeded.',
+ uploadImageSizeMessage: 'Maximum image size limit exceeded.',
uploadImageExtMessage: 'Unknown image format.',
uploadImageFileCountMessage: 'No images uploaded.',
reloadButtonText: 'Reload Page',
@@ -2219,15 +2247,14 @@ define([
sendMergeTitle: 'Sending Merge',
sendMergeText: 'Sending Merge...',
txtArt: 'Your text here',
- errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.When you click the \'OK\' button, you will be prompted to download the document.
' + - 'Find more information about connecting Document Server here', + errorConnectToServer: 'The document could not be saved. Please check connection settings or contact your administrator.
When you click the \'OK\' button, you will be prompted to download the document.', textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.
Click the \'Strict mode\' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.', textStrict: 'Strict mode', txtErrorLoadHistory: 'Loading history failed', textBuyNow: 'Visit website', textNoLicenseTitle: '%1 connection limitation', textContactUs: 'Contact sales', - errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored.', + errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download or print until the connection is restored and page is reloaded.', warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.', titleLicenseExp: 'License expired', openErrorText: 'An error has occurred while opening the file', @@ -2475,7 +2502,11 @@ define([ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', txtMainDocOnly: 'Error! Main Document Only.', txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.', - txtNoText: 'Error! No text of specified style in document.' + txtNoText: 'Error! No text of specified style in document.', + uploadDocSizeMessage: 'Maximum document size limit exceeded.', + uploadDocExtMessage: 'Unknown document format.', + uploadDocFileCountMessage: 'No documents uploaded.', + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 3f9caafcf..eb5a1f826 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -47,6 +47,7 @@ define([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', + 'common/main/lib/view/SymbolTableDialog', 'common/main/lib/util/define', 'documenteditor/main/app/view/Toolbar', 'documenteditor/main/app/view/DropcapSettingsAdvanced', @@ -56,7 +57,8 @@ define([ 'documenteditor/main/app/controller/PageLayout', 'documenteditor/main/app/view/CustomColumnsDialog', 'documenteditor/main/app/view/ControlSettingsDialog', - 'documenteditor/main/app/view/WatermarkSettingsDialog' + 'documenteditor/main/app/view/WatermarkSettingsDialog', + 'documenteditor/main/app/view/CompareSettingsDialog' ], function () { 'use strict'; @@ -323,6 +325,7 @@ define([ toolbar.listStyles.on('contextmenu', _.bind(this.onListStyleContextMenu, this)); toolbar.styleMenu.on('hide:before', _.bind(this.onListStyleBeforeHide, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); + toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this)); toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this)); toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this)); Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); @@ -377,7 +380,10 @@ define([ this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this)); this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); + this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); + this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this)); + this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); @@ -640,7 +646,8 @@ define([ var i = -1, type, paragraph_locked = false, header_locked = false, - image_locked = false; + image_locked = false, + in_image = false; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); @@ -650,11 +657,15 @@ define([ } else if (type === Asc.c_oAscTypeSelectElement.Header) { header_locked = selectedObjects[i].get_ObjectValue().get_Locked(); } else if (type === Asc.c_oAscTypeSelectElement.Image) { + in_image = true; image_locked = selectedObjects[i].get_ObjectValue().get_Locked(); } } var need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked; + if (this.mode.compatibleFeatures) { + need_disable = need_disable || in_image; + } if ( this.btnsComment && this.btnsComment.length > 0 ) this.btnsComment.setDisabled(need_disable); }, @@ -716,7 +727,11 @@ define([ if (sh) this.onParagraphColor(sh); - var need_disable = paragraph_locked || header_locked; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; + var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock; if (this._state.prcontrolsdisable != need_disable) { if (this._state.activated) this._state.prcontrolsdisable = need_disable; @@ -730,15 +745,18 @@ define([ lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); + var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; - if (!paragraph_locked && !header_locked) { - toolbar.btnContentControls.menu.items[0].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked); - toolbar.btnContentControls.menu.items[1].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked); - toolbar.btnContentControls.menu.items[3].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); - toolbar.btnContentControls.menu.items[5].setDisabled(!in_control); + toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked); + if (!(paragraph_locked || header_locked)) { + var control_disable = control_plain || content_locked; + for (var i=0; i<7; i++) + toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } - var need_text_disable = paragraph_locked || header_locked || in_chart; + var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock; if (this._state.textonlycontrolsdisable != need_text_disable) { if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable; if (!need_disable) { @@ -746,7 +764,7 @@ define([ item.setDisabled(need_text_disable); }, this); } - toolbar.btnCopyStyle.setDisabled(need_text_disable); + // toolbar.btnCopyStyle.setDisabled(need_text_disable); toolbar.btnClearStyle.setDisabled(need_text_disable); } @@ -772,22 +790,22 @@ define([ if ( !toolbar.btnDropCap.isDisabled() ) toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv); - need_disable = !can_add_table || header_locked || in_equation || control_plain; + need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertTable.setDisabled(need_disable); need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain; toolbar.mnuInsertPageNum.setDisabled(need_disable); var in_footnote = this.api.asc_IsCursorInFootnote(); - need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control; + need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock; toolbar.btnsPageBreak.setDisabled(need_disable); toolbar.btnBlankPage.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked; toolbar.btnInsertShape.setDisabled(need_disable); toolbar.btnInsertText.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertImage.setDisabled(need_disable); toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote); @@ -796,26 +814,31 @@ define([ this._state.in_chart = in_chart; } - need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain; + need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertChart.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertEquation.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_equation; + toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock); + + need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock; toolbar.btnSuperscript.setDisabled(need_disable); toolbar.btnSubscript.setDisabled(need_disable); toolbar.btnEditHeader.setDisabled(in_equation); - need_disable = paragraph_locked || header_locked || in_image || control_plain; + need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock; if (need_disable != toolbar.btnColumns.isDisabled()) toolbar.btnColumns.setDisabled(need_disable); if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); - need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked; + need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock; + if (this.mode.compatibleFeatures) { + need_disable = need_disable || in_image; + } if ( this.btnsComment && this.btnsComment.length > 0 ) this.btnsComment.setDisabled(need_disable); @@ -829,6 +852,13 @@ define([ this.modeAlwaysSetStyle = false; }, + onTableDraw: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[2].setChecked(!!v, true); + }, + onTableErase: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[3].setChecked(!!v, true); + }, + onApiParagraphStyleChange: function(name) { if (this._state.prstyle != name) { var listStyle = this.toolbar.listStyles, @@ -1371,6 +1401,12 @@ define([ Common.NotificationCenter.trigger('edit:complete', me.toolbar); } })).show(); + } else if (item.value == 'draw') { + item.isChecked() && menu.items[3].setChecked(false, true); + this.api.SetTableDrawMode(item.isChecked()); + } else if (item.value == 'erase') { + item.isChecked() && menu.items[2].setChecked(false, true); + this.api.SetTableEraseMode(item.isChecked()); } }, @@ -1694,6 +1730,8 @@ define([ (new DE.Views.ControlSettingsDialog({ props: props, api: me.api, + controlLang: me._state.lang, + interfaceLang: me.mode.lang, handler: function(result, value) { if (result == 'ok') { me.api.asc_SetContentControlProperties(value, id); @@ -1710,7 +1748,17 @@ define([ } } } else { - this.api.asc_AddContentControl(item.value); + if (item.value == 'plain' || item.value == 'rich') + this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block); + else if (item.value == 'picture') + this.api.asc_AddContentControlPicture(); + else if (item.value == 'checkbox') + this.api.asc_AddContentControlCheckBox(); + else if (item.value == 'date') + this.api.asc_AddContentControlDatePicker(); + else if (item.value == 'combobox' || item.value == 'dropdown') + this.api.asc_AddContentControlList(item.value == 'combobox'); + Common.component.Analytics.trackEvent('ToolBar', 'Add Content Control'); } @@ -2435,6 +2483,31 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar, this.toolbar.btnInsertEquation); }, + onInsertSymbolClick: function() { + if (this.dlgSymbolTable && this.dlgSymbolTable.isVisible()) return; + + if (this.api) { + var me = this; + me.dlgSymbolTable = new Common.Views.SymbolTableDialog({ + api: me.api, + lang: me.mode.lang, + modal: false, + type: 1, + buttons: [{value: 'ok', caption: this.textInsert}, 'close'], + handler: function(dlg, result, settings) { + if (result == 'ok') { + me.api.asc_insertSymbol(settings.font, settings.code); + } else + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + }); + me.dlgSymbolTable.show(); + me.dlgSymbolTable.on('symbol:dblclick', function(cmp, result, settings) { + me.api.asc_insertSymbol(settings.font, settings.code); + }); + } + }, + onApiMathTypes: function(equation) { this._equationTemp = equation; var me = this; @@ -2800,45 +2873,43 @@ define([ compactview = true; } - setTimeout(function () { - me.toolbar.render(_.extend({isCompactView: compactview}, config)); + me.toolbar.render(_.extend({isCompactView: compactview}, config)); - var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; - var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel(); - if ( $panel ) - me.toolbar.addTab(tab, $panel, 4); + var tab = {action: 'review', caption: me.toolbar.textTabCollaboration}; + var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel(); + if ( $panel ) + me.toolbar.addTab(tab, $panel, 4); - if ( config.isEdit ) { - me.toolbar.setMode(config); + if ( config.isEdit ) { + me.toolbar.setMode(config); - me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); + me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); - if (!(config.customization && config.customization.compactHeader)) { - // hide 'print' and 'save' buttons group and next separator - me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); + if (!(config.customization && config.customization.compactHeader)) { + // hide 'print' and 'save' buttons group and next separator + me.toolbar.btnPrint.$el.parents('.group').hide().next().hide(); - // hide 'undo' and 'redo' buttons and retrieve parent container - var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); + // hide 'undo' and 'redo' buttons and retrieve parent container + var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent(); - // move 'paste' button to the container instead of 'undo' and 'redo' - me.toolbar.btnPaste.$el.detach().appendTo($box); - me.toolbar.btnCopy.$el.removeClass('split'); - } - - if ( config.isDesktopApp ) { - if ( config.canProtect ) { - tab = {action: 'protect', caption: me.toolbar.textTabProtect}; - $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); - - if ($panel) me.toolbar.addTab(tab, $panel, 5); - } - } - - var links = me.getApplication().getController('Links'); - links.setApi(me.api).setConfig({toolbar: me}); - Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons()); + // move 'paste' button to the container instead of 'undo' and 'redo' + me.toolbar.btnPaste.$el.detach().appendTo($box); + me.toolbar.btnCopy.$el.removeClass('split'); } - }, 0); + + if ( config.isDesktopApp ) { + if ( config.canProtect ) { + tab = {action: 'protect', caption: me.toolbar.textTabProtect}; + $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel(); + + if ($panel) me.toolbar.addTab(tab, $panel, 5); + } + } + + var links = me.getApplication().getController('Links'); + links.setApi(me.api).setConfig({toolbar: me}); + Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons()); + } }, onAppReady: function (config) { @@ -2854,6 +2925,8 @@ define([ btn.on('click', function (btn, e) { Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); }); + if (btn.cmpEl.closest('#review-changes-panel').length>0) + btn.setCaption(me.toolbar.capBtnAddComment); }, this); } } @@ -2888,6 +2961,10 @@ define([ } }, + onTextLanguage: function(langId) { + this._state.lang = langId; + }, + textEmptyImgUrl : 'You need to specify image URL.', textWarning : 'Warning', textFontSizeErr : 'The entered value is incorrect.
Please enter a numeric value between 1 and 100', @@ -3235,7 +3312,8 @@ define([ confirmAddFontName: 'The font you are going to save is not available on the current device.
The text style will be displayed using one of the device fonts, the saved font will be used when it is available.
Do you want to continue?', notcriticalErrorTitle: 'Warning', txtMarginsW: 'Left and right margins are too high for a given page wight', - txtMarginsH: 'Top and bottom margins are too high for a given page height' + txtMarginsH: 'Top and bottom margins are too high for a given page height', + textInsert: 'Insert' }, DE.Controllers.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template new file mode 100644 index 000000000..70df12159 --- /dev/null +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -0,0 +1,151 @@ +
+
+
+
+
+
+
+
+| + + + | +
| + + + | +
| + + | +
| + + | +|
| + + | ++ + | +
| + + | ++ + | +
| + + | +|
+
+
+
+
+
+| + + | +
| + + | +
+
+
+
+
+
+| + + + | ++ |
| + + | ++ + + + + + | +
+
+
+
+
+
+| + + | +
| + + | +
| + + | +
| + + | +
| + + | +
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/template/ImageSettings.template b/apps/documenteditor/main/app/template/ImageSettings.template
index 8abc9eaf0..9fae4b54e 100644
--- a/apps/documenteditor/main/app/template/ImageSettings.template
+++ b/apps/documenteditor/main/app/template/ImageSettings.template
@@ -14,17 +14,17 @@
+
+
+
+| + + | ++ + | ++ + | +
| + + | ++ + | ++ + | +
+
diff --git a/apps/documenteditor/main/app/template/Viewport.template b/apps/documenteditor/main/app/template/Viewport.template
index 40c1ea100..8d56d214c 100644
--- a/apps/documenteditor/main/app/template/Viewport.template
+++ b/apps/documenteditor/main/app/template/Viewport.template
@@ -9,7 +9,7 @@
',
'',
'',
- '',
+ '',
+ '
-
+
diff --git a/apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js b/apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js
index c1ed6c6c9..4ca86915e 100644
--- a/apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js
+++ b/apps/documenteditor/main/app/view/AddNewCaptionLabelDialog.js
@@ -48,8 +48,7 @@ define([
width: 330,
header: false,
cls: 'modal-dlg',
- buttons: ['ok', 'cancel'],
- footerCls: 'center'
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js
index 60dea4536..9210e9648 100644
--- a/apps/documenteditor/main/app/view/BookmarksDialog.js
+++ b/apps/documenteditor/main/app/view/BookmarksDialog.js
@@ -110,7 +110,7 @@ define([
'',
+ '',
+ '
',
+ '',
+ '',
+ '',
+ '
',
+ '',
+ '',
+ '',
+ '
',
+ '',
+ '',
+ '',
+ '
',
+ '',
+ '',
+ '',
+ '',
+ '
',
+ ''
].join('');
this.options.tpl = _.template(this.template)(this.options);
@@ -107,6 +126,13 @@ define([
maxValue: 55.88,
minValue: -55.87
});
+ this.spnTop.on('change', _.bind(function (field, newValue, oldValue) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_TopMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
this.spinners.push(this.spnTop);
this.spnBottom = new Common.UI.MetricSpinner({
@@ -118,6 +144,13 @@ define([
maxValue: 55.88,
minValue: -55.87
});
+ this.spnBottom.on('change', _.bind(function (field, newValue, oldValue) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
this.spinners.push(this.spnBottom);
this.spnLeft = new Common.UI.MetricSpinner({
@@ -129,6 +162,13 @@ define([
maxValue: 55.88,
minValue: 0
});
+ this.spnLeft.on('change', _.bind(function (field, newValue, oldValue) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
this.spinners.push(this.spnLeft);
this.spnRight = new Common.UI.MetricSpinner({
@@ -140,10 +180,102 @@ define([
maxValue: 55.88,
minValue: 0
});
+ this.spnRight.on('change', _.bind(function (field, newValue, oldValue) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
this.spinners.push(this.spnRight);
- var $window = this.getChild();
- $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+ this.spnGutter = new Common.UI.MetricSpinner({
+ el: $('#page-margins-spin-gutter'),
+ step: .1,
+ width: 86,
+ defaultUnit : "cm",
+ value: '1 cm',
+ maxValue: 55.88,
+ minValue: 0
+ });
+ this.spnGutter.on('change', _.bind(function (field, newValue, oldValue) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_Gutter(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
+ this.spinners.push(this.spnGutter);
+
+ this.cmbGutterPosition = new Common.UI.ComboBox({
+ el : $('#page-margins-spin-gutter-position'),
+ menuStyle : 'min-width: 86px;',
+ style : 'width: 86px;',
+ editable : false,
+ cls : 'input-group-nr',
+ data : [
+ { value: 0, displayValue: this.textLeft },
+ { value: 1, displayValue: this.textTop }
+ ]
+ });
+ this.cmbGutterPosition.on('selected', _.bind(function (combo, record) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_GutterAtTop(record.value);
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
+
+ this.cmbOrientation = new Common.UI.ComboBox({
+ el : $('#page-margins-cmb-orientation'),
+ menuStyle : 'min-width: 180px;',
+ style : 'width: 180px;',
+ editable : false,
+ cls : 'input-group-nr',
+ data : [
+ { value: 0, displayValue: this.textPortrait },
+ { value: 1, displayValue: this.textLandscape }
+ ]
+ });
+ this.cmbOrientation.on('selected', _.bind(function (combo, record) {
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_Orientation(record.value);
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
+
+ this.cmbMultiplePages = new Common.UI.ComboBox({
+ el : $('#page-margins-cmb-multiple-pages'),
+ menuStyle : 'min-width: 180px;',
+ style : 'width: 180px;',
+ editable : false,
+ cls : 'input-group-nr',
+ data : [
+ { value: 0, displayValue: this.textNormal },
+ { value: 1, displayValue: this.textMirrorMargins }
+ ]
+ });
+ this.cmbMultiplePages.on('selected', _.bind(function(combo, record) {
+ if (record.value === 0) {
+ this.window.find('#margin-left-label').html(this.textLeft);
+ this.window.find('#margin-right-label').html(this.textRight);
+ this.cmbGutterPosition.setDisabled(false);
+ } else {
+ this.window.find('#margin-left-label').html(this.textInside);
+ this.window.find('#margin-right-label').html(this.textOutside);
+ this.cmbGutterPosition.setValue(0);
+ this.cmbGutterPosition.setDisabled(true);
+ }
+ if (this.api) {
+ this.properties = (this.properties) ? this.properties : new Asc.CDocumentSectionProps();
+ this.properties.put_MirrorMargins(record.value);
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
+ }, this));
+
+ this.window = this.getChild();
+ this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.updateMetricUnit();
},
@@ -181,6 +313,7 @@ define([
setSettings: function (props) {
if (props) {
+ this.properties = props;
this.maxMarginsH = Common.Utils.Metric.fnRecalcFromMM(props.get_H() - 2.6);
this.maxMarginsW = Common.Utils.Metric.fnRecalcFromMM(props.get_W() - 12.7);
this.spnTop.setMaxValue(this.maxMarginsH);
@@ -192,6 +325,23 @@ define([
this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_BottomMargin()), true);
this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin()), true);
this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_RightMargin()), true);
+ this.cmbOrientation.setValue(props.get_Orientation());
+
+ this.spnGutter.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_Gutter()), true);
+ this.cmbGutterPosition.setValue(props.get_GutterAtTop() ? 1 : 0);
+ var mirrorMargins = props.get_MirrorMargins();
+ this.cmbMultiplePages.setValue(mirrorMargins ? 1 : 0);
+
+ if (mirrorMargins) {
+ this.window.find('#margin-left-label').html(this.textInside);
+ this.window.find('#margin-right-label').html(this.textOutside);
+ this.cmbGutterPosition.setValue(0);
+ }
+ this.cmbGutterPosition.setDisabled(mirrorMargins);
+
+ if (this.api) {
+ //this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
+ }
}
},
@@ -201,6 +351,10 @@ define([
props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue()));
props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue()));
props.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(this.spnRight.getNumberValue()));
+ props.put_Orientation(this.cmbOrientation.getValue());
+ props.put_Gutter(Common.Utils.Metric.fnRecalcToMM(this.spnGutter.getNumberValue()));
+ props.put_GutterAtTop(this.cmbGutterPosition.getValue() ? true : false);
+ props.put_MirrorMargins(this.cmbMultiplePages.getValue() ? true : false);
return props;
},
@@ -221,6 +375,17 @@ define([
textRight: 'Right',
notcriticalErrorTitle: 'Warning',
txtMarginsW: 'Left and right margins are too high for a given page wight',
- txtMarginsH: 'Top and bottom margins are too high for a given page height'
+ txtMarginsH: 'Top and bottom margins are too high for a given page height',
+ textMultiplePages: 'Multiple pages',
+ textGutter: 'Gutter',
+ textGutterPosition: 'Gutter position',
+ textOrientation: 'Orientation',
+ textPreview: 'Preview',
+ textPortrait: 'Portrait',
+ textLandscape: 'Landscape',
+ textMirrorMargins: 'Mirror margins',
+ textNormal: 'Normal',
+ textInside: 'Inside',
+ textOutside: 'Outside'
}, DE.Views.PageMarginsDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
index bfc4f6191..dca3e6e7d 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -124,9 +124,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}
this._arrTabAlign = [
- { value: 1, displayValue: this.textTabLeft },
- { value: 3, displayValue: this.textTabCenter },
- { value: 2, displayValue: this.textTabRight }
+ { value: Asc.c_oAscTabType.Left, displayValue: this.textTabLeft },
+ { value: Asc.c_oAscTabType.Center, displayValue: this.textTabCenter },
+ { value: Asc.c_oAscTabType.Right, displayValue: this.textTabRight }
];
this._arrKeyTabAlign = [];
this._arrTabAlign.forEach(function(item) {
@@ -577,7 +577,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
cls : 'input-group-nr',
data : this._arrTabAlign
});
- this.cmbAlign.setValue(1);
+ this.cmbAlign.setValue(Asc.c_oAscTabType.Left);
this.cmbLeader = new Common.UI.ComboBox({
el : $('#paraadv-cmb-leader'),
diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js
index f1b95cc70..69a451c3a 100644
--- a/apps/documenteditor/main/app/view/RightMenu.js
+++ b/apps/documenteditor/main/app/view/RightMenu.js
@@ -190,8 +190,7 @@ define([
allowMouseEventsOnDisabled: true
});
this._settings[Common.Utils.documentSettingsType.MailMerge] = {panel: "id-mail-merge-settings", btn: this.btnMailMerge};
-
- this.btnMailMerge.el = $markup.findById('#id-right-menu-mail-merge'); this.btnMailMerge.render().setVisible(true);
+ this.btnMailMerge.setElement($markup.findById('#id-right-menu-mail-merge'), false); this.btnMailMerge.render().setVisible(true);
this.btnMailMerge.on('click', this.onBtnMenuClick.bind(this));
this.mergeSettings = new DE.Views.MailMergeSettings();
}
@@ -206,8 +205,7 @@ define([
allowMouseEventsOnDisabled: true
});
this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature};
-
- this.btnSignature.el = $markup.findById('#id-right-menu-signature'); this.btnSignature.render().setVisible(true);
+ this.btnSignature.setElement($markup.findById('#id-right-menu-signature'), false); this.btnSignature.render().setVisible(true);
this.btnSignature.on('click', this.onBtnMenuClick.bind(this));
this.signatureSettings = new DE.Views.SignatureSettings();
}
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index b74f8d7b3..51d9fdb10 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -550,17 +550,16 @@ define([
});
fill.get_fill().put_positions(arr);
- if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) {
- if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
- fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
- fill.get_fill().put_linear_scale(true);
- }
- arr = [];
- this.GradColor.colors.forEach(function(item){
- arr.push(Common.Utils.ThemeColor.getRgbColor(item));
- });
- fill.get_fill().put_colors(arr);
+ if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
+ fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
+ fill.get_fill().put_linear_scale(true);
}
+ arr = [];
+ this.GradColor.colors.forEach(function(item){
+ arr.push(Common.Utils.ThemeColor.getRgbColor(item));
+ });
+ fill.get_fill().put_colors(arr);
+
props.put_fill(fill);
this.imgprops.put_ShapeProperties(props);
this.api.ImgApply(this.imgprops);
@@ -958,6 +957,10 @@ define([
me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
me.sldrGradient.setValue(index, me.GradColor.values[index]);
}
+ if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) {
+ me.GradColor.currentIdx = 0;
+ }
+ me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.FGColor = {Value: 1, Color: this.GradColor.colors[0]};
this.BGColor = {Value: 1, Color: 'ffffff'};
@@ -1357,6 +1360,16 @@ define([
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
+ this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
+ me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+ me.GradColor.currentIdx = index;
+ me.sldrGradient.addNewThumb(index, color);
+ });
+ this.sldrGradient.on('removethumb', function(cmp, index){
+ me.sldrGradient.removeThumb(index);
+ me.GradColor.values.splice(index, 1);
+ me.sldrGradient.changeGradientStyle();
+ });
this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index 5855d3237..bbda408ea 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -45,11 +45,9 @@ define([
DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({
options: {
width: 350,
- height: 200,
style: 'min-width: 230px;',
cls: 'modal-dlg',
- buttons: ['ok', 'cancel'],
- footerCls: 'right'
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
diff --git a/apps/documenteditor/main/app/view/TableFormulaDialog.js b/apps/documenteditor/main/app/view/TableFormulaDialog.js
index ec6900ab3..d3410012e 100644
--- a/apps/documenteditor/main/app/view/TableFormulaDialog.js
+++ b/apps/documenteditor/main/app/view/TableFormulaDialog.js
@@ -48,8 +48,7 @@ define([
width: 300,
style: 'min-width: 230px;',
cls: 'modal-dlg',
- buttons: ['ok', 'cancel'],
- footerCls: 'right'
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js
index 4613bf022..89600a6df 100644
--- a/apps/documenteditor/main/app/view/TextArtSettings.js
+++ b/apps/documenteditor/main/app/view/TextArtSettings.js
@@ -650,6 +650,10 @@ define([
me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
me.sldrGradient.setValue(index, me.GradColor.values[index]);
}
+ if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) {
+ me.GradColor.currentIdx = 0;
+ }
+ me.sldrGradient.setActiveThumb(me.GradColor.currentIdx);
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD;
this.ShapeColor = {Value: 1, Color: this.GradColor.colors[0]};
}
@@ -944,6 +948,16 @@ define([
me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx;
});
+ this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
+ me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
+ me.GradColor.currentIdx = index;
+ me.sldrGradient.addNewThumb(index, color);
+ });
+ this.sldrGradient.on('removethumb', function(cmp, index){
+ me.sldrGradient.removeThumb(index);
+ me.GradColor.values.splice(index, 1);
+ me.sldrGradient.changeGradientStyle();
+ });
this.lockedControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 96d51ac0b..dee852233 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -435,7 +435,9 @@ define([
menu: new Common.UI.Menu({
items: [
{template: _.template('')},
- {caption: this.mniCustomTable, value: 'custom'}
+ {caption: this.mniCustomTable, value: 'custom'},
+ {caption: this.mniDrawTable, value: 'draw', checkable: true},
+ {caption: this.mniEraseTable, value: 'erase', checkable: true}
]
})
});
@@ -538,6 +540,14 @@ define([
});
this.paragraphControls.push(this.btnInsertEquation);
+ this.btnInsertSymbol = new Common.UI.Button({
+ id: 'tlbtn-insertsymbol',
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-symbol',
+ caption: me.capBtnInsSymbol
+ });
+ this.paragraphControls.push(this.btnInsertSymbol);
+
this.btnDropCap = new Common.UI.Button({
id: 'tlbtn-dropcap',
cls: 'btn-toolbar x-huge icon-top',
@@ -588,18 +598,43 @@ define([
items: [
{
caption: this.textPlainControl,
- iconCls: 'menu__icon cc-plaintext',
- value: Asc.c_oAscSdtLevelType.Inline
+ // iconCls: 'menu__icon cc-plaintext',
+ value: 'plain'
},
{
caption: this.textRichControl,
- iconCls: 'menu__icon cc-richtext',
- value: Asc.c_oAscSdtLevelType.Block
+ // iconCls: 'menu__icon cc-richtext',
+ value: 'rich'
+ },
+ {
+ caption: this.textPictureControl,
+ // iconCls: 'mnu-control-rich',
+ value: 'picture'
+ },
+ {
+ caption: this.textComboboxControl,
+ // iconCls: 'mnu-control-rich',
+ value: 'combobox'
+ },
+ {
+ caption: this.textDropdownControl,
+ // iconCls: 'mnu-control-rich',
+ value: 'dropdown'
+ },
+ {
+ caption: this.textDateControl,
+ // iconCls: 'mnu-control-rich',
+ value: 'date'
+ },
+ {
+ caption: this.textCheckboxControl,
+ // iconCls: 'mnu-control-rich',
+ value: 'checkbox'
},
{caption: '--'},
{
caption: this.textRemoveControl,
- iconCls: 'menu__icon cc-remove',
+ // iconCls: 'menu__icon cc-remove',
value: 'remove'
},
{caption: '--'},
@@ -627,7 +662,7 @@ define([
]
})
});
- this.paragraphControls.push(this.btnContentControls);
+ // this.paragraphControls.push(this.btnContentControls);
this.btnColumns = new Common.UI.Button({
id: 'tlbtn-columns',
@@ -1274,6 +1309,7 @@ define([
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
+ _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
_injectComponent('#slot-btn-pageorient', this.btnPageOrient);
_injectComponent('#slot-btn-pagemargins', this.btnPageMargins);
_injectComponent('#slot-btn-pagesize', this.btnPageSize);
@@ -1549,6 +1585,7 @@ define([
this.btnBlankPage.updateHint(this.tipBlankPage);
this.btnInsertShape.updateHint(this.tipInsertShape);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
+ this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
this.btnDropCap.updateHint(this.tipDropCap);
this.btnContentControls.updateHint(this.tipControls);
this.btnColumns.updateHint(this.tipColumns);
@@ -1634,48 +1671,8 @@ define([
parentMenu: menu,
showLast: false,
restoreHeight: 421,
- groups: new Common.UI.DataViewGroupStore([
- {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
- {id: 'menu-chart-group-line', caption: me.textLine},
- {id: 'menu-chart-group-pie', caption: me.textPie},
- {id: 'menu-chart-group-hbar', caption: me.textBar},
- {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
- {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
- {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
- // {id: 'menu-chart-group-surface', caption: me.textSurface}
- ]),
- store: new Common.UI.DataViewStore([
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
- { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
- { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
- { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
- { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
- { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
- { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
- { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
- { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
- { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
- { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
- { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
- { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
- { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
- { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
-
- ]),
+ groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)),
+ store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
itemTemplate: _.template('')
});
picker.on('item:click', function (picker, item, record, e) {
@@ -1928,8 +1925,7 @@ define([
this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge);
this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
- this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl);
- this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl);
+ this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl);
this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
},
@@ -2145,8 +2141,8 @@ define([
tipBack: 'Back',
tipInsertShape: 'Insert Autoshape',
tipInsertEquation: 'Insert Equation',
- mniImageFromFile: 'Image from file',
- mniImageFromUrl: 'Image from url',
+ mniImageFromFile: 'Image from File',
+ mniImageFromUrl: 'Image from URL',
mniCustomTable: 'Insert Custom Table',
textTitleError: 'Error',
textInsertPageNumber: 'Insert page number',
@@ -2160,13 +2156,6 @@ define([
textNewColor: 'Add New Custom Color',
textAutoColor: 'Automatic',
tipInsertChart: 'Insert Chart',
- textLine: 'Line',
- textColumn: 'Column',
- textBar: 'Bar',
- textArea: 'Area',
- textPie: 'Pie',
- textPoint: 'XY (Scatter)',
- textStock: 'Stock',
tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text',
tipInsertTextArt: 'Insert Text Art',
@@ -2233,7 +2222,6 @@ define([
textPortrait: 'Portrait',
textLandscape: 'Landscape',
textInsertPageCount: 'Insert number of pages',
- textCharts: 'Charts',
tipChangeChart: 'Change Chart Type',
capBtnInsPagebreak: 'Page Break',
capBtnInsImage: 'Image',
@@ -2266,7 +2254,6 @@ define([
capImgWrapping: 'Wrapping',
capBtnComment: 'Comment',
textColumnsCustom: 'Custom Columns',
- textSurface: 'Surface',
textTabCollaboration: 'Collaboration',
textTabProtect: 'Protection',
textTabLinks: 'References',
@@ -2289,7 +2276,17 @@ define([
capBtnWatermark: 'Watermark',
textEditWatermark: 'Custom Watermark',
textRemWatermark: 'Remove Watermark',
- tipWatermark: 'Edit watermark'
+ tipWatermark: 'Edit watermark',
+ textPictureControl: 'Picture',
+ textComboboxControl: 'Combo box',
+ textCheckboxControl: 'Check box',
+ textDropdownControl: 'Drop-down list',
+ textDateControl: 'Date',
+ capBtnAddComment: 'Add Comment',
+ capBtnInsSymbol: 'Symbol',
+ tipInsertSymbol: 'Insert symbol',
+ mniDrawTable: 'Draw table',
+ mniEraseTable: 'Erase table'
}
})(), DE.Views.Toolbar || {}));
});
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 900fa3b6c..e30257d83 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -18,19 +18,20 @@
width: 100%;
overflow: hidden;
border: none;
- background-color: #f4f4f4;
+ background: #e2e2e2;
z-index: 1001;
}
.loadmask > .brendpanel {
width: 100%;
- height: 56px;
+ min-height: 32px;
background: #446995;
}
.loadmask > .brendpanel > div {
display: flex;
align-items: center;
+ height: 28px;
}
.loadmask > .brendpanel .spacer {
@@ -50,15 +51,6 @@
opacity: 0;
}
- .loadmask > .brendpanel .circle {
- vertical-align: middle;
- width: 20px;
- height: 20px;
- border-radius: 12px;
- margin: 4px 10px;
- background: rgba(255, 255, 255, 0.2);
- }
-
.loadmask > .brendpanel .rect {
vertical-align: middle;
width: 50px;
@@ -69,8 +61,8 @@
}
.loadmask > .sktoolbar {
- background: #fafafa;
- border-bottom: 1px solid #e2e2e2;
+ background: #f1f1f1;
+ border-bottom: 1px solid #cfcfcf;
height: 46px;
padding: 10px 12px;
box-sizing: content-box;
@@ -81,11 +73,6 @@
padding: 0;
white-space: nowrap;
position: relative;
-
- -webkit-animation: flickerAnimation 2s infinite ease-in-out;
- -moz-animation: flickerAnimation 2s infinite ease-in-out;
- -o-animation: flickerAnimation 2s infinite ease-in-out;
- animation: flickerAnimation 2s infinite ease-in-out;
}
.loadmask > .sktoolbar li {
@@ -114,10 +101,10 @@
.loadmask > .placeholder {
background: #fbfbfb;
- width: 796px;
+ width: 794px;
margin: 46px auto;
height: 100%;
- border: 1px solid #dfdfdf;
+ border: 1px solid #bebebe;
padding-top: 50px;
}
@@ -135,24 +122,24 @@
}
@keyframes flickerAnimation {
- 0% { opacity:0.1; }
+ 0% { opacity:0.5; }
50% { opacity:1; }
- 100% { opacity:0.1; }
+ 100% { opacity:0.5; }
}
@-o-keyframes flickerAnimation{
- 0% { opacity:0.1; }
+ 0% { opacity:0.5; }
50% { opacity:1; }
- 100% { opacity:0.1; }
+ 100% { opacity:0.5; }
}
@-moz-keyframes flickerAnimation{
- 0% { opacity:0.1; }
+ 0% { opacity:0.5; }
50% { opacity:1; }
- 100% { opacity:0.1; }
+ 100% { opacity:0.5; }
}
@-webkit-keyframes flickerAnimation{
- 0% { opacity:0.1; }
+ 0% { opacity:0.5; }
50% { opacity:1; }
- 100% { opacity:0.1; }
+ 100% { opacity:0.5; }
}
@@ -222,7 +209,7 @@
- 
+ 