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

Change usage of advanced options on load/save csv, txt, rtf

Browse source
This commit is contained in:
Julia Radzhabova 2019-07-25 10:14:45 +03:00
parent c0862be9b9
commit a43e7a0c85
11 changed files with 38 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/view/OpenDialog.js
View file

@ -339,14 +339,14 @@ define([
switch (this.type) { switch (this.type) {
case Common.Utils.importTextType.CSV: case Common.Utils.importTextType.CSV:
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this)); this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this));
break; break;
case Common.Utils.importTextType.TXT: case Common.Utils.importTextType.TXT:
this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(encoding), _.bind(this.previewCallback, this)); this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding), _.bind(this.previewCallback, this));
break; break;
case Common.Utils.importTextType.Paste: case Common.Utils.importTextType.Paste:
case Common.Utils.importTextType.Columns: case Common.Utils.importTextType.Columns:
this.api.asc_TextImport(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste); this.api.asc_TextImport(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste);
break; break;
} }
}, },

4
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -302,7 +302,7 @@ define([
buttons: ['ok', 'cancel'], buttons: ['ok', 'cancel'],
callback: _.bind(function(btn){ callback: _.bind(function(btn){
if (btn == 'ok') { if (btn == 'ok') {
Common.NotificationCenter.trigger('download:advanced', this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format));
menu.hide(); menu.hide();
} }
}, this) }, this)
@ -348,7 +348,7 @@ define([
callback: _.bind(function(btn){ callback: _.bind(function(btn){
if (btn == 'ok') { if (btn == 'ok') {
this.isFromFileDownloadAs = ext; this.isFromFileDownloadAs = ext;
Common.NotificationCenter.trigger('download:advanced', this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true)); Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true));
menu.hide(); menu.hide();
} }
}, this) }, this)

15
apps/documenteditor/main/app/controller/Main.js
View file

@ -1949,29 +1949,28 @@ define([
this.getApplication().getController('Toolbar').getView().updateMetricUnit(); this.getApplication().getController('Toolbar').getView().updateMetricUnit();
}, },
onAdvancedOptions: function(advOptions, mode, formatOptions) { onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.TXT) { if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'TXT'), title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'TXT'),
closable: (mode==2), // if save settings closable: (mode==2), // if save settings
type: Common.Utils.importTextType.TXT, type: Common.Utils.importTextType.TXT,
preview: advOptions.asc_getOptions().asc_getData(), preview: advOptions.asc_getData(),
codepages: advOptions.asc_getOptions().asc_getCodePages(), codepages: advOptions.asc_getCodePages(),
settings: advOptions.asc_getOptions().asc_getRecommendedSettings(), settings: advOptions.asc_getRecommendedSettings(),
api: me.api, api: me.api,
handler: function (result, encoding) { handler: function (result, encoding) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;
if (result == 'ok') { if (result == 'ok') {
if (me && me.api) { if (me && me.api) {
if (mode==2) { if (mode==2) {
formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTXTAdvancedOptions(encoding)); formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding));
me.api.asc_DownloadAs(formatOptions); me.api.asc_DownloadAs(formatOptions);
} else } else
me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
me.loadMask && me.loadMask.show(); me.loadMask && me.loadMask.show();
} }
} }

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

