Revert "Merge pull request #1877 from lukasolson/issue-1874"

This reverts commit 34466c6a35, reversing
changes made to 5cad53f5f0.

src/kibana/plugins/discover/directives/table_row.js

@@ -66,13 +66,7 @@ define(function (require) {
           }
 
           // The fields to loop over
-          if (!row._fields) {
-            row._fields = _.union(
-              _.keys(row._source),
-              config.get('metaFields')
-            );
-            row._fields.sort();
-          }
+          row._fields = row._fields || _.keys(row._source).concat(config.get('metaFields')).sort();
           row._mode = 'table';
 
           // empty the details and rebuild it

test/unit/specs/apps/discover/directives/table.js

@@ -26,7 +26,7 @@ define(function (require) {
     timestamp: {
       indexed: true,
       type: 'date'
-    }
+    },
   };
 
   // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
@@ -357,50 +357,6 @@ define(function (require) {
       });
     });
 
-    describe('kbnTableRow meta', function () {
-      var $elem = angular.element(
-          '<tr kbn-table-row="row" ' +
-          'columns="columns" ' +
-          'sorting="sorting"' +
-          'filtering="filtering"' +
-          'mapping="mapping"' +
-          'timefield="timefield" ' +
-          '></tr>'
-      );
-      var $details;
-
-      beforeEach(function () {
-        var row = getFakeRow(0, mapping);
-        mapping._id = {indexed: true, type: 'string'};
-        row._source._id = 'foo';
-
-        init($elem, {
-          row: row,
-          columns: [],
-          sorting: [],
-          filtering: sinon.spy(),
-          maxLength: 50,
-          mapping: mapping
-        });
-
-        sinon.stub(config, 'get').withArgs('metaFields').returns(['_id']);
-
-        // Open the row
-        $scope.toggleRow();
-        $scope.$digest();
-        $details = $elem.next();
-      });
-
-      afterEach(function () {
-        delete mapping._id;
-        destroy();
-      });
-
-      it('should render even when the row source contains a field with the same name as a meta field', function () {
-        expect($details.find('tr').length).to.be(4);
-      });
-    });
-
     describe('row diffing', function () {
       var $row;
       var $scope;