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

Merge branch 'feature/new-toolbar'

Browse source
This commit is contained in:
Maxim Kadushkin 2017-07-18 16:33:24 +03:00
parent 99db65332a bedfa57dcf
commit 0a38441e06
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -482,8 +482,6 @@ define([
me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode
Common.localStorage.setItem("de-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me)); me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me));
me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me)); me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me));

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -333,7 +333,7 @@ define([
}, },
onContextMenu: function() { onContextMenu: function() {
this.toolbar.collapseToolbar(); this.toolbar.collapse();
}, },
onApiFontSize: function(size) { onApiFontSize: function(size) {

4
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -456,8 +456,6 @@ define([
var zf = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.zoom ? parseInt(me.appOptions.customization.zoom) : -1); var zf = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.zoom ? parseInt(me.appOptions.customization.zoom) : -1);
(zf == -1) ? me.api.zoomFitToPage() : ((zf == -2) ? me.api.zoomFitToWidth() : me.api.zoom(zf>0 ? zf : 100)); (zf == -1) ? me.api.zoomFitToPage() : ((zf == -2) ? me.api.zoomFitToWidth() : me.api.zoom(zf>0 ? zf : 100));
Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
@ -479,8 +477,6 @@ define([
me.api.asc_SetFastCollaborative(me._state.fastCoauth); me.api.asc_SetFastCollaborative(me._state.fastCoauth);
/** coauthoring end **/ /** coauthoring end **/
Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0);
if (me.appOptions.isEdit) { if (me.appOptions.isEdit) {
value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave"); value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave");
value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0); value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0);

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -326,7 +326,7 @@ define([
// }, // },
onContextMenu: function() { onContextMenu: function() {
this.toolbar.collapseToolbar(); this.toolbar.collapse();
}, },
onPrint: function(e) { onPrint: function(e) {

2
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file

@ -100,7 +100,7 @@ define([
'<tr>', '<tr>',
'<td class="padding-large" style="white-space: nowrap;">', '<td class="padding-large" style="white-space: nowrap;">',
'<label style="vertical-align: middle; margin-right: 4px;">' + me.txtSample + '</label>', '<label style="vertical-align: middle; margin-right: 4px;">' + me.txtSample + '</label>',
'<label id="format-settings-label-example" style="vertical-align: middle; max-width: 220px; overflow: hidden; text-overflow: ellipsis;>100</label>', '<label id="format-settings-label-example" style="vertical-align: middle; max-width: 220px; overflow: hidden; text-overflow: ellipsis;">100</label>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>', '<tr>',