[DE SSE mobile] Correct encoding options
This commit is contained in:
parent
33bf343709
commit
735228e51d
|
@ -6,7 +6,7 @@ import { Encoding } from "../view/Encoding";
|
|||
class EncodingController extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
|
||||
this.onSaveFormat = this.onSaveFormat.bind(this);
|
||||
this.closeModal = this.closeModal.bind(this);
|
||||
this.state = {
|
||||
|
@ -25,7 +25,7 @@ class EncodingController extends Component {
|
|||
}
|
||||
|
||||
initEncoding(type, advOptions, mode, formatOptions) {
|
||||
if(type === Asc.c_oAscAdvancedOptionsID.CSV) {
|
||||
if(type === Asc.c_oAscAdvancedOptionsID.TXT) {
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
|
||||
|
||||
|
@ -54,12 +54,7 @@ class EncodingController extends Component {
|
|||
}
|
||||
|
||||
closeModal() {
|
||||
if (Device.phone) {
|
||||
f7.sheet.close('.encoding-popup', true);
|
||||
} else {
|
||||
f7.popover.close('#encoding-popover');
|
||||
}
|
||||
|
||||
f7.sheet.close('.encoding-popup', true);
|
||||
this.setState({isOpen: false});
|
||||
}
|
||||
|
||||
|
|
|
@ -30,11 +30,10 @@ class DownloadController extends Component {
|
|||
(format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf,
|
||||
_t.notcriticalErrorTitle,
|
||||
() => {
|
||||
if (format == Asc.c_oAscFileType.TXT) {
|
||||
if (format === Asc.c_oAscFileType.TXT) {
|
||||
const advOptions = api.asc_getAdvancedOptions();
|
||||
this.closeModal();
|
||||
Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format));
|
||||
|
||||
Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format));
|
||||
}
|
||||
else {
|
||||
this.closeModal();
|
||||
|
|
|
@ -5,7 +5,7 @@ import { Device } from '../../../../common/mobile/utils/device';
|
|||
|
||||
const PageEncoding = props => {
|
||||
const { t } = useTranslation();
|
||||
const _t = t("View.Settings", { returnObjects: true });
|
||||
const _t = t("Settings", { returnObjects: true });
|
||||
const pagesName = props.pagesName;
|
||||
const pages = props.pages;
|
||||
const [stateEncoding, setStateEncoding] = useState(props.valueEncoding);
|
||||
|
@ -19,7 +19,7 @@ const PageEncoding = props => {
|
|||
return (
|
||||
<View style={props.style} routes={routes}>
|
||||
<Page>
|
||||
<Navbar title={_t.textChooseCsvOptions} />
|
||||
<Navbar title={_t.textChooseTxtOptions} />
|
||||
<BlockTitle>{_t.textEncoding}</BlockTitle>
|
||||
<List>
|
||||
<ListItem title={nameEncoding} link="/encoding-list/" routeProps={{
|
||||
|
@ -43,14 +43,14 @@ const PageEncoding = props => {
|
|||
|
||||
const PageEncodingList = props => {
|
||||
const { t } = useTranslation();
|
||||
const _t = t("View.Settings", { returnObjects: true });
|
||||
const _t = t("Settings", { returnObjects: true });
|
||||
const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding);
|
||||
const pages = props.pages;
|
||||
const pagesName = props.pagesName;
|
||||
|
||||
return (
|
||||
<Page>
|
||||
<Navbar title={_t.txtDownloadCsv} backLink={_t.textBack} />
|
||||
<Navbar title={_t.txtDownloadTxt} backLink={_t.textBack} />
|
||||
<BlockTitle>{_t.textChooseEncoding}</BlockTitle>
|
||||
<List>
|
||||
{pagesName.map((name, index) => {
|
||||
|
@ -73,32 +73,17 @@ class EncodingView extends Component {
|
|||
}
|
||||
|
||||
render() {
|
||||
const show_popover = this.props.usePopover;
|
||||
|
||||
return (
|
||||
show_popover ?
|
||||
<Popover id="encoding-popover" className="popover__titled" closeByBackdropClick={false} closeByOutsideClick={false}>
|
||||
<PageEncoding
|
||||
inPopover={true}
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
style={{height: '410px'}}
|
||||
/>
|
||||
</Popover> :
|
||||
<Popup className="encoding-popup">
|
||||
<PageEncoding
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
/>
|
||||
</Popup>
|
||||
<Popup className="encoding-popup" closeByBackdropClick={false}>
|
||||
<PageEncoding
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
/>
|
||||
</Popup>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -112,17 +97,14 @@ const routes = [
|
|||
|
||||
const Encoding = props => {
|
||||
useEffect(() => {
|
||||
if ( Device.phone )
|
||||
f7.popup.open('.encoding-popup');
|
||||
else f7.popover.open('#encoding-popover', "#btn-settings");
|
||||
|
||||
f7.popup.open('.encoding-popup');
|
||||
|
||||
return () => {
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<EncodingView
|
||||
usePopover={!Device.phone}
|
||||
closeModal={props.closeModal}
|
||||
onSaveFormat={props.onSaveFormat}
|
||||
mode={props.mode}
|
||||
|
|
|
@ -61,12 +61,7 @@ class EncodingController extends Component {
|
|||
}
|
||||
|
||||
closeModal() {
|
||||
if (Device.phone) {
|
||||
f7.sheet.close('.encoding-popup', true);
|
||||
} else {
|
||||
f7.popover.close('#encoding-popover');
|
||||
}
|
||||
|
||||
f7.sheet.close('.encoding-popup', true);
|
||||
this.setState({isOpen: false});
|
||||
}
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ export class storeApplicationSettings {
|
|||
|
||||
unitMeasurement = Common.Utils.Metric.getCurrentMetric();
|
||||
macrosMode = 0;
|
||||
formulaLang = LocalStorage.getItem('sse-settings-func-lang') || dataLang[0].value;
|
||||
formulaLang = LocalStorage.getItem('sse-settings-func-lang') || this.getFormulaLanguages()[0].value;
|
||||
regCode = undefined;
|
||||
regExample = '';
|
||||
regData = [];
|
||||
|
|
|
@ -116,38 +116,20 @@ class EncodingView extends Component {
|
|||
}
|
||||
|
||||
render() {
|
||||
const show_popover = this.props.usePopover;
|
||||
|
||||
return (
|
||||
show_popover ?
|
||||
<Popover id="encoding-popover" className="popover__titled" closeByBackdropClick={false} closeByOutsideClick={false}>
|
||||
<PageEncoding
|
||||
inPopover={true}
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
namesDelimeter={this.props.namesDelimeter}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
valueDelimeter={this.props.valueDelimeter}
|
||||
valuesDelimeter={this.props.valuesDelimeter}
|
||||
style={{height: '410px'}}
|
||||
/>
|
||||
</Popover> :
|
||||
<Popup className="encoding-popup">
|
||||
<PageEncoding
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
namesDelimeter={this.props.namesDelimeter}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
valueDelimeter={this.props.valueDelimeter}
|
||||
valuesDelimeter={this.props.valuesDelimeter}
|
||||
/>
|
||||
</Popup>
|
||||
<Popup className="encoding-popup" closeByBackdropClick={false}>
|
||||
<PageEncoding
|
||||
onSaveFormat={this.props.onSaveFormat}
|
||||
closeModal={this.props.closeModal}
|
||||
mode={this.props.mode}
|
||||
pages={this.props.pages}
|
||||
pagesName={this.props.pagesName}
|
||||
namesDelimeter={this.props.namesDelimeter}
|
||||
valueEncoding={this.props.valueEncoding}
|
||||
valueDelimeter={this.props.valueDelimeter}
|
||||
valuesDelimeter={this.props.valuesDelimeter}
|
||||
/>
|
||||
</Popup>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -165,17 +147,14 @@ const routes = [
|
|||
|
||||
const Encoding = props => {
|
||||
useEffect(() => {
|
||||
if ( Device.phone )
|
||||
f7.popup.open('.encoding-popup');
|
||||
else f7.popover.open('#encoding-popover', "#btn-settings");
|
||||
|
||||
f7.popup.open('.encoding-popup');
|
||||
|
||||
return () => {
|
||||
}
|
||||
});
|
||||
|
||||
return (
|
||||
<EncodingView
|
||||
usePopover={!Device.phone}
|
||||
<EncodingView
|
||||
closeModal={props.closeModal}
|
||||
onSaveFormat={props.onSaveFormat}
|
||||
mode={props.mode}
|
||||
|
|
Loading…
Reference in a new issue