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

Merge branch 'release/v7.1.0' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2022-04-05 14:07:41 +03:00
parent 1acbb35cb0 087d04aae3
commit ba66b2522f
16 changed files with 89 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -457,6 +457,7 @@ define([
this.trigger('show:after', this, e); this.trigger('show:after', this, e);
this.flushVisibleFontsTiles(); this.flushVisibleFontsTiles();
this.updateVisibleFontsTiles(null, 0); this.updateVisibleFontsTiles(null, 0);
Common.Utils.isGecko && this.scroller && this.scroller.update();
} else { } else {
Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments); Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments);
} }

8
apps/common/main/resources/less/synchronize-tip.less
View file

@ -195,7 +195,6 @@
top: 0; top: 0;
left: 8px; left: 8px;
width: 16px; width: 16px;
.box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
} }
} }
} }
@ -212,7 +211,6 @@
top: 0; top: 0;
left: -8px; left: -8px;
width: 16px; width: 16px;
.box-shadow(0 4px 8px -1px rgba(0, 0, 0, 0.2));
} }
} }
} }
@ -324,7 +322,6 @@
&:before { &:before {
top: -8px; top: -8px;
left: -8px; left: -8px;
.box-shadow(2px 2px 8px -1px rgba(0, 0, 0, 0.2));
} }
&:after { &:after {
top: -6px; top: -6px;
@ -346,7 +343,6 @@
&:before { &:before {
top: 8px; top: 8px;
left: 8px; left: 8px;
.box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
} }
&:after { &:after {
top: 6px; top: 6px;
@ -368,7 +364,6 @@
&:before { &:before {
top: 8px; top: 8px;
left: -8px; left: -8px;
.box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
} }
&:after { &:after {
top: 6px; top: 6px;
@ -412,8 +407,6 @@
&:before { &:before {
bottom: -7px; bottom: -7px;
left: -7px; left: -7px;
//width: 15px;
.box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
} }
&:after { &:after {
top: -2px; top: -2px;
@ -475,7 +468,6 @@
-o-transform: rotate(45deg); -o-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
.box-shadow(0 4px 8px -1px rgba(0, 0, 0, 0.2));
border: @scaled-one-px-value-ie solid @background-notification-popover-ie; border: @scaled-one-px-value-ie solid @background-notification-popover-ie;
border: @scaled-one-px-value solid @background-notification-popover; border: @scaled-one-px-value solid @background-notification-popover;
} }

7
apps/common/mobile/lib/controller/ContextMenu.jsx
View file

@ -105,6 +105,9 @@ class ContextMenuController extends Component {
onApiOpenContextMenu(x, y) { onApiOpenContextMenu(x, y) {
if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup, .actions-modal.modal-in').length < 1) { if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup, .actions-modal.modal-in').length < 1) {
const subNav = document.querySelector('.subnavbar');
const rect = subNav.getBoundingClientRect();
this.setState({ this.setState({
items: this.initMenuItems(), items: this.initMenuItems(),
extraItems: this.initExtraItems() extraItems: this.initExtraItems()
@ -112,8 +115,8 @@ class ContextMenuController extends Component {
if ( this.state.items.length > 0 ) { if ( this.state.items.length > 0 ) {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
this.$targetEl.css({left: `${x}px`, top: `${y}px`}); this.$targetEl.css({left: `${x}px`, top: y < rect.bottom ? `${rect.bottom}px` : `${y}px`});
const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement); const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement);
if (Device.android) if (Device.android)

6
apps/common/mobile/lib/view/About.jsx
View file

@ -58,7 +58,7 @@ const PageAbout = props => {
{mailCustomer && mailCustomer.length ? ( {mailCustomer && mailCustomer.length ? (
<p> <p>
<label>{_t.textEmail}:</label> <label>{_t.textEmail}:</label>
<Link id="settings-about-email" className="external" target="_blank" href={"mailto:"+mailCustomer}>{mailCustomer}</Link> <Link id="settings-about-email" external={true} href={"mailto:"+mailCustomer}>{mailCustomer}</Link>
</p> </p>
) : null} ) : null}
{urlCustomer && urlCustomer.length ? ( {urlCustomer && urlCustomer.length ? (
@ -103,11 +103,11 @@ const PageAbout = props => {
</p> </p>
<p> <p>
<label>{_t.textEmail}:</label> <label>{_t.textEmail}:</label>
<a id="settings-about-email" className="external" href={`mailto:${__SUPPORT_EMAIL__}`}>{__SUPPORT_EMAIL__}</a> <Link id="settings-about-email" external={true} href={`mailto:${__SUPPORT_EMAIL__}`}>{__SUPPORT_EMAIL__}</Link>
</p> </p>
<p> <p>
<label>{_t.textTel}:</label> <label>{_t.textTel}:</label>
<a id="settings-about-tel" className="external" href={`tel:${__PUBLISHER_PHONE__}`}>{__PUBLISHER_PHONE__}</a> <Link id="settings-about-tel" external={true} href={`tel:${__PUBLISHER_PHONE__}`}>{__PUBLISHER_PHONE__}</Link>
</p> </p>
<p> <p>
<a id="settings-about-url" className="external" target="_blank" href={publisherUrl}>{publisherPrintUrl}</a> <a id="settings-about-url" className="external" target="_blank" href={publisherUrl}>{publisherPrintUrl}</a>

6
apps/common/mobile/resources/less/common.less
View file

@ -130,7 +130,7 @@
.bullets, .bullets,
.numbers, .numbers,
.multilevels { .multilevels {
.list { .row.list {
margin: 0; margin: 0;
ul { ul {
background: none; background: none;
@ -183,12 +183,12 @@
} }
} }
.popover__titled .popover-inner{ .popover {
.list { .list {
ul { ul {
background-color: var(--f7-list-bg-color); background-color: var(--f7-list-bg-color);
li:first-child, li:last-child { li:first-child, li:last-child {
a { .item-link {
border-radius: 0; border-radius: 0;
} }
} }

10
apps/common/mobile/resources/less/dataview.less
View file

@ -14,7 +14,11 @@
} }
} }
.active { .row.list:last-child li:not(.active):last-child::after {
content: none;
}
.row.list:last-child li.active:last-child, .active {
position: relative; position: relative;
z-index: 1; z-index: 1;
@ -24,8 +28,10 @@
width: 22px; width: 22px;
height: 22px; height: 22px;
right: -5px; right: -5px;
left: auto;
bottom: -5px; bottom: -5px;
.encoded-svg-background('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>'); transform: none;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="none"><g><circle cx="11" cy="11" r="11"/><path fill="#fff" d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
} }
} }
} }

6
apps/documenteditor/main/app/controller/Navigation.js
View file

@ -112,6 +112,12 @@ define([
panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this)); panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this));
panelNavigation.navigationMenu.on('item:click', _.bind(this.onMenuItemClick, this)); panelNavigation.navigationMenu.on('item:click', _.bind(this.onMenuItemClick, this));
panelNavigation.navigationMenu.items[11].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this)); panelNavigation.navigationMenu.items[11].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this));
var viewport = this.getApplication().getController('Viewport').getView('Viewport');
viewport.hlayout.on('layout:resizedrag', function () {
if (panelNavigation.viewNavigationList && panelNavigation.viewNavigationList.scroller)
panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
});
}, },
updateNavigation: function() { updateNavigation: function() {

16
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -658,7 +658,9 @@ class MainController extends Component {
const storeDocumentInfo = this.props.storeDocumentInfo; const storeDocumentInfo = this.props.storeDocumentInfo;
this.api.asc_registerCallback("asc_onGetDocInfoStart", () => { this.api.asc_registerCallback("asc_onGetDocInfoStart", () => {
storeDocumentInfo.switchIsLoaded(false); this.timerLoading = setTimeout(() => {
storeDocumentInfo.switchIsLoaded(false);
}, 2000);
}); });
this.api.asc_registerCallback("asc_onGetDocInfoStop", () => { this.api.asc_registerCallback("asc_onGetDocInfoStop", () => {
@ -666,10 +668,20 @@ class MainController extends Component {
}); });
this.api.asc_registerCallback("asc_onDocInfo", (obj) => { this.api.asc_registerCallback("asc_onDocInfo", (obj) => {
storeDocumentInfo.changeCount(obj); clearTimeout(this.timerLoading);
this.objectInfo = obj;
if(!this.timerDocInfo) {
this.timerDocInfo = setInterval(() => {
storeDocumentInfo.changeCount(this.objectInfo);
}, 300);
storeDocumentInfo.changeCount(this.objectInfo);
}
}); });
this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => { this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => {
clearTimeout(this.timerLoading);
clearInterval(this.timerDocInfo);
storeDocumentInfo.switchIsLoaded(true); storeDocumentInfo.switchIsLoaded(true);
}); });

5
apps/documenteditor/mobile/src/less/app-ios.less
View file

@ -1,9 +1,4 @@
.ios { .ios {
.view {
.bullets-numbers{
background: @brand-text-on-brand;
}
}
// Stepper // Stepper
.content-block.stepper-block { .content-block.stepper-block {

2
apps/documenteditor/mobile/src/store/documentInfo.js
View file

@ -20,7 +20,7 @@ export class storeDocumentInfo {
symbolsWSCount: 0, symbolsWSCount: 0,
}; };
isLoaded = false; isLoaded = true;
dataDoc; dataDoc;
switchIsLoaded(value) { switchIsLoaded(value) {

6
apps/presentationeditor/embed/locale/id.json
View file

@ -13,11 +13,16 @@
"PE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1", "PE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
"PE.ApplicationController.errorFilePassProtect": "File diproteksi kata sandi", "PE.ApplicationController.errorFilePassProtect": "File diproteksi kata sandi",
"PE.ApplicationController.errorFileSizeExceed": "Ukuran file melebihi", "PE.ApplicationController.errorFileSizeExceed": "Ukuran file melebihi",
"PE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
"PE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
"PE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "Hubungan internet telah", "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Hubungan internet telah",
"PE.ApplicationController.errorUserDrop": "File tidak dapat di akses", "PE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"PE.ApplicationController.notcriticalErrorTitle": "Peringatan", "PE.ApplicationController.notcriticalErrorTitle": "Peringatan",
"PE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,", "PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,",
"PE.ApplicationController.textAnonymous": "Anonim", "PE.ApplicationController.textAnonymous": "Anonim",
"PE.ApplicationController.textGuest": "Tamu",
"PE.ApplicationController.textLoadingDocument": "Memuat penyajian", "PE.ApplicationController.textLoadingDocument": "Memuat penyajian",
"PE.ApplicationController.textOf": "Dari", "PE.ApplicationController.textOf": "Dari",
"PE.ApplicationController.txtClose": "Tutup", "PE.ApplicationController.txtClose": "Tutup",
@ -28,5 +33,6 @@
"PE.ApplicationView.txtEmbed": "Melekatkan", "PE.ApplicationView.txtEmbed": "Melekatkan",
"PE.ApplicationView.txtFileLocation": "Buka Dokumen", "PE.ApplicationView.txtFileLocation": "Buka Dokumen",
"PE.ApplicationView.txtFullScreen": "Layar penuh", "PE.ApplicationView.txtFullScreen": "Layar penuh",
"PE.ApplicationView.txtPrint": "Cetak",
"PE.ApplicationView.txtShare": "Bagikan" "PE.ApplicationView.txtShare": "Bagikan"
} }

7
apps/presentationeditor/main/app/controller/Animation.js
View file

@ -347,8 +347,11 @@ define([
onFocusObject: function(selectedObjects) { onFocusObject: function(selectedObjects) {
this.AnimationProperties = null; this.AnimationProperties = null;
for (var i = 0; i<selectedObjects.length; i++) { for (var i = 0; i<selectedObjects.length; i++) {
if (selectedObjects[i].get_ObjectType() == Asc.c_oAscTypeSelectElement.Animation) { var type = selectedObjects[i].get_ObjectType();
if (type == Asc.c_oAscTypeSelectElement.Animation) {
this.AnimationProperties = selectedObjects[i].get_ObjectValue(); this.AnimationProperties = selectedObjects[i].get_ObjectValue();
} else if (type==Asc.c_oAscTypeSelectElement.Slide) {
this._state.timingLock = selectedObjects[i].get_ObjectValue().get_LockTiming();
} }
} }
if (this._state.onactivetab) if (this._state.onactivetab)
@ -548,6 +551,8 @@ define([
this.lockToolbar(Common.enumLock.noAnimationRepeat, this._state.noAnimationRepeat); this.lockToolbar(Common.enumLock.noAnimationRepeat, this._state.noAnimationRepeat);
if (this._state.noAnimationDuration != undefined) if (this._state.noAnimationDuration != undefined)
this.lockToolbar(Common.enumLock.noAnimationDuration, this._state.noAnimationDuration); this.lockToolbar(Common.enumLock.noAnimationDuration, this._state.noAnimationDuration);
if (this._state.timingLock != undefined)
this.lockToolbar(Common.enumLock.timingLock, this._state.timingLock);
} }
}, PE.Controllers.Animation || {})); }, PE.Controllers.Animation || {}));

34
apps/presentationeditor/main/app/view/Animation.js
View file

@ -208,7 +208,7 @@ define([
store: new Common.UI.DataViewStore(this._arrEffectName), store: new Common.UI.DataViewStore(this._arrEffectName),
additionalMenuItems: [{caption: '--'}, this.listEffectsMore], additionalMenuItems: [{caption: '--'}, this.listEffectsMore],
enableKeyEvents: true, enableKeyEvents: true,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: '-16, 0', dataHintOffset: '-16, 0',
@ -242,7 +242,7 @@ define([
caption: this.txtPreview, caption: this.txtPreview,
split: false, split: false,
iconCls: 'toolbar__icon animation-preview-start', iconCls: 'toolbar__icon animation-preview-start',
lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview], lock: [_set.slideDeleted, _set.noSlides, _set.noAnimationPreview, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -254,7 +254,7 @@ define([
caption: this.txtParameters, caption: this.txtParameters,
iconCls: 'toolbar__icon icon animation-parameters', iconCls: 'toolbar__icon icon animation-parameters',
menu: new Common.UI.Menu({items: []}), menu: new Common.UI.Menu({items: []}),
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -266,7 +266,7 @@ define([
caption: this.txtAnimationPane, caption: this.txtAnimationPane,
split: true, split: true,
iconCls: 'toolbar__icon transition-apply-all', iconCls: 'toolbar__icon transition-apply-all',
lock: [_set.slideDeleted, _set.noSlides], lock: [_set.slideDeleted, _set.noSlides, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'medium' dataHintOffset: 'medium'
@ -278,7 +278,7 @@ define([
caption: this.txtAddEffect, caption: this.txtAddEffect,
iconCls: 'toolbar__icon icon add-animation', iconCls: 'toolbar__icon icon add-animation',
menu: true, menu: true,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -299,7 +299,7 @@ define([
{value: 1, displayValue: this.str1}, {value: 1, displayValue: this.str1},
{value: 0.5, displayValue: this.str0_5} {value: 0.5, displayValue: this.str0_5}
], ],
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'top', dataHintDirection: 'top',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -310,7 +310,7 @@ define([
el: this.$el.find('#animation-duration'), el: this.$el.find('#animation-duration'),
iconCls: 'toolbar__icon animation-duration', iconCls: 'toolbar__icon animation-duration',
caption: this.strDuration, caption: this.strDuration,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration] lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationDuration, _set.timingLock]
}); });
this.lockedControls.push(this.lblDuration); this.lockedControls.push(this.lblDuration);
@ -319,7 +319,7 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-trigger', iconCls: 'toolbar__icon btn-trigger',
caption: this.strTrigger, caption: this.strTrigger,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.timingLock],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ {
@ -352,7 +352,7 @@ define([
defaultUnit: this.txtSec, defaultUnit: this.txtSec,
maxValue: 300, maxValue: 300,
minValue: 0, minValue: 0,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'big' dataHintOffset: 'big'
@ -363,7 +363,7 @@ define([
el: this.$el.find('#animation-delay'), el: this.$el.find('#animation-delay'),
iconCls: 'toolbar__icon animation-delay', iconCls: 'toolbar__icon animation-delay',
caption: this.strDelay, caption: this.strDelay,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation] lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock]
}); });
this.lockedControls.push(this.lblDelay); this.lockedControls.push(this.lblDelay);
@ -371,7 +371,7 @@ define([
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
data: [ data: [
{value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick}, {value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick},
{value: AscFormat.NODE_TYPE_WITHEFFECT, displayValue: this.textStartWithPrevious}, {value: AscFormat.NODE_TYPE_WITHEFFECT, displayValue: this.textStartWithPrevious},
@ -387,14 +387,14 @@ define([
el: this.$el.find('#animation-label-start'), el: this.$el.find('#animation-label-start'),
iconCls: 'toolbar__icon btn-preview-start', iconCls: 'toolbar__icon btn-preview-start',
caption: this.strStart, caption: this.strStart,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation] lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock]
}); });
this.lockedControls.push(this.lblStart); this.lockedControls.push(this.lblStart);
this.chRewind = new Common.UI.CheckBox({ this.chRewind = new Common.UI.CheckBox({
el: this.$el.find('#animation-checkbox-rewind'), el: this.$el.find('#animation-checkbox-rewind'),
labelText: this.strRewind, labelText: this.strRewind,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -406,7 +406,7 @@ define([
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: true, editable: true,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat, _set.timingLock],
data: [ data: [
{value: 1, displayValue: this.textNoRepeat}, {value: 1, displayValue: this.textNoRepeat},
{value: 2, displayValue: "2"}, {value: 2, displayValue: "2"},
@ -427,7 +427,7 @@ define([
el: this.$el.find('#animation-repeat'), el: this.$el.find('#animation-repeat'),
iconCls: 'toolbar__icon animation-repeat', iconCls: 'toolbar__icon animation-repeat',
caption: this.strRepeat, caption: this.strRepeat,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat] lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationRepeat, _set.timingLock]
}); });
this.lockedControls.push(this.lblRepeat); this.lockedControls.push(this.lblRepeat);
@ -437,7 +437,7 @@ define([
iconCls: 'toolbar__icon btn-arrow-up', iconCls: 'toolbar__icon btn-arrow-up',
style: 'min-width: 82px', style: 'min-width: 82px',
caption: this.textMoveEarlier, caption: this.textMoveEarlier,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationEarlier], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationEarlier, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'medium' dataHintOffset: 'medium'
@ -450,7 +450,7 @@ define([
iconCls: 'toolbar__icon btn-arrow-down', iconCls: 'toolbar__icon btn-arrow-down',
style: 'min-width: 82px', style: 'min-width: 82px',
caption: this.textMoveLater, caption: this.textMoveLater,
lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationLater], lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noTriggerObjects, _set.noMoveAnimationLater, _set.timingLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'medium' dataHintOffset: 'medium'

3
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -98,7 +98,8 @@ define([
noMoveAnimationLater: 'no-move-animation-later', noMoveAnimationLater: 'no-move-animation-later',
noAnimationPreview: 'no-animation-preview', noAnimationPreview: 'no-animation-preview',
noAnimationRepeat: 'no-animation-repeat', noAnimationRepeat: 'no-animation-repeat',
noAnimationDuration: 'no-animation-duration' noAnimationDuration: 'no-animation-duration',
timingLock: 'timing-lock'
}; };
for (var key in enumLock) { for (var key in enumLock) {
if (enumLock.hasOwnProperty(key)) { if (enumLock.hasOwnProperty(key)) {

5
apps/spreadsheeteditor/embed/locale/id.json
View file

@ -13,10 +13,15 @@
"SSE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1", "SSE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
"SSE.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.", "SSE.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.",
"SSE.ApplicationController.errorFileSizeExceed": "Dokumen melebihi ukuran ", "SSE.ApplicationController.errorFileSizeExceed": "Dokumen melebihi ukuran ",
"SSE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
"SSE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
"SSE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Huhungan internet telah", "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Huhungan internet telah",
"SSE.ApplicationController.errorUserDrop": "File tidak dapat di akses", "SSE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"SSE.ApplicationController.notcriticalErrorTitle": "Peringatan", "SSE.ApplicationController.notcriticalErrorTitle": "Peringatan",
"SSE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"SSE.ApplicationController.scriptLoadError": "Hubungan terlalu lambat", "SSE.ApplicationController.scriptLoadError": "Hubungan terlalu lambat",
"SSE.ApplicationController.textAnonymous": "Anonim",
"SSE.ApplicationController.textGuest": "Tamu", "SSE.ApplicationController.textGuest": "Tamu",
"SSE.ApplicationController.textLoadingDocument": "Memuat spread sheet", "SSE.ApplicationController.textLoadingDocument": "Memuat spread sheet",
"SSE.ApplicationController.textOf": "Dari", "SSE.ApplicationController.textOf": "Dari",

16
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -115,6 +115,7 @@ define([
this.api = o; this.api = o;
this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this)); this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this));
this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this)); this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this));
this.api.asc_registerCallback('asc_onUpdateDocumentProps', _.bind(this.updateDocumentProps, this));
}, },
updateSheetsInfo: function() { updateSheetsInfo: function() {
@ -456,8 +457,8 @@ define([
panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel)); panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel)); panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel)); panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel));
panel.txtRangeTop.on('changing', _.bind(this.propertyChange, this, panel)); panel.txtRangeTop.on('changed:after', _.bind(this.propertyChange, this, panel));
panel.txtRangeLeft.on('changing', _.bind(this.propertyChange, this, panel)); panel.txtRangeLeft.on('changed:after', _.bind(this.propertyChange, this, panel));
panel.txtRangeTop.on('button:click', _.bind(this.onPresetSelect, this, panel, 'top', panel.btnPresetsTop.menu, {value: 'select'})); panel.txtRangeTop.on('button:click', _.bind(this.onPresetSelect, this, panel, 'top', panel.btnPresetsTop.menu, {value: 'select'}));
panel.txtRangeLeft.on('button:click', _.bind(this.onPresetSelect, this, panel, 'left', panel.btnPresetsLeft.menu, {value: 'select'})); panel.txtRangeLeft.on('button:click', _.bind(this.onPresetSelect, this, panel, 'left', panel.btnPresetsLeft.menu, {value: 'select'}));
panel.btnPresetsTop.menu.on('item:click', _.bind(this.onPresetSelect, this, panel, 'top')); panel.btnPresetsTop.menu.on('item:click', _.bind(this.onPresetSelect, this, panel, 'top'));
@ -521,7 +522,6 @@ define([
fillComponents: function(panel, selectdata) { fillComponents: function(panel, selectdata) {
var me = this; var me = this;
panel.txtRangeTop.validation = function(value) { panel.txtRangeTop.validation = function(value) {
!me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) { if (_.isEmpty(value)) {
return true; return true;
} }
@ -531,7 +531,6 @@ define([
selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange); selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange);
panel.txtRangeLeft.validation = function(value) { panel.txtRangeLeft.validation = function(value) {
!me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) { if (_.isEmpty(value)) {
return true; return true;
} }
@ -648,6 +647,8 @@ define([
e.preventDefault(); e.preventDefault();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
} }
this.printSettings.txtRangeTop.cmpEl.find('input:focus').blur();
this.printSettings.txtRangeLeft.cmpEl.find('input:focus').blur();
var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0; var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
this.onChangePreviewPage(forward); this.onChangePreviewPage(forward);
}, },
@ -748,6 +749,13 @@ define([
this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2); this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
}, },
updateDocumentProps: function (index) {
if (this._isPreviewVisible) {
this._changedProps[index] = this.api.asc_getPageOptions(index);
this.updatePreview();
}
},
warnCheckMargings: 'Margins are incorrect', warnCheckMargings: 'Margins are incorrect',
strAllSheets: 'All Sheets', strAllSheets: 'All Sheets',
textWarning: 'Warning', textWarning: 'Warning',