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
c8dc9804
Commit
c8dc9804
authored
Jun 29, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE][PE] Fix Bug 35041.
parent
c4b1316c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
...presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+6
-0
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
.../spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
+6
-0
No files found.
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file @
c8dc9804
...
@@ -501,6 +501,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
...
@@ -501,6 +501,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
}
}
this
.
btnsCategory
[
2
].
setDisabled
(
null
===
margins
);
// Margins
this
.
btnsCategory
[
2
].
setDisabled
(
null
===
margins
);
// Margins
var
shapetype
=
props
.
asc_getType
();
this
.
btnsCategory
[
3
].
setDisabled
(
shapetype
==
'
line
'
||
shapetype
==
'
bentConnector2
'
||
shapetype
==
'
bentConnector3
'
||
shapetype
==
'
bentConnector4
'
||
shapetype
==
'
bentConnector5
'
||
shapetype
==
'
curvedConnector2
'
||
shapetype
==
'
curvedConnector3
'
||
shapetype
==
'
curvedConnector4
'
||
shapetype
==
'
curvedConnector5
'
||
shapetype
==
'
straightConnector1
'
);
value
=
props
.
asc_getColumnNumber
();
value
=
props
.
asc_getColumnNumber
();
this
.
spnColumns
.
setValue
((
null
!==
value
&&
undefined
!==
value
)
?
value
:
''
,
true
);
this
.
spnColumns
.
setValue
((
null
!==
value
&&
undefined
!==
value
)
?
value
:
''
,
true
);
...
...
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file @
c8dc9804
...
@@ -535,6 +535,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
...
@@ -535,6 +535,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
}
}
this
.
btnsCategory
[
2
].
setDisabled
(
null
===
margins
);
// Margins
this
.
btnsCategory
[
2
].
setDisabled
(
null
===
margins
);
// Margins
var
shapetype
=
shapeprops
.
asc_getType
();
this
.
btnsCategory
[
3
].
setDisabled
(
shapetype
==
'
line
'
||
shapetype
==
'
bentConnector2
'
||
shapetype
==
'
bentConnector3
'
||
shapetype
==
'
bentConnector4
'
||
shapetype
==
'
bentConnector5
'
||
shapetype
==
'
curvedConnector2
'
||
shapetype
==
'
curvedConnector3
'
||
shapetype
==
'
curvedConnector4
'
||
shapetype
==
'
curvedConnector5
'
||
shapetype
==
'
straightConnector1
'
);
value
=
shapeprops
.
asc_getColumnNumber
();
value
=
shapeprops
.
asc_getColumnNumber
();
this
.
spnColumns
.
setValue
((
null
!==
value
&&
undefined
!==
value
)
?
value
:
''
,
true
);
this
.
spnColumns
.
setValue
((
null
!==
value
&&
undefined
!==
value
)
?
value
:
''
,
true
);
...
...
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