Skip to content

S
sdkjs
Commit 1acd5318 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander.Trofimov
Browse files
Options

for ios 


git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68050 954022d7-b5bf-4e40-9824-e11837661b57
parent 742c5393
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 137 deletions
Excel/model/Workbook.js
View file @ 1acd5318
...@@ -3260,6 +3260,12 @@ Woorksheet.prototype.initPostOpen = function(handlers){ ...@@ -3260,6 +3260,12 @@ Woorksheet.prototype.initPostOpen = function(handlers){
// Даже если не было, создадим // Даже если не было, создадим
this.sheetViews.push(new asc.asc_CSheetViewSettings()); this.sheetViews.push(new asc.asc_CSheetViewSettings());
} }
if (window['IS_NATIVE_EDITOR']) {
for (var j = this.sheetViews.length - 1; j >= 0; --j) {
this.sheetViews[j].pane = null;
}
}
this.handlers = handlers; this.handlers = handlers;
this._setHandlersTablePart(); this._setHandlersTablePart();
......
Excel/native/native.js
View file @ 1acd5318
...@@ -777,6 +777,7 @@ var FT_Common = new _FT_Common(); ...@@ -777,6 +777,7 @@ var FT_Common = new _FT_Common();
var global_memory_stream_menu = CreateNativeMemoryStream(); var global_memory_stream_menu = CreateNativeMemoryStream();
function asc_menu_ReadColor(_params, _cursor) { function asc_menu_ReadColor(_params, _cursor) {
var _color = new asc_CColor(); var _color = new asc_CColor();
var _continue = true; var _continue = true;
...@@ -5082,128 +5083,133 @@ function offline_apply_event(type,params) { ...@@ -5082,128 +5083,133 @@ function offline_apply_event(type,params) {
case 9 : // ASC_MENU_EVENT_TYPE_IMAGE case 9 : // ASC_MENU_EVENT_TYPE_IMAGE
{ {
var _imagePr = new asc_CImgProperty(); var ws = _api.wb.getWorksheet();
while (_continue) if (ws && ws.objectRender && ws.objectRender.controller) {
{ var selectedImageProp = ws.objectRender.controller.getGraphicObjectProps();
_attr = params[_current.pos++];
switch (_attr) var _imagePr = new asc_CImgProperty();
while (_continue)
{ {
case 0: _attr = params[_current.pos++];
{ switch (_attr)
_imagePr.CanBeFlow = params[_current.pos++];
break;
}
case 1:
{
_imagePr.Width = params[_current.pos++];
break;
}
case 2:
{
_imagePr.Height = params[_current.pos++];
break;
}
case 3:
{
_imagePr.WrappingStyle = params[_current.pos++];
break;
}
case 4:
{
_imagePr.Paddings = asc_menu_ReadPaddings(params, _current);
break;
}
case 5:
{
_imagePr.Position = asc_menu_ReadPosition(params, _current);
break;
}
case 6:
{
_imagePr.AllowOverlap = params[_current.pos++];
break;
}
case 7:
{
_imagePr.PositionH = asc_menu_ReadImagePosition(params, _current);
break;
}
case 8:
{
_imagePr.PositionV = asc_menu_ReadImagePosition(params, _current);
break;
}
case 9:
{
_imagePr.Internal_Position = params[_current.pos++];
break;
}
case 10:
{
_imagePr.ImageUrl = params[_current.pos++];
break;
}
case 11:
{
_imagePr.Locked = params[_current.pos++];
break;
}
case 12:
{
_imagePr.ChartProperties = asc_menu_ReadChartPr(params, _current);
break;
}
case 13:
{
_imagePr.ShapeProperties = asc_menu_ReadShapePr(params, _current);
break;
}
case 14:
{
_imagePr.ChangeLevel = params[_current.pos++];
break;
}
case 15:
{
_imagePr.Group = params[_current.pos++];
break;
}
case 16:
{
_imagePr.fromGroup = params[_current.pos++];
break;
}
case 17:
{ {
_imagePr.severalCharts = params[_current.pos++]; case 0:
break; {
} _imagePr.CanBeFlow = params[_current.pos++];
case 18: break;
{ }
_imagePr.severalChartTypes = params[_current.pos++]; case 1:
break; {
} _imagePr.Width = params[_current.pos++];
case 19: break;
{ }
_imagePr.severalChartStyles = params[_current.pos++]; case 2:
break; {
} _imagePr.Height = params[_current.pos++];
case 20: break;
{ }
_imagePr.verticalTextAlign = params[_current.pos++]; case 3:
break; {
} _imagePr.WrappingStyle = params[_current.pos++];
case 21: break;
{ }
var bIsNeed = params[_current.pos++]; case 4:
{
if (bIsNeed) _imagePr.Paddings = asc_menu_ReadPaddings(params, _current);
break;
}
case 5:
{
_imagePr.Position = asc_menu_ReadPosition(params, _current);
break;
}
case 6:
{
_imagePr.AllowOverlap = params[_current.pos++];
break;
}
case 7:
{
_imagePr.PositionH = asc_menu_ReadImagePosition(params, _current);
break;
}
case 8:
{
_imagePr.PositionV = asc_menu_ReadImagePosition(params, _current);
break;
}
case 9:
{
_imagePr.Internal_Position = params[_current.pos++];
break;
}
case 10:
{
_imagePr.ImageUrl = params[_current.pos++];
break;
}
case 11:
{
_imagePr.Locked = params[_current.pos++];
break;
}
case 12:
{
_imagePr.ChartProperties = asc_menu_ReadChartPr(params, _current);
break;
}
case 13:
{
_imagePr.ShapeProperties = asc_menu_ReadShapePr(params, _current);
break;
}
case 14:
{
_imagePr.ChangeLevel = params[_current.pos++];
break;
}
case 15:
{
_imagePr.Group = params[_current.pos++];
break;
}
case 16:
{
_imagePr.fromGroup = params[_current.pos++];
break;
}
case 17:
{
_imagePr.severalCharts = params[_current.pos++];
break;
}
case 18:
{
_imagePr.severalChartTypes = params[_current.pos++];
break;
}
case 19:
{
_imagePr.severalChartStyles = params[_current.pos++];
break;
}
case 20:
{
_imagePr.verticalTextAlign = params[_current.pos++];
break;
}
case 21:
{ {
var _originSize = this.Native["GetOriginalImageSize"](_imagePr.ImageUrl); var urlSource = selectedImageProp[0].Value.ImageUrl;
var _w = _originSize[0] * 25.4 / 96.0; if (urlSource) {
var _h = _originSize[1] * 25.4 / 96.0; var bIsNeed = params[_current.pos++];
if (bIsNeed)
{
var _originSize = window["native"]["GetOriginalImageSize"](urlSource);
var _w = _originSize[0] * 25.4 / 96.0;
var _h = _originSize[1] * 25.4 / 96.0;
_imagePr.ImageUrl = undefined; _imagePr.ImageUrl = undefined;
// var Page_Width = 210; // var Page_Width = 210;
// var Page_Height = 297; // var Page_Height = 297;
...@@ -5233,32 +5239,32 @@ function offline_apply_event(type,params) { ...@@ -5233,32 +5239,32 @@ function offline_apply_event(type,params) {
// var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin)); // var __w = Math.max(1, _page_width - (_page_x_left_margin + _page_x_right_margin));
// var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin)); // var __h = Math.max(1, _page_height - (_page_y_top_margin + _page_y_bottom_margin));
// //
var wI = (undefined !== _w) ? Math.max(_w * 25.4 / 96.0, 1) : 1; // var wI = (undefined !== _w) ? Math.max(_w * 25.4 / 96.0, 1) : 1;
var hI = (undefined !== _h) ? Math.max(_h * 25.4 / 96.0, 1) : 1; //var hI = (undefined !== _h) ? Math.max(_h * 25.4 / 96.0, 1) : 1;
wI = Math.max(5, Math.min(wI, __w)); // wI = Math.max(5, Math.min(wI, _w));
hI = Math.max(5, Math.min(hI, __h)); //hI = Math.max(5, Math.min(hI, _h));
_imagePr.Width = wI; _imagePr.Width = _w;
_imagePr.Height = hI; _imagePr.Height = _h;
} }
}
break; break;
} }
case 255: case 255:
default: default:
{ {
_continue = false; _continue = false;
break; break;
}
} }
} }
}
var ws = _api.wb.getWorksheet(); ws.objectRender.controller.setGraphicObjectProps(_imagePr);
var objectRender = ws.objectRender;
ws.objectRender.setGraphicObjectProps(_imagePr);
// _api.asc_setGraphicObjectProps(_imagePr); // _api.asc_setGraphicObjectProps(_imagePr);
}
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7