Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tom Morris 2014-02-02 12:23:20 -05:00
commit e6bc3a5aa7
2 changed files with 2 additions and 2 deletions

View File

@ -189,7 +189,7 @@ BrowsingEngine.prototype.addFacet = function(type, config, options) {
this._facets.push({ elmt: elmt, facet: facet });
ui.leftPanelTabs.tabs("select", 0);
ui.leftPanelTabs.tabs({ active: 0 });
Refine.update({ engineChanged: true });
};

View File

@ -450,7 +450,7 @@ DataTableCellUI.prototype._previewCandidateTopic = function(candidate, elmt, pre
var id = candidate.id;
var fakeMenu = MenuSystem.createMenu();
fakeMenu
.width(414)
.width(preview.width?preview.width:414)
.addClass('data-table-topic-popup')
.html(DOM.loadHTML("core", "scripts/views/data-table/cell-recon-preview-popup-header.html"));