',
- '
">
',
- '
<%= Common.Utils.String.htmlEncode(name) %>
',
- '
<%= scopeName %>
',
- '
<%= range %>
',
- '<% if (lock) { %>',
- '
<%=lockuser%>
',
- '<% } %>',
+ '
',
+ '
',
+ '
<%= index+1 %>
',
+ '
',
+ '',
+ '
',
+ '
<%= Common.Utils.String.htmlEncode(name) %>
',
+ '
<%= fields %>
',
'
'
].join('')),
tabindex: 1
});
- this.rolesList.store.comparator = function(item1, item2) {
- var n1 = item1.get(me.sort.type).toLowerCase(),
- n2 = item2.get(me.sort.type).toLowerCase();
- if (n1==n2) return 0;
- return (n1
0) {
- if (selectedItem===undefined || selectedItem===null) selectedItem = 0;
- if (_.isNumber(selectedItem)) {
- if (selectedItem>val-1) selectedItem = val-1;
- this.rolesList.selectByIndex(selectedItem);
- setTimeout(function() {
- me.rolesList.scrollToRecord(store.at(selectedItem));
- }, 50);
-
- } else if (selectedItem){ // object
- var rec = store.findWhere({name: selectedItem.asc_getName(true), scope: selectedItem.asc_getScope()});
- if (rec) {
- this.rolesList.selectRecord(rec);
- setTimeout(function() {
- me.rolesList.scrollToRecord(rec);
- }, 50);
- }
- }
+ if (this.rolesList.store.length>0) {
+ var me = this;
+ this.rolesList.selectByIndex(0);
+ setTimeout(function() {
+ me.rolesList.scrollToRecord(me.rolesList.store.at(0));
+ }, 50);
}
- _.delay(function () {
- me.rolesList.scroller.update({alwaysVisibleY: true});
- }, 100, this);
this.updateButtons();
},
+ refreshRolesIndexes: function() {
+ this.rolesList.store.each(function(item, index) {
+ item.set('index', index);
+ });
+ },
+
+ getIconCls: function(index) {
+ return (index===0) ? 'btn-arrow-up' : (index===this.rolesList.store.length-1 ? 'btn-arrow-down' : 'btn-border-insidevert');
+ },
+
onEditRole: function (isEdit) {
if (this._isWarningVisible) return;
- if (this.locked) {
- Common.NotificationCenter.trigger('namedrange:locked');
- return;
- }
var me = this,
xy = me.$window.offset(),
rec = this.rolesList.getSelectedRec(),
@@ -238,10 +213,26 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
isEdit : isEdit,
handler : function(result, settings) {
if (result == 'ok' && settings) {
+ var color = settings.color,
+ name = settings.name,
+ store = me.rolesList.store;
if (isEdit) {
- me.api.asc_editRole(settings);
+ // me.api.asc_editRole(settings);
+ rec.set('name', name);
+ rec.set('color', color);
} else {
- me.api.asc_addRole(settings);
+ // me.api.asc_addRole(settings);
+ rec = store.push({
+ name: name,
+ color: color,
+ fields: 0,
+ index: store.length,
+ scope: me
+ });
+ if (rec) {
+ me.rolesList.selectRecord(rec);
+ me.rolesList.scrollToRecord(rec);
+ }
}
}
}
@@ -258,21 +249,27 @@ define([ 'text!documenteditor/main/app/template/RolesManagerDlg.template',
onDeleteRole: function () {
var rec = this.rolesList.getSelectedRec();
if (rec) {
- var me = this;
+ var me = this,
+ store = this.rolesList.store;
me._isWarningVisible = true;
Common.UI.warning({
msg: Common.Utils.String.format(me.warnDelete, rec.get('name')),
buttons: ['ok', 'cancel'],
callback: function(btn) {
if (btn == 'ok') {
- me.api.asc_delRole(rec.get('name'));
+ var index = store.indexOf(rec);
+ // me.api.asc_delRole(rec.get('name'));
+ store.remove(rec);
+ me.refreshRolesIndexes();
+ (store.length>0) && me.rolesList.selectByIndex(index div{
+ vertical-align: middle;
+ display: inline-block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: pre;
+ }
+
+ .listitem-icon {
+ width: 20px;
+ height: 20px;
+ vertical-align: middle;
+ margin-right: 5px;
+ }
+
+ .selected {
+ .listitem-icon {
+ background-position-x: -20px;
+ background-position-x: @button-small-active-icon-offset-x;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
index 6447d327f..1f2fad620 100644
--- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
+++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less
@@ -59,6 +59,42 @@
}
}
}
+
+ .range-tableview {
+ .list-item > div{
+ vertical-align: middle;
+ display: inline-block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: pre;
+ }
+
+ .listitem-icon {
+ width: 20px;
+ height: 20px;
+ vertical-align: middle;
+ margin-right: 5px;
+ }
+
+ .selected {
+ .listitem-icon {
+ background-position-x: -20px;
+ background-position-x: @button-small-active-icon-offset-x;
+ }
+ }
+
+ .lock-user {
+ position: absolute;
+ right: 2px;
+ min-width: 100px;
+ max-width: 150px;
+ height: 20px;
+ padding: 2px 10px;
+ background-color: #EE3525;
+ color: #fff;
+ text-align: center;
+ }
+ }
}
#sort-dialog-btn-down {