s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

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

2
main/webapp/modules/core/scripts/views/data-table/cell-ui.js
View File

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