Skip to content

W
web-apps
Commit efa2784f authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Merge branch 'develop' into feature/new-mobile

parents 6e1e160d e82da5eb
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 44 deletions
apps/api/documents/api.js
View file @ efa2784f
......@@ -336,6 +336,8 @@
window.alert("The \"document.key\" parameter for the config object must be string. Please correct it.");
return false;
}
_config.document.token = _config.token;
}
return true;
......
apps/documenteditor/embed/js/ApplicationController.js
View file @ efa2784f
......@@ -96,6 +96,7 @@ var ApplicationController = new(function(){
docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token);
if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
......
apps/documenteditor/main/app/controller/Main.js
View file @ efa2784f
......@@ -286,6 +286,7 @@ define([
docInfo.put_Options(data.doc.options);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token);
// docInfo.put_Review(this.permissions.review);
// docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); // used in sdk for testing
}
......
apps/presentationeditor/embed/js/ApplicationController.js
View file @ efa2784f
......@@ -97,6 +97,7 @@ var ApplicationController = new(function(){
docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token);
if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
......
apps/presentationeditor/main/app/controller/Main.js
View file @ efa2784f
......@@ -273,6 +273,7 @@ define([
docInfo.put_Options(data.doc.options);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token);
//docInfo.put_OfflineApp(this.editorConfig.nativeApp === true);
}
......
apps/presentationeditor/main/app/controller/Statusbar.js
View file @ efa2784f
......@@ -122,10 +122,13 @@ define([
onPreview: function(btn, e) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview'),
me = this;
me = this,
isResized = false;
if (previewPanel && me.api) {
previewPanel.show();
var onWindowResize = function() {
if (isResized) return;
isResized = true;
Common.NotificationCenter.off('window:resize', onWindowResize);
var current = me.api.getCurrentPage();
......@@ -136,6 +139,9 @@ define([
if (!me.statusbar.mode.isDesktopApp && !Common.Utils.isIE11) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
setTimeout(function(){
onWindowResize();
}, 100);
} else
onWindowResize();
}
......
apps/presentationeditor/main/app/controller/Toolbar.js
View file @ efa2784f
......@@ -763,10 +763,13 @@ define([
onPreview: function(slidenum) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview'),
me = this;
me = this,
isResized = false;
if (previewPanel && me.api) {
previewPanel.show();
var onWindowResize = function() {
if (isResized) return;
isResized = true;
Common.NotificationCenter.off('window:resize', onWindowResize);
me.api.StartDemonstration('presentation-preview', _.isNumber(slidenum) ? slidenum : 0);
Common.component.Analytics.trackEvent('ToolBar', 'Preview');
......@@ -774,6 +777,9 @@ define([
if (!me.toolbar.mode.isDesktopApp && !Common.Utils.isIE11) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
setTimeout(function(){
onWindowResize();
}, 100);
} else
onWindowResize();
}
......
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @ efa2784f
......@@ -1291,6 +1291,7 @@ define([
var hkPreview = 'command+f5,ctrl+f5';
keymap[hkPreview] = function(e) {
var isResized = false;
e.preventDefault();
e.stopPropagation();
if (me.slidesCount>0) {
......@@ -1298,12 +1299,17 @@ define([
if (previewPanel && !previewPanel.isVisible() && me.api) {
previewPanel.show();
var onWindowResize = function() {
if (isResized) return;
isResized = true;
Common.NotificationCenter.off('window:resize', onWindowResize);
me.api.StartDemonstration('presentation-preview', 0);
};
if (!me.mode.isDesktopApp && !Common.Utils.isIE11) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
setTimeout(function(){
onWindowResize();
}, 100);
} else
onWindowResize();
}
......@@ -1558,10 +1564,13 @@ define([
var mnuPreview = new Common.UI.MenuItem({
caption : me.txtPreview
}).on('click', function(item) {
var previewPanel = PE.getController('Viewport').getView('DocumentPreview');
var previewPanel = PE.getController('Viewport').getView('DocumentPreview'),
isResized = false;
if (previewPanel && me.api) {
previewPanel.show();
var onWindowResize = function() {
if (isResized) return;
isResized = true;
Common.NotificationCenter.off('window:resize', onWindowResize);
var current = me.api.getCurrentPage();
......@@ -1572,6 +1581,9 @@ define([
if (!me.mode.isDesktopApp && !Common.Utils.isIE11) {
Common.NotificationCenter.on('window:resize', onWindowResize);
me.fullScreen(document.documentElement);
setTimeout(function(){
onWindowResize();
}, 100);
} else
onWindowResize();
}
......
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file @ efa2784f
......@@ -95,6 +95,7 @@ var ApplicationController = new(function(){
docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token);
if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);
......
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @ efa2784f
......@@ -936,12 +936,10 @@ define([
$(document.body).append(src);
showPoint = [
coAuthTip.x_point + coAuthTip.XY[0],
(is_sheet_lock) ? (coAuthTip.x_point + coAuthTip.rightMenuWidth) : (coAuthTip.bodyWidth - (coAuthTip.x_point + coAuthTip.XY[0])),
coAuthTip.y_point + coAuthTip.XY[1]
];
!is_sheet_lock && (showPoint[0] = coAuthTip.bodyWidth - showPoint[0]);
if (showPoint[1] > coAuthTip.XY[1] &&
showPoint[1] + coAuthTip.ttHeight < coAuthTip.XY[1] + coAuthTip.apiHeight) {
src.text(getUserName(data.asc_getUserId()));
......@@ -1042,6 +1040,7 @@ define([
me.documentHolder.cmpEl.offset().top - $(window).scrollTop()
];
me.tooltips.coauth.apiHeight = me.documentHolder.cmpEl.height();
me.tooltips.coauth.rightMenuWidth = $('#right-menu').width();
me.tooltips.coauth.bodyWidth = $(window).width();
}
},
......@@ -1141,6 +1140,7 @@ define([
documentHolder = this.documentHolder,
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
isCellLocked = cellinfo.asc_getLocked(),
isTableLocked = cellinfo.asc_getLockedTable()===true,
isObjLocked = false,
commentsController = this.getApplication().getController('Common.Controllers.Comments'),
insfunc = false,
......@@ -1341,9 +1341,15 @@ define([
item.setDisabled(isCellLocked);
});
documentHolder.pmiCopy.setDisabled(false);
documentHolder.pmiFilterCells.setDisabled(isCellLocked || (filterInfo==null));
documentHolder.pmiSortCells.setDisabled(isCellLocked || (filterInfo==null));
documentHolder.pmiReapply.setDisabled(isCellLocked || (isApplyAutoFilter!==true));
documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteCells.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiDeleteTable.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiFilterCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null));
documentHolder.pmiSortCells.setDisabled(isCellLocked || isTableLocked|| (filterInfo==null));
documentHolder.pmiReapply.setDisabled(isCellLocked || isTableLocked|| (isApplyAutoFilter!==true));
if (showMenu) this.showPopupMenu(documentHolder.ssMenu, {}, event);
} else if (this.permissions.isEditDiagram && seltype == Asc.c_oAscSelectionType.RangeChartText) {
if (!showMenu && !documentHolder.textInShapeMenu.isVisible()) return;
......
apps/spreadsheeteditor/main/app/controller/Main.js
View file @ efa2784f
......@@ -307,6 +307,7 @@ define([
docInfo.put_Options(data.doc.options);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token);
this.headerView.setDocumentCaption(data.doc.title);
}
......
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @ efa2784f
......@@ -121,19 +121,14 @@ define([
this._openRightMenu = true;
}
var need_disable = info.asc_getLocked();
var need_disable = info.asc_getLocked(),
need_disable_table = (info.asc_getLockedTable()===true),
need_disable_spark = (info.asc_getLockedSparkline()===true);
this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable);
if (this._state.prevDisabled != need_disable) {
this._state.prevDisabled = need_disable;
this._settings.forEach(function(item){
item.panel.setLocked(need_disable);
});
}
this.onFocusObject(SelectedObjects, formatTableInfo, sparkLineInfo, need_disable, need_disable_table, need_disable_spark);
},
onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked) {
onFocusObject: function(SelectedObjects, formatTableInfo, sparkLineInfo, isCellLocked, isTableLocked, isSparkLocked) {
if (!this.editMode)
return;
......@@ -146,7 +141,6 @@ define([
for (i=0; i<SelectedObjects.length; ++i)
{
var type = SelectedObjects[i].asc_getObjectType();
var eltype = SelectedObjects[i].asc_getObjectType(),
settingsType = this.getDocumentSettingsType(eltype);
if (settingsType===undefined || settingsType>=this._settings.length || this._settings[settingsType]===undefined)
......@@ -174,14 +168,14 @@ define([
if (formatTableInfo) {
settingsType = Common.Utils.documentSettingsType.Table;
this._settings[settingsType].props = formatTableInfo;
this._settings[settingsType].locked = isCellLocked;
this._settings[settingsType].locked = isTableLocked;
this._settings[settingsType].hidden = 0;
}
if (sparkLineInfo) {
settingsType = Common.Utils.documentSettingsType.Chart;
this._settings[settingsType].props = sparkLineInfo;
this._settings[settingsType].locked = isCellLocked;
this._settings[settingsType].locked = isSparkLocked;
this._settings[settingsType].hidden = 0;
}
......
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @ efa2784f
......@@ -1604,7 +1604,7 @@ define([
if (!this.editMode) return;
var selectionType = info.asc_getFlags().asc_getSelectionType(),
coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false,
coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true || info.asc_getLockedTable()===true) : false,
editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable),
me = this,
toolbar = this.toolbar,
......@@ -2345,7 +2345,6 @@ define([
_disableEditOptions: function(seltype, coauth_disable) {
if (this.api.isCellEdited) return true;
if (this.api.isRangeSelection) return true;
if (this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage);
var toolbar = this.toolbar,
is_chart_text = seltype == Asc.c_oAscSelectionType.RangeChartText,
......@@ -2353,7 +2352,19 @@ define([
is_shape_text = seltype == Asc.c_oAscSelectionType.RangeShapeText,
is_shape = seltype == Asc.c_oAscSelectionType.RangeShape,
is_image = seltype == Asc.c_oAscSelectionType.RangeImage,
is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart;
is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart,
is_objLocked = false;
if (!(is_mode_2 || is_image) && this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage);
if (is_mode_2) {
var SelectedObjects = this.api.asc_getGraphicObjectProps();
for (var i=0; i<SelectedObjects.length; ++i)
{
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
is_objLocked = is_objLocked || SelectedObjects[i].asc_getObjectValue().asc_getLocked();
}
}
if ( coauth_disable ) {
toolbar.lockToolbar(SSE.enumLock.coAuth, coauth_disable);
......@@ -2382,6 +2393,7 @@ define([
merge: true,
clear: [_set.selImage, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.coAuth]
});
toolbar.lockToolbar(SSE.enumLock.coAuthText, is_objLocked);
}
$('#ce-func-label').toggleClass('disabled', is_image || is_mode_2 || coauth_disable);
......
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @ efa2784f
......@@ -71,6 +71,7 @@ define([
selRange: 'sel-range',
lostConnect: 'disconnect',
coAuth: 'co-auth',
coAuthText: 'co-auth-text',
ruleMerge: 'rule-btn-merge',
ruleFilter: 'rule-filter',
ruleDelFilter: 'rule-clear-filter',
......@@ -149,7 +150,7 @@ define([
cls : 'input-group-nr',
menuStyle : 'min-width: 55px;',
hint : me.tipFontSize,
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
data : [
{ value: 8, displayValue: "8" },
{ value: 9, displayValue: "9" },
......@@ -189,7 +190,7 @@ define([
menuCls : 'scrollable-menu',
menuStyle : 'min-width: 325px;',
hint : me.tipFontName,
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
store : new Common.Collections.Fonts()
});
......@@ -239,21 +240,21 @@ define([
id : 'id-toolbar-btn-incfont',
cls : 'btn-toolbar',
iconCls : 'btn-incfont',
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect]
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect]
});
me.btnDecFontSize = new Common.UI.Button({
id : 'id-toolbar-btn-decfont',
cls : 'btn-toolbar',
iconCls : 'btn-decfont',
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect]
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect]
});
me.btnBold = new Common.UI.Button({
id : 'id-toolbar-btn-bold',
cls : 'btn-toolbar',
iconCls : 'btn-bold',
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
......@@ -261,7 +262,7 @@ define([
id : 'id-toolbar-btn-italic',
cls : 'btn-toolbar',
iconCls : 'btn-italic',
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
......@@ -269,7 +270,7 @@ define([
id : 'id-toolbar-btn-underline',
cls : 'btn-toolbar',
iconCls : 'btn-underline',
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
......@@ -279,7 +280,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-fontcolor',
split : true,
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect],
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 165px; height: 220px; margin: 10px;"></div>') },
......@@ -302,7 +303,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-fillparag',
split : true,
lock : [_set.selImage, _set.editCell, _set.coAuth, _set.lostConnect],
lock : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect],
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 165px; height: 220px; margin: 10px;"></div>') },
......@@ -337,7 +338,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-align-left',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
});
......@@ -346,7 +347,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-align-center',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
});
......@@ -355,7 +356,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-align-right',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
});
......@@ -364,7 +365,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-align-just',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup: 'alignGroup'
});
......@@ -402,7 +403,7 @@ define([
id : 'id-toolbar-rtn-valign-top',
cls : 'btn-toolbar',
iconCls : 'btn-valign-top',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
enableToggle: true,
toggleGroup : 'vAlignGroup'
});
......@@ -412,7 +413,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-valign-middle',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'vAlignGroup'
});
......@@ -420,7 +421,7 @@ define([
id : 'id-toolbar-rtn-valign-bottom',
cls : 'btn-toolbar',
iconCls : 'btn-valign-bottom',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
enableToggle: true,
toggleGroup : 'vAlignGroup'
});
......@@ -438,7 +439,7 @@ define([
id : 'id-toolbar-rtn-textorient',
cls : 'btn-toolbar',
iconCls : 'btn-text-orient',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
......@@ -961,7 +962,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-align-left',
icls : 'btn-align-left',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
......@@ -1010,7 +1011,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-valign-bottom',
icls : 'btn-valign-bottom',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth],
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7