@ -1113,17 +1113,16 @@ define([
Common.Utils.ThemeColor.setColors(colors, standart_colors); Common.Utils.ThemeColor.setColors(colors, standart_colors);
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(type, advOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.TXT) { if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
var picker, var picker,
pages = [], pages = [],
pagesName = []; pagesName = [];
_.each(advOptions.asc_getOptions().asc_getCodePages(), function(page) { _.each(advOptions.asc_getCodePages(), function(page) {
pages.push(page.asc_getCodePage()); pages.push(page.asc_getCodePage());
pagesName.push(page.asc_getCodePageName()); pagesName.push(page.asc_getCodePageName());
}); });
@ -1150,7 +1149,7 @@ define([
var encoding = picker.value; var encoding = picker.value;
if (me.api) { if (me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding));
if (!me._isDocReady) { if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
@ -1166,7 +1165,7 @@ define([
container: '#txt-encoding', container: '#txt-encoding',
toolbar: false, toolbar: false,
rotateEffect: true, rotateEffect: true,
value: [advOptions.asc_getOptions().asc_getRecommendedSettings().asc_getCodePage()], value: [advOptions.asc_getRecommendedSettings().asc_getCodePage()],
cols: [{ cols: [{
values: pages, values: pages,
displayValues: pagesName displayValues: pagesName

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1791,11 +1791,10 @@ define([
if (url) this.iframePrint.src = url; if (url) this.iframePrint.src = url;
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(type, advOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.DRM) { if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
title: Common.Views.OpenDialog.prototype.txtTitleProtected, title: Common.Views.OpenDialog.prototype.txtTitleProtected,

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

@ -1089,11 +1089,10 @@ define([
this.isThumbnailsShow = isShow; this.isThumbnailsShow = isShow;
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(type, advOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.DRM) { if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
$(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask); $(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask);

4
apps/spreadsheeteditor/main/app/controller/DataTab.js
View file

@ -68,7 +68,7 @@ define([
}); });
this._state = { this._state = {
CSVOptions: new Asc.asc_CCSVAdvancedOptions(0, 4, '') CSVOptions: new Asc.asc_CTextOptions(0, 4, '')
}; };
}, },
onLaunch: function () { onLaunch: function () {
@ -177,7 +177,7 @@ define([
handler: function (result, encoding, delimiter, delimiterChar) { handler: function (result, encoding, delimiter, delimiterChar) {
if (result == 'ok') { if (result == 'ok') {
if (me && me.api) { if (me && me.api) {
me.api.asc_TextToColumns(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar)); me.api.asc_TextToColumns(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar));
} }
} }
} }

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

@ -2204,7 +2204,7 @@ define([
if (me && me.api) { if (me && me.api) {
var props = new Asc.SpecialPasteProps(); var props = new Asc.SpecialPasteProps();
props.asc_setProps(Asc.c_oSpecialPasteProps.useTextImport); props.asc_setProps(Asc.c_oSpecialPasteProps.useTextImport);
props.asc_setAdvancedOptions(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar)); props.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar));
me.api.asc_SpecialPaste(props); me.api.asc_SpecialPaste(props);
} }
me._state.lastSpecPasteChecked = item; me._state.lastSpecPasteChecked = item;

4
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -264,7 +264,7 @@ define([
buttons: ['ok', 'cancel'], buttons: ['ok', 'cancel'],
callback: _.bind(function(btn){ callback: _.bind(function(btn){
if (btn == 'ok') { if (btn == 'ok') {
Common.NotificationCenter.trigger('download:advanced', this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.CSV, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format));
menu.hide(); menu.hide();
} }
}, this) }, this)
@ -287,7 +287,7 @@ define([
callback: _.bind(function(btn){ callback: _.bind(function(btn){
if (btn == 'ok') { if (btn == 'ok') {
this.isFromFileDownloadAs = ext; this.isFromFileDownloadAs = ext;
Common.NotificationCenter.trigger('download:advanced', this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true)); Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.CSV, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true));
menu.hide(); menu.hide();
} }
}, this) }, this)

15
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1603,29 +1603,28 @@ define([
return false; return false;
}, },
onAdvancedOptions: function(advOptions, mode, formatOptions) { onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.CSV) { if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'CSV'), title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'CSV'),
closable: (mode==2), // if save settings closable: (mode==2), // if save settings
type: Common.Utils.importTextType.CSV, type: Common.Utils.importTextType.CSV,
preview: advOptions.asc_getOptions().asc_getData(), preview: advOptions.asc_getData(),
codepages: advOptions.asc_getOptions().asc_getCodePages(), codepages: advOptions.asc_getCodePages(),
settings: advOptions.asc_getOptions().asc_getRecommendedSettings(), settings: advOptions.asc_getRecommendedSettings(),
api: me.api, api: me.api,
handler: function (result, encoding, delimiter, delimiterChar) { handler: function (result, encoding, delimiter, delimiterChar) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;
if (result == 'ok') { if (result == 'ok') {
if (me && me.api) { if (me && me.api) {
if (mode==2) { if (mode==2) {
formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar)); formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar));
me.api.asc_DownloadAs(formatOptions); me.api.asc_DownloadAs(formatOptions);
} else } else
me.api.asc_setAdvancedOptions(type, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar));
me.loadMask && me.loadMask.show(); me.loadMask && me.loadMask.show();
} }
} }

11
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -1213,17 +1213,16 @@ define([
Common.Utils.ThemeColor.setColors(colors, standart_colors); Common.Utils.ThemeColor.setColors(colors, standart_colors);
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(type, advOptions) {
if (this._state.openDlg) return; if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var me = this;
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.CSV) { if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
var picker, var picker,
pages = [], pages = [],
pagesName = []; pagesName = [];
_.each(advOptions.asc_getOptions().asc_getCodePages(), function(page) { _.each(advOptions.asc_getCodePages(), function(page) {
pages.push(page.asc_getCodePage()); pages.push(page.asc_getCodePage());
pagesName.push(page.asc_getCodePageName()); pagesName.push(page.asc_getCodePageName());
}); });
@ -1252,7 +1251,7 @@ define([
delimiter = picker.cols[1].value; delimiter = picker.cols[1].value;
if (me.api) { if (me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter));
if (!me._isDocReady) { if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
@ -1264,7 +1263,7 @@ define([
] ]
}); });
var recommendedSettings = advOptions.asc_getOptions().asc_getRecommendedSettings(); var recommendedSettings = advOptions.asc_getRecommendedSettings();
picker = uiApp.picker({ picker = uiApp.picker({
container: '#txt-encoding', container: '#txt-encoding',