diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 5f5dfc0434..a24aeb4647 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -57,7 +57,7 @@ define([ if (options.preview) { width = 414; - height = (options.type==Common.Utils.importTextType.Data) ? 330 : 277; + height = (options.type==Common.Utils.importTextType.Data) ? 385 : 277; } else { width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 280); switch (options.type) { @@ -111,7 +111,7 @@ define([ '<% } %>', '<% } else { %>', '<% if (codepages && codepages.length>0) { %>', - '
', + '
', '', '
', '
', @@ -133,7 +133,7 @@ define([ '
', '
', '
', - '', + '', '
', '
', '<% } %>', diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js index a7eff0fed1..9e52d5e5a2 100644 --- a/apps/spreadsheeteditor/main/app/controller/DataTab.js +++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js @@ -253,7 +253,7 @@ define([ } }, - onDataFromTextCallback: function(data) { + onDataFromTextCallback: function(data, advOptions) { if (!data || !data.length) return; var me = this; @@ -263,7 +263,8 @@ define([ type: Common.Utils.importTextType.Data, preview: true, previewData: data, - settings: me._state.CSVOptions, + settings: advOptions ? advOptions.asc_getRecommendedSettings() : me._state.CSVOptions, + codepages: advOptions ? advOptions.asc_getCodePages() : null, api: me.api, handler: function (result, encoding, delimiter, delimiterChar, decimal, thousands, range) { if (result == 'ok') {