Commit 807fb70d authored by Alexander.Trofimov's avatar Alexander.Trofimov

asc_removeField change argument from field to index

parent 4d86a683
...@@ -2742,7 +2742,7 @@ CT_pivotTableDefinition.prototype.asc_addPageField = function (api, index) { ...@@ -2742,7 +2742,7 @@ CT_pivotTableDefinition.prototype.asc_addPageField = function (api, index) {
var pivotField = t.asc_getPivotFields()[index]; var pivotField = t.asc_getPivotFields()[index];
if (pivotField) { if (pivotField) {
if (c_oAscAxis.AxisPage !== pivotField.axis) { if (c_oAscAxis.AxisPage !== pivotField.axis) {
t.removeField(t.pageFields.getField(index)); t.removeField(index);
} else { } else {
// ToDo move to end ? // ToDo move to end ?
} }
...@@ -2760,14 +2760,14 @@ CT_pivotTableDefinition.prototype.asc_addPageField = function (api, index) { ...@@ -2760,14 +2760,14 @@ CT_pivotTableDefinition.prototype.asc_addPageField = function (api, index) {
} }
}); });
}; };
CT_pivotTableDefinition.prototype.asc_removeField = function (api, field) { CT_pivotTableDefinition.prototype.asc_removeField = function (api, index) {
var t = this; var t = this;
api._changePivotStyle(this, function () { api._changePivotStyle(this, function () {
t.removeField(field); t.removeField(index);
}); });
}; };
CT_pivotTableDefinition.prototype.removeField = function (field) { CT_pivotTableDefinition.prototype.removeField = function (index) {
var pivotField = this.asc_getPivotFields()[field.asc_getIndex()]; var pivotField = this.asc_getPivotFields()[index];
switch(pivotField.axis) { switch(pivotField.axis) {
case c_oAscAxis.AxisRow: case c_oAscAxis.AxisRow:
break; break;
...@@ -4333,17 +4333,14 @@ CT_PageFields.prototype.add = function (newContext) { ...@@ -4333,17 +4333,14 @@ CT_PageFields.prototype.add = function (newContext) {
this.count = this.pageField.length; this.count = this.pageField.length;
}; };
CT_PageFields.prototype.remove = function (field) { CT_PageFields.prototype.remove = function (field) {
var index = this.pageField.indexOf(field); var index = this.pageField.findIndex(function (element) {
return element.asc_getIndex() === index;
});
if (-1 !== index) { if (-1 !== index) {
this.pageField.splice(index, 1); this.pageField.splice(index, 1);
} }
this.count = this.pageField.length; this.count = this.pageField.length;
}; };
CT_PageFields.prototype.getField = function (index) {
return this.pageField.find(function (element) {
return element.asc_getIndex() === index;
});
};
function CT_DataFields() { function CT_DataFields() {
//Attributes //Attributes
this.count = null; this.count = null;
......
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