Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Bug 32279, 32277, 32278

Browse source
This commit is contained in:
Julia Radzhabova 2016-04-21 13:15:15 +03:00
parent 0637ef763b
commit 20ef76ed6d
6 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/resources/less/buttons.less
View file

@ -146,8 +146,8 @@
background-color: @secondary;
}
&:active,
&.active {
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @primary;
color: #fff;
}

24
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -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());
}
}
}
});
});

7
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file

@ -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',

16
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file

@ -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');

15
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file

@ -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',

1
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -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',