Commit 20ef76ed authored by Julia Radzhabova's avatar Julia Radzhabova

[SSE] Bug 32279, 32277, 32278

parent 0637ef76
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
background-color: @secondary; background-color: @secondary;
} }
&:active, &:active:not(.disabled),
&.active { &.active:not(.disabled) {
background-color: @primary; background-color: @primary;
color: #fff; color: #fff;
} }
......
...@@ -219,8 +219,7 @@ define([ ...@@ -219,8 +219,7 @@ define([
}, },
onCoAuthoringDisconnect: function() { onCoAuthoringDisconnect: function() {
if (this.rightmenu) this.SetDisabled(true);
this.rightmenu.SetDisabled('', true, true);
this.setMode({isEdit: false}); this.setMode({isEdit: false});
}, },
...@@ -298,6 +297,27 @@ define([ ...@@ -298,6 +297,27 @@ define([
case Asc.c_oAscTypeSelectElement.Image: case Asc.c_oAscTypeSelectElement.Image:
return Common.Utils.documentSettingsType.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
...@@ -142,6 +142,8 @@ define([ ...@@ -142,6 +142,8 @@ define([
if (this.api) if (this.api)
this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None);
SSE.getController('RightMenu').SetDisabled(false);
}, },
onKeyPress: function(event) { onKeyPress: function(event) {
...@@ -162,6 +164,11 @@ define([ ...@@ -162,6 +164,11 @@ define([
this.close(); this.close();
}, },
show: function () {
Common.UI.Window.prototype.show.call(this);
SSE.getController('RightMenu').SetDisabled(true);
},
txtTitle : 'Select Data Range', txtTitle : 'Select Data Range',
textCancel : 'Cancel', textCancel : 'Cancel',
txtEmpty : 'This field is required', txtEmpty : 'This field is required',
......
...@@ -237,22 +237,6 @@ define([ ...@@ -237,22 +237,6 @@ define([
return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id; 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() { clearSelection: function() {
var target_pane = $(".right-panel"); var target_pane = $(".right-panel");
target_pane.find('> .active').removeClass('active'); target_pane.find('> .active').removeClass('active');
......
...@@ -179,9 +179,10 @@ define([ ...@@ -179,9 +179,10 @@ define([
onClose: function(event) { onClose: function(event) {
if (this.api) if (this.api)
this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None);
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);
SSE.getController('RightMenu').SetDisabled(false);
}, },
onKeyPress: function(event) { onKeyPress: function(event) {
...@@ -202,14 +203,10 @@ define([ ...@@ -202,14 +203,10 @@ define([
this.close(); this.close();
}, },
// show: function () { show: function () {
// Common.UI.Window.prototype.show.call(this); Common.UI.Window.prototype.show.call(this);
// SSE.getController('RightMenu').SetDisabled(true);
// var me = this; },
// _.delay(function () {
// me.inputRange.cmpEl.find('input').focus();
// }, 500, me);
// },
txtTitle : 'Title', txtTitle : 'Title',
txtFormat : 'Create table', txtFormat : 'Create table',
......
...@@ -137,6 +137,7 @@ define([ ...@@ -137,6 +137,7 @@ define([
el: $('#table-btn-select-data') el: $('#table-btn-select-data')
}); });
this.btnSelectData.on('click', _.bind(this.onSelectData, this)); this.btnSelectData.on('click', _.bind(this.onSelectData, this));
this.lockedControls.push(this.btnSelectData);
this.btnEdit = new Common.UI.Button({ this.btnEdit = new Common.UI.Button({
cls: 'btn-icon-default', cls: 'btn-icon-default',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment