opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Client: fix to base.js to remove Backbone dependency until we stop loading it via script tag (this should fix a trackster load error where backbone was attempting to reload jquery without a shim)

Browse Source
This commit is contained in:
Carl Eberhard
2015-03-23 18:53:40 -04:00
parent a24e206ff7
commit ec89d4c7cf
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/base.js
+1 -1
View File
@@ -1,4 +1,4 @@
define( ["libs/backbone/backbone"], function( Backbone ) {
define( [], function() {
var Base = function() {
if( this.initialize ) {
client/galaxy/scripts/viz/trackster.js
+35 -35
View File
@@ -34,7 +34,7 @@ require(
define( ["libs/underscore", "base", "viz/trackster/tracks", "viz/visualization", "mvc/ui/icon-button" ],
function(_, base, tracks, visualization, mod_icon_btn) {
/**
* User interface controls for trackster
* User interface controls for trackster
*/
var TracksterUI = base.Base.extend({
initialize: function( baseURL ) {
@@ -47,10 +47,10 @@ var TracksterUI = base.Base.extend({
save_viz: function() {
// show dialog
Galaxy.modal.show({title: "Saving...", body: "progress" });
// Save bookmarks.
var bookmarks = [];
$(".bookmark").each(function() {
$(".bookmark").each(function() {
bookmarks.push({
position: $(this).children(".position").text(),
annotation: $(this).children(".annotation").text()
@@ -96,22 +96,22 @@ var TracksterUI = base.Base.extend({
/**
* Create button menu
*/
*/
createButtonMenu: function() {
var self = this,
menu = mod_icon_btn.create_icon_buttons_menu([
{ icon_class: 'plus-button', title: 'Add tracks', on_click: function() {
visualization.select_datasets(galaxy_config.root + "visualization/list_current_history_datasets", galaxy_config.root + "api/datasets", { 'f-dbkey': view.dbkey },
{ icon_class: 'plus-button', title: 'Add tracks', on_click: function() {
visualization.select_datasets(galaxy_config.root + "visualization/list_current_history_datasets", galaxy_config.root + "api/datasets", { 'f-dbkey': view.dbkey },
function(new_tracks) {
_.each(new_tracks, function(track) {
view.add_drawable( tracks.object_from_template(track, view, view) );
});
});
} },
{ icon_class: 'block--plus', title: 'Add group', on_click: function() {
{ icon_class: 'block--plus', title: 'Add group', on_click: function() {
view.add_drawable( new tracks.DrawableGroup(view, view, { name: "New Group" }) );
} },
{ icon_class: 'bookmarks', title: 'Bookmarks', on_click: function() {
{ icon_class: 'bookmarks', title: 'Bookmarks', on_click: function() {
// HACK -- use style to determine if panel is hidden and hide/show accordingly.
force_right_panel(($("div#right").css("right") == "0px" ? "hide" : "show"));
} },
@@ -122,7 +122,7 @@ var TracksterUI = base.Base.extend({
window.location = self.baseURL + 'visualization/circster?id=' + view.vis_id;
}
},
{ icon_class: 'disk--arrow', title: 'Save', on_click: function() {
{ icon_class: 'disk--arrow', title: 'Save', on_click: function() {
self.save_viz();
} },
{
@@ -132,8 +132,8 @@ var TracksterUI = base.Base.extend({
self.handle_unsaved_changes(view);
}
}
],
{
],
{
tooltip_config: { placement: 'bottom' }
});
this.buttonMenu = menu;
@@ -146,16 +146,16 @@ var TracksterUI = base.Base.extend({
add_bookmarks: function() {
var self = this,
baseURL = this.baseURL;
// show modal while loading history
Galaxy.modal.show({title: "Select dataset for new bookmarks", body: "progress" });
$.ajax({
url: this.baseURL + "/visualization/list_histories",
data: { "f-dbkey": view.dbkey },
error: function() { alert( "Grid failed" ); },
success: function(table_html) {
// show modal to select bookmarks
Galaxy.modal.show(
{
@@ -167,7 +167,7 @@ var TracksterUI = base.Base.extend({
{
Galaxy.modal.hide();
},
"Insert": function()
{
// Just use the first selected
@@ -238,7 +238,7 @@ var TracksterUI = base.Base.extend({
* Create a complete Trackster visualization. Returns view.
*/
create_visualization: function(view_config, viewport_config, drawables_config, bookmarks_config, editable) {
// Create view.
var self = this,
view = new tracks.TracksterView(_.extend(view_config, {header: false}));
@@ -250,7 +250,7 @@ var TracksterUI = base.Base.extend({
start = viewport_config.start,
end = viewport_config.end,
overview_drawable_name = viewport_config.overview;
if (chrom && (start !== undefined) && end) {
view.change_chrom(chrom, start, end);
}
@@ -263,7 +263,7 @@ var TracksterUI = base.Base.extend({
// No viewport, so use first chromosome.
view.change_chrom(chrom_info[0].chrom);
}
// Add drawables to view.
if (drawables_config) {
// FIXME: can from_dict() be used to create view and add drawables?
@@ -274,7 +274,7 @@ var TracksterUI = base.Base.extend({
view.add_drawable( tracks.object_from_template( drawables_config[i], view, view ) );
}
}
// Set overview.
var overview_drawable;
for (var i = 0; i < view.drawables.length; i++) {
@@ -283,7 +283,7 @@ var TracksterUI = base.Base.extend({
break;
}
}
// Load bookmarks.
if (bookmarks_config) {
var bookmark;
@@ -299,7 +299,7 @@ var TracksterUI = base.Base.extend({
// Final initialization.
this.set_up_router({view: view});
return view;
},
@@ -322,7 +322,7 @@ var TracksterUI = base.Base.extend({
if ($(e.srcElement).is(':input')) {
return;
}
// Key codes: left == 37, up == 38, right == 39, down == 40
switch(e.which) {
case 37:
@@ -365,8 +365,8 @@ var TracksterUI = base.Base.extend({
}
}
});
}
}
else {
window.location = galaxy_config.root + 'visualization';
}
@@ -374,7 +374,7 @@ var TracksterUI = base.Base.extend({
});
var TracksterView = base.Backbone.View.extend(
var TracksterView = Backbone.View.extend(
{
// initalize trackster
initialize : function ()
@@ -387,14 +387,14 @@ var TracksterView = base.Backbone.View.extend(
// attach the button menu to the panel header and float it left
ui.buttonMenu.$el.attr("style", "float: right");
// add to center panel
$("#center .unified-panel-header-inner").append(ui.buttonMenu.$el);
// configure right panel
$("#right .unified-panel-title").append("Bookmarks");
$("#right .unified-panel-icons").append("<a id='add-bookmark-button' class='icon-button menu-button plus-button' href='javascript:void(0);' title='Add bookmark'></a>");
// resize view when showing/hiding right panel (bookmarks for now).
$("#right-border").click(function() { view.resize_window(); });
@@ -457,7 +457,7 @@ var TracksterView = base.Backbone.View.extend(
"Create": function() { self.create_browser($("#new-title").val(), $("#new-dbkey").val()); Galaxy.modal.hide(); }
}
});
// select default
if (galaxy_config.app.default_dbkey) {
$("#new-dbkey").val( galaxy_config.app.default_dbkey );
@@ -472,7 +472,7 @@ var TracksterView = base.Backbone.View.extend(
}
});
},
// new browser form
template_view_new: function(response)
{
@@ -494,7 +494,7 @@ var TracksterView = base.Backbone.View.extend(
for (var i = 0; i < response.length; i++) {
html += '<option value="' + response[i][1] + '">' + response[i][0] + '</option>';
}
// close selection/finalize template
html += '</select>' +
'</div>' +
@@ -505,11 +505,11 @@ var TracksterView = base.Backbone.View.extend(
'<a href="' + galaxy_config.root + 'user/dbkeys?use_panels=True">Add a Custom Build</a>' +
'</div>' +
'</form>';
// return
return html;
},
// create
create_browser : function(name, dbkey)
{
@@ -521,10 +521,10 @@ var TracksterView = base.Backbone.View.extend(
name: name,
dbkey: dbkey
}, galaxy_config.app.gene_region);
// initialize editor
this.init_editor();
// modify view setting
view.editor = true;
},
@@ -534,7 +534,7 @@ var TracksterView = base.Backbone.View.extend(
{
// set title
$("#center .unified-panel-title").text(view.config.get_value('name') + " (" + view.dbkey + ")");
// add dataset
if (galaxy_config.app.add_dataset)
$.ajax({
static/maps/base.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"base.js","sources":["../src/base.js"],"names":["define","Backbone","Base","this","initialize","apply","arguments","extend","Model"],"mappings":"AAAAA,QAAS,0BAA2B,SAAUC,GAE7C,GAAIC,GAAO,WACNC,KAAKC,YACRD,KAAKC,WAAWC,MAAMF,KAAMG,WAK9B,OAFAJ,GAAKK,OAASN,EAASO,MAAMD,QAG5BL,KAAMA,EACND,SAAUA"}
{"version":3,"file":"base.js","sources":["../src/base.js"],"names":["define","Base","this","initialize","apply","arguments","extend","Backbone","Model"],"mappings":"AAAAA,UAAY,WAEX,GAAIC,GAAO,WACNC,KAAKC,YACRD,KAAKC,WAAWC,MAAMF,KAAMG,WAK9B,OAFAJ,GAAKK,OAASC,SAASC,MAAMF,QAG5BL,KAAMA,EACNM,SAAUA"}
static/maps/viz/trackster.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/base.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["libs/backbone/backbone"],function(a){var b=function(){this.initialize&&this.initialize.apply(this,arguments)};return b.extend=a.Model.extend,{Base:b,Backbone:a}});
define([],function(){var a=function(){this.initialize&&this.initialize.apply(this,arguments)};return a.extend=Backbone.Model.extend,{Base:a,Backbone:Backbone}});
//# sourceMappingURL=../maps/base.js.map
static/scripts/viz/trackster.js
+1 -1
View File
File diff suppressed because one or more lines are too long