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
b2c3707a
Commit
b2c3707a
authored
Dec 27, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] [PE] Change tooltip for Insert Chart button in the toolbar when chart is selected.
parent
96dba54f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
5 deletions
+23
-5
apps/documenteditor/main/app/controller/Toolbar.js
apps/documenteditor/main/app/controller/Toolbar.js
+7
-1
apps/documenteditor/main/app/view/Toolbar.js
apps/documenteditor/main/app/view/Toolbar.js
+2
-1
apps/documenteditor/main/locale/en.json
apps/documenteditor/main/locale/en.json
+1
-0
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+10
-2
apps/presentationeditor/main/app/view/Toolbar.js
apps/presentationeditor/main/app/view/Toolbar.js
+2
-1
apps/presentationeditor/main/locale/en.json
apps/presentationeditor/main/locale/en.json
+1
-0
No files found.
apps/documenteditor/main/app/controller/Toolbar.js
View file @
b2c3707a
...
@@ -93,7 +93,8 @@ define([
...
@@ -93,7 +93,8 @@ define([
can_copycut
:
undefined
,
can_copycut
:
undefined
,
pgmargins
:
undefined
,
pgmargins
:
undefined
,
fontsize
:
undefined
,
fontsize
:
undefined
,
in_equation
:
false
in_equation
:
false
,
in_chart
:
false
};
};
this
.
flg
=
{};
this
.
flg
=
{};
this
.
diagramEditor
=
null
;
this
.
diagramEditor
=
null
;
...
@@ -685,6 +686,11 @@ define([
...
@@ -685,6 +686,11 @@ define([
if
((
need_disable
||
in_image
)
!=
toolbar
.
mnuInsertTextArt
.
isDisabled
())
if
((
need_disable
||
in_image
)
!=
toolbar
.
mnuInsertTextArt
.
isDisabled
())
toolbar
.
mnuInsertTextArt
.
setDisabled
(
need_disable
||
in_image
);
toolbar
.
mnuInsertTextArt
.
setDisabled
(
need_disable
||
in_image
);
if
(
in_chart
!==
this
.
_state
.
in_chart
)
{
toolbar
.
btnInsertChart
.
updateHint
(
in_chart
?
toolbar
.
tipChangeChart
:
toolbar
.
tipInsertChart
);
this
.
_state
.
in_chart
=
in_chart
;
}
need_disable
=
in_chart
&&
image_locked
||
!
in_chart
&&
need_disable
;
need_disable
=
in_chart
&&
image_locked
||
!
in_chart
&&
need_disable
;
if
(
need_disable
!=
toolbar
.
btnInsertChart
.
isDisabled
())
if
(
need_disable
!=
toolbar
.
btnInsertChart
.
isDisabled
())
toolbar
.
btnInsertChart
.
setDisabled
(
need_disable
);
toolbar
.
btnInsertChart
.
setDisabled
(
need_disable
);
...
...
apps/documenteditor/main/app/view/Toolbar.js
View file @
b2c3707a
...
@@ -1958,7 +1958,8 @@ define([
...
@@ -1958,7 +1958,8 @@ define([
mniInsFootnote
:
'
Insert Footnote
'
,
mniInsFootnote
:
'
Insert Footnote
'
,
mniDelFootnote
:
'
Delete All Footnotes
'
,
mniDelFootnote
:
'
Delete All Footnotes
'
,
mniNoteSettings
:
'
Notes Settings
'
,
mniNoteSettings
:
'
Notes Settings
'
,
textGotoFootnote
:
'
Go to Footnotes
'
textGotoFootnote
:
'
Go to Footnotes
'
,
tipChangeChart
:
'
Change Chart Type
'
},
DE
.
Views
.
Toolbar
||
{}));
},
DE
.
Views
.
Toolbar
||
{}));
});
});
apps/documenteditor/main/locale/en.json
View file @
b2c3707a
...
@@ -1520,6 +1520,7 @@
...
@@ -1520,6 +1520,7 @@
"DE.Views.Toolbar.tipAlignLeft"
:
"Align Left"
,
"DE.Views.Toolbar.tipAlignLeft"
:
"Align Left"
,
"DE.Views.Toolbar.tipAlignRight"
:
"Align Right"
,
"DE.Views.Toolbar.tipAlignRight"
:
"Align Right"
,
"DE.Views.Toolbar.tipBack"
:
"Back"
,
"DE.Views.Toolbar.tipBack"
:
"Back"
,
"DE.Views.Toolbar.tipChangeChart"
:
"Change Chart Type"
,
"DE.Views.Toolbar.tipClearStyle"
:
"Clear Style"
,
"DE.Views.Toolbar.tipClearStyle"
:
"Clear Style"
,
"DE.Views.Toolbar.tipColorSchemas"
:
"Change Color Scheme"
,
"DE.Views.Toolbar.tipColorSchemas"
:
"Change Color Scheme"
,
"DE.Views.Toolbar.tipColumns"
:
"Insert columns"
,
"DE.Views.Toolbar.tipColumns"
:
"Insert columns"
,
...
...
apps/presentationeditor/main/app/controller/Toolbar.js
View file @
b2c3707a
...
@@ -95,7 +95,8 @@ define([
...
@@ -95,7 +95,8 @@ define([
zoom_type
:
undefined
,
zoom_type
:
undefined
,
zoom_percent
:
undefined
,
zoom_percent
:
undefined
,
fontsize
:
undefined
,
fontsize
:
undefined
,
in_equation
:
undefined
in_equation
:
undefined
,
in_chart
:
false
};
};
this
.
_isAddingShape
=
false
;
this
.
_isAddingShape
=
false
;
this
.
slideSizeArr
=
[
this
.
slideSizeArr
=
[
...
@@ -570,7 +571,8 @@ define([
...
@@ -570,7 +571,8 @@ define([
no_paragraph
=
true
,
no_paragraph
=
true
,
no_text
=
true
,
no_text
=
true
,
no_object
=
true
,
no_object
=
true
,
in_equation
=
false
;
in_equation
=
false
,
in_chart
=
false
;
while
(
++
i
<
selectedObjects
.
length
)
{
while
(
++
i
<
selectedObjects
.
length
)
{
type
=
selectedObjects
[
i
].
get_ObjectType
();
type
=
selectedObjects
[
i
].
get_ObjectType
();
...
@@ -589,11 +591,17 @@ define([
...
@@ -589,11 +591,17 @@ define([
if
(
type
!==
Asc
.
c_oAscTypeSelectElement
.
Image
)
{
if
(
type
!==
Asc
.
c_oAscTypeSelectElement
.
Image
)
{
no_text
=
false
;
no_text
=
false
;
}
}
in_chart
=
type
==
Asc
.
c_oAscTypeSelectElement
.
Chart
;
}
else
if
(
type
===
Asc
.
c_oAscTypeSelectElement
.
Math
)
{
}
else
if
(
type
===
Asc
.
c_oAscTypeSelectElement
.
Math
)
{
in_equation
=
true
;
in_equation
=
true
;
}
}
}
}
if
(
in_chart
!==
this
.
_state
.
in_chart
)
{
this
.
toolbar
.
btnInsertChart
.
updateHint
(
in_chart
?
this
.
toolbar
.
tipChangeChart
:
this
.
toolbar
.
tipInsertChart
);
this
.
_state
.
in_chart
=
in_chart
;
}
if
(
paragraph_locked
!==
undefined
&&
this
.
_state
.
prcontrolsdisable
!==
paragraph_locked
)
{
if
(
paragraph_locked
!==
undefined
&&
this
.
_state
.
prcontrolsdisable
!==
paragraph_locked
)
{
if
(
this
.
_state
.
activated
)
this
.
_state
.
prcontrolsdisable
=
paragraph_locked
;
if
(
this
.
_state
.
activated
)
this
.
_state
.
prcontrolsdisable
=
paragraph_locked
;
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
paragraphLock
,
paragraph_locked
,
{
array
:
me
.
toolbar
.
paragraphControls
});
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
paragraphLock
,
paragraph_locked
,
{
array
:
me
.
toolbar
.
paragraphControls
});
...
...
apps/presentationeditor/main/app/view/Toolbar.js
View file @
b2c3707a
...
@@ -1713,6 +1713,7 @@ define([
...
@@ -1713,6 +1713,7 @@ define([
textShowCurrent
:
'
Show from Current slide
'
,
textShowCurrent
:
'
Show from Current slide
'
,
textShowSettings
:
'
Show Settings
'
,
textShowSettings
:
'
Show Settings
'
,
tipInsertEquation
:
'
Insert Equation
'
,
tipInsertEquation
:
'
Insert Equation
'
,
textCharts
:
'
Charts
'
textCharts
:
'
Charts
'
,
tipChangeChart
:
'
Change Chart Type
'
},
PE
.
Views
.
Toolbar
||
{}));
},
PE
.
Views
.
Toolbar
||
{}));
});
});
\ No newline at end of file
apps/presentationeditor/main/locale/en.json
View file @
b2c3707a
...
@@ -1233,6 +1233,7 @@
...
@@ -1233,6 +1233,7 @@
"PE.Views.Toolbar.tipAddSlide"
:
"Add Slide"
,
"PE.Views.Toolbar.tipAddSlide"
:
"Add Slide"
,
"PE.Views.Toolbar.tipAdvSettings"
:
"Advanced Settings"
,
"PE.Views.Toolbar.tipAdvSettings"
:
"Advanced Settings"
,
"PE.Views.Toolbar.tipBack"
:
"Back"
,
"PE.Views.Toolbar.tipBack"
:
"Back"
,
"PE.Views.Toolbar.tipChangeChart"
:
"Change Chart Type"
,
"PE.Views.Toolbar.tipChangeSlide"
:
"Change Slide Layout"
,
"PE.Views.Toolbar.tipChangeSlide"
:
"Change Slide Layout"
,
"PE.Views.Toolbar.tipClearStyle"
:
"Clear Style"
,
"PE.Views.Toolbar.tipClearStyle"
:
"Clear Style"
,
"PE.Views.Toolbar.tipColorSchemas"
:
"Change Color Scheme"
,
"PE.Views.Toolbar.tipColorSchemas"
:
"Change Color Scheme"
,
...
...
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