Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
8127d062
Commit
8127d062
authored
Apr 06, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Отладка выставления единиц измерения.
parent
cd160b63
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+2
-2
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+2
-2
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
8127d062
...
@@ -1050,7 +1050,7 @@ define([
...
@@ -1050,7 +1050,7 @@ define([
var
value
=
Common
.
localStorage
.
getItem
(
'
de-settings-unit
'
);
var
value
=
Common
.
localStorage
.
getItem
(
'
de-settings-unit
'
);
value
=
(
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
);
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
));
me
.
api
.
asc_SetDocumentUnits
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
inch
)
?
c_oAscDocumentUnits
.
Inch
:
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
pt
)
?
c_oAscDocumentUnits
.
P
oin
t
:
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
);
...
@@ -1589,7 +1589,7 @@ define([
...
@@ -1589,7 +1589,7 @@ define([
var
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-unit
"
);
var
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-unit
"
);
value
=
(
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
);
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
.
api
.
asc_SetDocumentUnits
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
inch
)
?
c_oAscDocumentUnits
.
Inch
:
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
pt
)
?
c_oAscDocumentUnits
.
P
oin
t
:
c_oAscDocumentUnits
.
Millimeter
));
this
.
getApplication
().
getController
(
'
RightMenu
'
).
updateMetricUnit
();
this
.
getApplication
().
getController
(
'
RightMenu
'
).
updateMetricUnit
();
},
},
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
8127d062
...
@@ -818,7 +818,7 @@ define([
...
@@ -818,7 +818,7 @@ define([
var
value
=
Common
.
localStorage
.
getItem
(
'
pe-settings-unit
'
);
var
value
=
Common
.
localStorage
.
getItem
(
'
pe-settings-unit
'
);
value
=
(
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
);
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
));
me
.
api
.
asc_SetDocumentUnits
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
inch
)
?
c_oAscDocumentUnits
.
Inch
:
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
pt
)
?
c_oAscDocumentUnits
.
P
oin
t
:
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
);
...
@@ -1260,7 +1260,7 @@ define([
...
@@ -1260,7 +1260,7 @@ define([
var
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-unit
"
);
var
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-unit
"
);
value
=
(
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
);
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
.
api
.
asc_SetDocumentUnits
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
inch
)
?
c_oAscDocumentUnits
.
Inch
:
((
value
==
Common
.
Utils
.
Metric
.
c_MetricUnits
.
pt
)
?
c_oAscDocumentUnits
.
P
oin
t
:
c_oAscDocumentUnits
.
Millimeter
));
this
.
getApplication
().
getController
(
'
RightMenu
'
).
updateMetricUnit
();
this
.
getApplication
().
getController
(
'
RightMenu
'
).
updateMetricUnit
();
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment