diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 06cb76240..7e62d2676 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -49,23 +49,24 @@ Common.Utils = _.extend(new(function() { return (is && (m = regex.exec(userAgent))) ? parseFloat(m[1]) : 0; }, docMode = document.documentMode, + isEdge = check(/edge/), isOpera = check(/opera/), isOpera10_5 = isOpera && check(/version\/10\.5/), - isChrome = check(/\bchrome\b/), - isWebKit = check(/webkit/), - isSafari = !isChrome && check(/safari/), - isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2 - isSafari3 = isSafari && check(/version\/3/), - isSafari4 = isSafari && check(/version\/4/), - isSafari5_0 = isSafari && check(/version\/5\.0/), - isSafari5 = isSafari && check(/version\/5/), - isIE = !isOpera && (check(/msie/) || check(/trident/)), + isIE = !isOpera && (check(/msie/) || check(/trident/) || check(/edge/)), isIE7 = isIE && ((check(/msie 7/) && docMode != 8 && docMode != 9 && docMode != 10) || docMode == 7), isIE8 = isIE && ((check(/msie 8/) && docMode != 7 && docMode != 9 && docMode != 10) || docMode == 8), isIE9 = isIE && ((check(/msie 9/) && docMode != 7 && docMode != 8 && docMode != 10) || docMode == 9), isIE10 = isIE && ((check(/msie 10/) && docMode != 7 && docMode != 8 && docMode != 9) || docMode == 10), isIE11 = isIE && ((check(/trident\/7\.0/) && docMode != 7 && docMode != 8 && docMode != 9 && docMode != 10) || docMode == 11), isIE6 = isIE && check(/msie 6/), + isChrome = !isIE && check(/\bchrome\b/), + isWebKit = !isIE && check(/webkit/), + isSafari = !isIE && !isChrome && check(/safari/), + isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2 + isSafari3 = isSafari && check(/version\/3/), + isSafari4 = isSafari && check(/version\/4/), + isSafari5_0 = isSafari && check(/version\/5\.0/), + isSafari5 = isSafari && check(/version\/5/), isGecko = !isWebKit && !isIE && check(/gecko/), // IE11 adds "like gecko" into the user agent string isGecko3 = isGecko && check(/rv:1\.9/), isGecko4 = isGecko && check(/rv:2\.0/), diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 84e0a97ac..8b3c90e56 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -1063,6 +1063,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem }); if (rec) { rec.set('tabAlign', align); + this._tabListChanged = true; } else { rec = new Common.UI.DataViewModel(); rec.set({ diff --git a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index 8cba40421..02ead77f3 100644 --- a/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -342,9 +342,9 @@ Maintain the proportions of the selected object when resizing. - Movement by three-pixel increments + Movement by one-pixel increments Ctrl - Hold down the Ctrl key and use the keybord arrows to move the selected object by three pixels at a time. + Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time. diff --git a/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm b/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm index 7b18129ec..882c95cf4 100644 --- a/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm @@ -340,9 +340,9 @@ Сохранять пропорции выбранного объекта при изменении размера. - Перемещение с шагом в три пикселя + Перемещение с шагом в один пиксель Ctrl - Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на три пикселя за раз. + Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на один пиксель за раз. diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index afaaf6dc8..b849cc88d 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -507,6 +507,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced }); if (rec) { rec.set('tabAlign', align); + this._tabListChanged = true; } else { rec = new Common.UI.DataViewModel(); rec.set({ diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 7983b227c..40d221dde 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -496,9 +496,10 @@ define([ this._state.no_paragraph = true; var i = -1; while (++i < selectedObjects.length) { - if (selectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) { + var type = selectedObjects[i].get_ObjectType(); + if (type == Asc.c_oAscTypeSelectElement.Paragraph || type == Asc.c_oAscTypeSelectElement.Shape || type == Asc.c_oAscTypeSelectElement.Chart || type == Asc.c_oAscTypeSelectElement.Table) { this._state.no_paragraph = selectedObjects[i].get_ObjectValue().get_Locked(); - break; + if (this._state.no_paragraph) break; // break if one of the objects is locked } } this._state.no_paragraph = this._state.no_paragraph || this.langMenu.items.length<1; diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index 693beaab9..31d81f931 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -370,7 +370,7 @@ - +
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index a48aac993..dcf98fae2 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -888,7 +888,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' ]; this.cmbEmptyCells = new Common.UI.ComboBox({ el : $('#spark-dlg-combo-empty'), - menuStyle : 'min-width: 188px;', + menuStyle : 'min-width: 220px;', editable : false, cls : 'input-group-nr' }); @@ -1288,7 +1288,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' if (this._changedProps) { this._changedProps.asc_setType(rawData.type); } - this.chartSettings.asc_setType(rawData.type); this._state.SparkType = rawData.type; var changed = false, @@ -1305,7 +1304,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.cmbEmptyCells.setValue((rawData.type !== Asc.c_oAscSparklineType.Line && value==Asc.c_oAscEDispBlanksAs.Span) ? this.textEmptyLine : value); } - this.updateSparkStyles(this.chartSettings.asc_getStyles()); + this.updateSparkStyles(this.chartSettings.asc_getStyles(rawData.type)); }, diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js index c907ecda2..423adf91d 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -506,6 +506,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. }); if (rec) { rec.set('tabAlign', align); + this._tabListChanged = true; } else { rec = new Common.UI.DataViewModel(); rec.set({ diff --git a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm index 4662ab615..d25aa71ea 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm @@ -304,7 +304,14 @@ Alt+'=' Insert the SUM function into the selected cell. - + + Modifying Objects + + + Movement by one-pixel increments + Ctrl + Hold down the Ctrl key and use the keybord arrows to move the selected object by one pixel at a time. + diff --git a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm index b4aa0d820..3f5cf5171 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm @@ -305,6 +305,13 @@ Alt+'=' Вставить функцию SUM в выделенную ячейку. + Модификация объектов + + + Перемещение с шагом в один пиксель + Ctrl + Удерживайте клавишу Ctrl и используйте стрелки на клавиатуре, чтобы перемещать выбранный объект на один пиксель за раз. +