Revert "Trigger prepareLookupCall events in SmartColumns"
This reverts commit d1bbfbf6
It breaks existing code. Existing prepareLookup event handlers may
read the selected row which is not necessarily set. We need to find
a solution for that case first.
diff --git a/eclipse-scout-core/src/table/columns/SmartColumn.js b/eclipse-scout-core/src/table/columns/SmartColumn.js
index 4bfa35e..30322f9 100644
--- a/eclipse-scout-core/src/table/columns/SmartColumn.js
+++ b/eclipse-scout-core/src/table/columns/SmartColumn.js
@@ -92,9 +92,6 @@
return this._batchFormatValue(value);
}
- this.trigger('prepareLookupCall', {
- lookupCall: this.lookupCall
- });
return this.lookupCall.textByKey(value);
}
@@ -122,9 +119,6 @@
this._lookupCallBatchContext = null;
// batch lookup texts
- this.trigger('prepareLookupCall', {
- lookupCall: this.lookupCall
- });
this.lookupCall.textsByKeys(Object.keys(currentBatchContext.keySet)).then(function(textMap) {
// resolve result in current batch context
batchResult.resolve(textMap);
diff --git a/eclipse-scout-core/test/table/columns/SmartColumnSpec.js b/eclipse-scout-core/test/table/columns/SmartColumnSpec.js
index a9ae08c..c91e325 100644
--- a/eclipse-scout-core/test/table/columns/SmartColumnSpec.js
+++ b/eclipse-scout-core/test/table/columns/SmartColumnSpec.js
@@ -148,48 +148,4 @@
});
});
- /**
- * The LookupCall must trigger an prepareLookupCall Event.
- */
- it('must trigger an "prepareLookupCall" event.', function() {
- var table = helper.createTable({
- columns: [{
- objectType: 'SmartColumn'
- }]
- });
-
- var lookupCall = scout.create('LookupCall', {session: session, batch: true});
- table.columns[0].setLookupCall(lookupCall);
-
- var counter = 0;
- table.columns[0].on('prepareLookupCall', function(event) {
- counter++;
- expect(event.lookupCall.id).toBe(table.columns[0].lookupCall.id);
- expect(event.type).toBe('prepareLookupCall');
- expect(event.source).toBe(table.columns[0]);
- });
-
- var valueMap = {key1: 'Value 1', key2: 'Value 2', key3: 'Value 3'};
- spyOn(lookupCall, 'textsByKeys').and.returnValue($.resolvedPromise(valueMap));
- spyOn(lookupCall, 'textByKey').and.callFake(function(key) {
- return $.resolvedPromise(valueMap[key]);
- });
-
- var getRow = function(key) {
- return {cells: [key]};
- };
-
- table.insertRows(Object.keys(valueMap).map(getRow));
- table.render();
- jasmine.clock().tick(500);
- expect(counter).toBe(1); // Batch lookup
-
- lookupCall.batch = false;
- counter = 0;
- table.deleteAllRows();
- table.insertRows(Object.keys(valueMap).map(getRow));
- jasmine.clock().tick(500);
- expect(counter).toBe(3); // Key lookups
- });
-
});
