Embedded page entrypoints, bundling.

This commit is contained in:
Dannon Baker
2017-12-12 15:44:31 -05:00
parent 55afdb1b25
commit 3543cd3174
2 changed files with 8 additions and 8 deletions
+5 -2
View File
@@ -11,13 +11,14 @@ import Modal from "mvc/ui/ui-modal";
import pagesEditorOnload from "galaxy.pages";
import Data from "mvc/dataset/data";
import History from "mvc/history/history-model";
import HistoryContents from "mvc/history/history-contents";
import MultiPanel from "mvc/history/multi-panel";
import HistoryView from "mvc/history/history-view";
import HistoryViewEdit from "mvc/history/history-view-edit";
import HistoryCopyDialog from "mvc/history/copy-dialog";
import addLogging from "utils/add-logging";
if (window.Galaxy && window.Galaxy.debug === undefined){
if (window.Galaxy && window.Galaxy.debug === undefined) {
//TODO: (kind of a temporary hack?) Must have Galaxy.logging for some of the imports
//here; remove when imports are all fixed.
addLogging(window.Galaxy, "GalaxyApp");
@@ -168,7 +169,9 @@ export const bundleEntries = {
phyloviz: Phyloviz.PhylovizView,
createTabularDatasetChunkedView: Data.createTabularDatasetChunkedView,
multiHistory: multiHistoryEntry,
history: historyEntry
history: historyEntry,
History: History.History,
HistoryContents: HistoryContents.HistoryContents
};
window.bundleEntries = bundleEntries;
+3 -6
View File
@@ -57,10 +57,7 @@
$embeddedHistory.find( '.item-content' ).addClass( 'flex-vertical-container' );
$(function(){
var HISTORY = require( 'mvc/history/history-model' );
var HISTORY_CONTENTS = require( 'mvc/history/history-contents' );
var HistoryContentsWithAnnotations = HISTORY_CONTENTS.default.HistoryContents.extend({
var HistoryContentsWithAnnotations = window.bundleEntries.HistoryContents.extend({
_buildFetchData : function( options ){
console.log( '_buildFetchData:' );
options = options || {};
@@ -68,10 +65,10 @@
options.view = 'summary';
options.keys = 'annotation,tags';
}
return HISTORY_CONTENTS.default.HistoryContents.prototype._buildFetchData.call( this, options );
return window.bundleEntries.HistoryContents.prototype._buildFetchData.call( this, options );
}
});
var HistoryWithAnnotations = HISTORY.default.History.extend({
var HistoryWithAnnotations = window.bundleEntries.History.extend({
contentsClass : HistoryContentsWithAnnotations
});