- {mailCustomer} + {mailCustomer}
) : null} {urlCustomer && urlCustomer.length ? ( @@ -103,11 +103,11 @@ const PageAbout = props => {- {__SUPPORT_EMAIL__} + {__SUPPORT_EMAIL__}
- {__PUBLISHER_PHONE__} + {__PUBLISHER_PHONE__}
{publisherPrintUrl}
diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 039c62938..e07026a7a 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -130,7 +130,7 @@
.bullets,
.numbers,
.multilevels {
- .list {
+ .row.list {
margin: 0;
ul {
background: none;
@@ -183,12 +183,12 @@
}
}
-.popover__titled .popover-inner{
+.popover {
.list {
ul {
background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
- a {
+ .item-link {
border-radius: 0;
}
}
diff --git a/apps/common/mobile/resources/less/dataview.less b/apps/common/mobile/resources/less/dataview.less
index 8ca304ead..d47858754 100644
--- a/apps/common/mobile/resources/less/dataview.less
+++ b/apps/common/mobile/resources/less/dataview.less
@@ -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;
z-index: 1;
@@ -24,8 +28,10 @@
width: 22px;
height: 22px;
right: -5px;
+ left: auto;
bottom: -5px;
- .encoded-svg-background('');
+ transform: none;
+ .encoded-svg-mask('');
}
}
}
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index f528e131e..b36373da3 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -112,6 +112,12 @@ define([
panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this));
panelNavigation.navigationMenu.on('item:click', _.bind(this.onMenuItemClick, 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() {
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index aa1f50825..e673ca908 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -658,7 +658,9 @@ class MainController extends Component {
const storeDocumentInfo = this.props.storeDocumentInfo;
this.api.asc_registerCallback("asc_onGetDocInfoStart", () => {
- storeDocumentInfo.switchIsLoaded(false);
+ this.timerLoading = setTimeout(() => {
+ storeDocumentInfo.switchIsLoaded(false);
+ }, 2000);
});
this.api.asc_registerCallback("asc_onGetDocInfoStop", () => {
@@ -666,10 +668,20 @@ class MainController extends Component {
});
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', () => {
+ clearTimeout(this.timerLoading);
+ clearInterval(this.timerDocInfo);
storeDocumentInfo.switchIsLoaded(true);
});
diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less
index e047609d5..edff70bc3 100644
--- a/apps/documenteditor/mobile/src/less/app-ios.less
+++ b/apps/documenteditor/mobile/src/less/app-ios.less
@@ -1,9 +1,4 @@
.ios {
- .view {
- .bullets-numbers{
- background: @brand-text-on-brand;
- }
- }
// Stepper
.content-block.stepper-block {
diff --git a/apps/documenteditor/mobile/src/store/documentInfo.js b/apps/documenteditor/mobile/src/store/documentInfo.js
index 3bfa67356..d57b4b90c 100644
--- a/apps/documenteditor/mobile/src/store/documentInfo.js
+++ b/apps/documenteditor/mobile/src/store/documentInfo.js
@@ -20,7 +20,7 @@ export class storeDocumentInfo {
symbolsWSCount: 0,
};
- isLoaded = false;
+ isLoaded = true;
dataDoc;
switchIsLoaded(value) {
diff --git a/apps/presentationeditor/embed/locale/id.json b/apps/presentationeditor/embed/locale/id.json
index 826ba68e6..a1c4e51f7 100644
--- a/apps/presentationeditor/embed/locale/id.json
+++ b/apps/presentationeditor/embed/locale/id.json
@@ -13,11 +13,16 @@
"PE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
"PE.ApplicationController.errorFilePassProtect": "File diproteksi kata sandi",
"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.
Silakan kontak admin Server Dokumen Anda.",
+ "PE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.
Silakan hubungi admin Server Dokumen Anda.",
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "Hubungan internet telah",
"PE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"PE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+ "PE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,",
"PE.ApplicationController.textAnonymous": "Anonim",
+ "PE.ApplicationController.textGuest": "Tamu",
"PE.ApplicationController.textLoadingDocument": "Memuat penyajian",
"PE.ApplicationController.textOf": "Dari",
"PE.ApplicationController.txtClose": "Tutup",
@@ -28,5 +33,6 @@
"PE.ApplicationView.txtEmbed": "Melekatkan",
"PE.ApplicationView.txtFileLocation": "Buka Dokumen",
"PE.ApplicationView.txtFullScreen": "Layar penuh",
+ "PE.ApplicationView.txtPrint": "Cetak",
"PE.ApplicationView.txtShare": "Bagikan"
}
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
index 3e065061f..8bf9fc08a 100644
--- a/apps/presentationeditor/main/app/controller/Animation.js
+++ b/apps/presentationeditor/main/app/controller/Animation.js
@@ -347,8 +347,11 @@ define([
onFocusObject: function(selectedObjects) {
this.AnimationProperties = null;
for (var i = 0; i
Silakan hubungi admin Server Dokumen Anda.",
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Huhungan internet telah",
"SSE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"SSE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+ "SSE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"SSE.ApplicationController.scriptLoadError": "Hubungan terlalu lambat",
+ "SSE.ApplicationController.textAnonymous": "Anonim",
"SSE.ApplicationController.textGuest": "Tamu",
"SSE.ApplicationController.textLoadingDocument": "Memuat spread sheet",
"SSE.ApplicationController.textOf": "Dari",
diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js
index ff0c5c8e0..3a6f827e5 100644
--- a/apps/spreadsheeteditor/main/app/controller/Print.js
+++ b/apps/spreadsheeteditor/main/app/controller/Print.js
@@ -115,6 +115,7 @@ define([
this.api = o;
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_onUpdateDocumentProps', _.bind(this.updateDocumentProps, this));
},
updateSheetsInfo: function() {
@@ -456,8 +457,8 @@ define([
panel.spnMarginRight.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.txtRangeTop.on('changing', _.bind(this.propertyChange, this, panel));
- panel.txtRangeLeft.on('changing', _.bind(this.propertyChange, this, panel));
+ panel.txtRangeTop.on('changed:after', _.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.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'));
@@ -521,7 +522,6 @@ define([
fillComponents: function(panel, selectdata) {
var me = this;
panel.txtRangeTop.validation = function(value) {
- !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) {
return true;
}
@@ -531,7 +531,6 @@ define([
selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange);
panel.txtRangeLeft.validation = function(value) {
- !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) {
return true;
}
@@ -648,6 +647,8 @@ define([
e.preventDefault();
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;
this.onChangePreviewPage(forward);
},
@@ -748,6 +749,13 @@ define([
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',
strAllSheets: 'All Sheets',
textWarning: 'Warning',