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

[DE] [PE] Выставление единиц измерения в сдк.

Browse source
This commit is contained in:
Julia Radzhabova 2016-04-06 18:18:40 +03:00
parent de6b5dc3e3
commit cd160b63b8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1048,7 +1048,9 @@ define([
} }
var value = Common.localStorage.getItem('de-settings-unit'); var value = Common.localStorage.getItem('de-settings-unit');
Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
Common.Utils.Metric.setCurrentMetric(value);
me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
value = Common.localStorage.getItem('de-hidden-rulers'); value = Common.localStorage.getItem('de-hidden-rulers');
me.api.asc_SetViewRulers(value===null || parseInt(value) === 0); me.api.asc_SetViewRulers(value===null || parseInt(value) === 0);
@ -1585,7 +1587,9 @@ define([
unitsChanged: function(m) { unitsChanged: function(m) {
var value = Common.localStorage.getItem("de-settings-unit"); var value = Common.localStorage.getItem("de-settings-unit");
Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
Common.Utils.Metric.setCurrentMetric(value);
this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('RightMenu').updateMetricUnit();
}, },

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

@ -816,7 +816,9 @@ define([
} }
var value = Common.localStorage.getItem('pe-settings-unit'); var value = Common.localStorage.getItem('pe-settings-unit');
Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
Common.Utils.Metric.setCurrentMetric(value);
me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
value = Common.localStorage.getItem('pe-hidden-rulers'); value = Common.localStorage.getItem('pe-hidden-rulers');
if (me.api.asc_SetViewRulers) me.api.asc_SetViewRulers(value===null || parseInt(value) === 0); if (me.api.asc_SetViewRulers) me.api.asc_SetViewRulers(value===null || parseInt(value) === 0);
@ -1256,7 +1258,9 @@ define([
unitsChanged: function(m) { unitsChanged: function(m) {
var value = Common.localStorage.getItem("pe-settings-unit"); var value = Common.localStorage.getItem("pe-settings-unit");
Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
Common.Utils.Metric.setCurrentMetric(value);
this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
this.getApplication().getController('RightMenu').updateMetricUnit(); this.getApplication().getController('RightMenu').updateMetricUnit();
}, },