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
20ef76ed
Commit
20ef76ed
authored
Apr 21, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Bug 32279, 32277, 32278
parent
0637ef76
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
29 deletions
+38
-29
apps/common/main/resources/less/buttons.less
apps/common/main/resources/less/buttons.less
+2
-2
apps/spreadsheeteditor/main/app/controller/RightMenu.js
apps/spreadsheeteditor/main/app/controller/RightMenu.js
+22
-2
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
+7
-0
apps/spreadsheeteditor/main/app/view/RightMenu.js
apps/spreadsheeteditor/main/app/view/RightMenu.js
+0
-16
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
+6
-9
apps/spreadsheeteditor/main/app/view/TableSettings.js
apps/spreadsheeteditor/main/app/view/TableSettings.js
+1
-0
No files found.
apps/common/main/resources/less/buttons.less
View file @
20ef76ed
...
...
@@ -146,8 +146,8 @@
background-color: @secondary;
}
&:active,
&.active {
&:active
:not(.disabled)
,
&.active
:not(.disabled)
{
background-color: @primary;
color: #fff;
}
...
...
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @
20ef76ed
...
...
@@ -219,8 +219,7 @@ define([
},
onCoAuthoringDisconnect
:
function
()
{
if
(
this
.
rightmenu
)
this
.
rightmenu
.
SetDisabled
(
''
,
true
,
true
);
this
.
SetDisabled
(
true
);
this
.
setMode
({
isEdit
:
false
});
},
...
...
@@ -298,6 +297,27 @@ define([
case
Asc
.
c_oAscTypeSelectElement
.
Image
:
return
Common
.
Utils
.
documentSettingsType
.
Image
;
}
},
SetDisabled
:
function
(
disabled
)
{
if
(
this
.
rightmenu
)
{
this
.
rightmenu
.
paragraphSettings
.
disableControls
(
disabled
);
this
.
rightmenu
.
shapeSettings
.
disableControls
(
disabled
);
this
.
rightmenu
.
imageSettings
.
disableControls
(
disabled
);
this
.
rightmenu
.
chartSettings
.
disableControls
(
disabled
);
this
.
rightmenu
.
tableSettings
.
disableControls
(
disabled
);
if
(
disabled
)
{
this
.
rightmenu
.
btnText
.
setDisabled
(
disabled
);
this
.
rightmenu
.
btnTable
.
setDisabled
(
disabled
);
this
.
rightmenu
.
btnImage
.
setDisabled
(
disabled
);
this
.
rightmenu
.
btnShape
.
setDisabled
(
disabled
);
this
.
rightmenu
.
btnTextArt
.
setDisabled
(
disabled
);
this
.
rightmenu
.
btnChart
.
setDisabled
(
disabled
);
}
else
{
this
.
onSelectionChanged
(
this
.
api
.
asc_getCellInfo
());
}
}
}
});
});
\ No newline at end of file
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file @
20ef76ed
...
...
@@ -142,6 +142,8 @@ define([
if
(
this
.
api
)
this
.
api
.
asc_setSelectionDialogMode
(
Asc
.
c_oAscSelectionDialogType
.
None
);
Common
.
NotificationCenter
.
trigger
(
'
cells:range
'
,
Asc
.
c_oAscSelectionDialogType
.
None
);
SSE
.
getController
(
'
RightMenu
'
).
SetDisabled
(
false
);
},
onKeyPress
:
function
(
event
)
{
...
...
@@ -162,6 +164,11 @@ define([
this
.
close
();
},
show
:
function
()
{
Common
.
UI
.
Window
.
prototype
.
show
.
call
(
this
);
SSE
.
getController
(
'
RightMenu
'
).
SetDisabled
(
true
);
},
txtTitle
:
'
Select Data Range
'
,
textCancel
:
'
Cancel
'
,
txtEmpty
:
'
This field is required
'
,
...
...
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file @
20ef76ed
...
...
@@ -237,22 +237,6 @@ define([
return
(
this
.
minimizedMode
)
?
null
:
$
(
"
.settings-panel.active
"
)[
0
].
id
;
},
SetDisabled
:
function
(
id
,
disabled
,
all
)
{
if
(
all
)
{
this
.
paragraphSettings
.
disableControls
(
disabled
);
this
.
shapeSettings
.
disableControls
(
disabled
);
this
.
imageSettings
.
disableControls
(
disabled
);
this
.
chartSettings
.
disableControls
(
disabled
);
this
.
tableSettings
.
disableControls
(
disabled
);
}
else
{
var
cmp
=
$
(
"
#
"
+
id
);
if
(
disabled
!==
cmp
.
hasClass
(
'
disabled
'
))
{
cmp
.
toggleClass
(
'
disabled
'
,
disabled
);
(
disabled
)
?
cmp
.
attr
({
disabled
:
disabled
})
:
cmp
.
removeAttr
(
'
disabled
'
);
}
}
},
clearSelection
:
function
()
{
var
target_pane
=
$
(
"
.right-panel
"
);
target_pane
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
...
...
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file @
20ef76ed
...
...
@@ -179,9 +179,10 @@ define([
onClose
:
function
(
event
)
{
if
(
this
.
api
)
this
.
api
.
asc_setSelectionDialogMode
(
Asc
.
c_oAscSelectionDialogType
.
None
);
Common
.
NotificationCenter
.
trigger
(
'
cells:range
'
,
Asc
.
c_oAscSelectionDialogType
.
None
);
Common
.
NotificationCenter
.
trigger
(
'
edit:complete
'
,
this
);
SSE
.
getController
(
'
RightMenu
'
).
SetDisabled
(
false
);
},
onKeyPress
:
function
(
event
)
{
...
...
@@ -202,14 +203,10 @@ define([
this
.
close
();
},
// show: function () {
// Common.UI.Window.prototype.show.call(this);
//
// var me = this;
// _.delay(function () {
// me.inputRange.cmpEl.find('input').focus();
// }, 500, me);
// },
show
:
function
()
{
Common
.
UI
.
Window
.
prototype
.
show
.
call
(
this
);
SSE
.
getController
(
'
RightMenu
'
).
SetDisabled
(
true
);
},
txtTitle
:
'
Title
'
,
txtFormat
:
'
Create table
'
,
...
...
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file @
20ef76ed
...
...
@@ -137,6 +137,7 @@ define([
el
:
$
(
'
#table-btn-select-data
'
)
});
this
.
btnSelectData
.
on
(
'
click
'
,
_
.
bind
(
this
.
onSelectData
,
this
));
this
.
lockedControls
.
push
(
this
.
btnSelectData
);
this
.
btnEdit
=
new
Common
.
UI
.
Button
({
cls
:
'
btn-icon-default
'
,
...
...
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