1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/31740dffaf9a/
Changeset: 31740dffaf9a
User: carlfeberhard
Date: 2014-05-28 19:41:07
Summary: HDA view: properly compile underscore template on first load, override
template fn to pass localizer (_l) into template fn
Affected #: 3 files
diff -r 7fd77febf6bb8aa7a6acde9c3a31429f7b1ee99f -r
31740dffaf9ae4e345fd2d4de4ab44ed133dd567 static/scripts/mvc/dataset/hda-base.js
--- a/static/scripts/mvc/dataset/hda-base.js
+++ b/static/scripts/mvc/dataset/hda-base.js
@@ -652,7 +652,8 @@
});
//------------------------------------------------------------------------------
TEMPLATES
-var skeletonTemplate = [
+//TODO: possibly break these out into a sep. module
+var skeletonTemplate = _.template([
'<div class="dataset hda">',
'<div class="dataset-warnings">',
// error during index fetch - show error on dataset
@@ -704,9 +705,9 @@
'<div class="dataset-body"></div>',
'</div>'
-].join( '' );
+].join( '' ));
-var bodyTemplate = [
+var bodyTemplate = _.template([
'<div class="dataset-body">',
'<% if( hda.body ){ %>',
'<div class="dataset-summary">',
@@ -799,14 +800,15 @@
'<% } %>',
// end if body
'</div>'
-].join( '' );
+].join( '' ));
HDABaseView.templates = {
+ // we override here in order to pass the localizer (_L) into the template scope -
since we use it as a fn within
skeleton : function( hdaJSON ){
- return _.template( skeletonTemplate, hdaJSON, { variable: 'hda' });
+ return skeletonTemplate({ _l: _l, hda: hdaJSON });
},
body : function( hdaJSON ){
- return _.template( bodyTemplate, hdaJSON, { variable: 'hda' });
+ return bodyTemplate({ _l: _l, hda: hdaJSON });
}
};
diff -r 7fd77febf6bb8aa7a6acde9c3a31429f7b1ee99f -r
31740dffaf9ae4e345fd2d4de4ab44ed133dd567 static/scripts/packed/mvc/dataset/hda-base.js
--- a/static/scripts/packed/mvc/dataset/hda-base.js
+++ b/static/scripts/packed/mvc/dataset/hda-base.js
@@ -1,1 +1,1 @@
-define(["mvc/dataset/hda-model","mvc/base-mvc","utils/localization"],function(e,b,d){var
g=Backbone.View.extend(b.LoggableMixin).extend({tagName:"div",fxSpeed:"fast",_queueNewRender:function(i,j){j=(j===undefined)?(true):(j);var
h=this;if(j){$(h).queue(function(k){this.$el.fadeOut(h.fxSpeed,k)})}$(h).queue(function(k){this.$el.empty().attr("class",h.className).addClass("state-"+h.model.get("state")).append(i.children());if(this.selectable){this.showSelector(0)}k()});if(j){$(h).queue(function(k){this.$el.fadeIn(h.fxSpeed,k)})}$(h).queue(function(k){this.trigger("rendered",h);if(this.model.inReadyState()){this.trigger("rendered:ready",h)}if(this.draggable){this.draggableOn()}k()})},toggleBodyVisibility:function(k,i){var
h=32,j=13;if(k&&(k.type==="keydown")&&!(k.keyCode===h||k.keyCode===j)){return
true}var
l=this.$el.find(".dataset-body");i=(i===undefined)?(!l.is(":visible")):(i);if(i){this.expandBody()}else{this.collapseBody()}return
false},showSelector:function(){if(this.selected){this.select(null,true)}this.selectable=true;this.trigger("selectable",true,this);this.$(".dataset-primary-actions").hide();this.$(".dataset-selector").show()},hideSelector:function(){this.selectable=false;this.trigger("selectable",false,this);this.$(".dataset-selector").hide();this.$(".dataset-primary-actions").show()},toggleSelector:function(){if(!this.$el.find(".dataset-selector").is(":visible")){this.showSelector()}else{this.hideSelector()}},select:function(h){this.$el.find(".dataset-selector
span").removeClass("fa-square-o").addClass("fa-check-square-o");if(!this.selected){this.trigger("selected",this);this.selected=true}return
false},deselect:function(h){this.$el.find(".dataset-selector
span").removeClass("fa-check-square-o").addClass("fa-square-o");if(this.selected){this.trigger("de-selected",this);this.selected=false}return
false},toggleSelect:function(h){if(this.selected){this.deselect(h)}else{this.select(h)}},});var
c=g.extend({className:"dataset hda
history-panel-hda",id:function(){return"hda-"+this.model.get("id")},initialize:function(h){if(h.logger){this.logger=this.model.logger=h.logger}this.log(this+".initialize:",h);this.defaultPrimaryActionButtonRenderers=[this._render_showParamsButton];this.linkTarget=h.linkTarget||"_blank";this.selectable=h.selectable||false;this.selected=h.selected||false;this.expanded=h.expanded||false;this.draggable=h.draggable||false;this._setUpListeners()},_setUpListeners:function(){this.model.on("change",function(i,h){if(this.model.changedAttributes().state&&this.model.inReadyState()&&this.expanded&&!this.model.hasDetails()){this.model.fetch()}else{this.render()}},this)},render:function(i){this.$el.find("[title]").tooltip("destroy");this.urls=this.model.urls();var
h=this._buildNewRender();this._queueNewRender(h,i);return
this},_buildNewRender:function(){var
h=$(c.templates.skeleton(this.model.toJSON()));h.find(".dataset-primary-actions").append(this._render_titleButtons());h.children(".dataset-body").replaceWith(this._render_body());this._setUpBehaviors(h);return
h},_setUpBehaviors:function(h){h=h||this.$el;make_popup_menus(h);h.find("[title]").tooltip({placement:"bottom"})},_render_titleButtons:function(){return[this._render_displayButton()]},_render_displayButton:function(){if((this.model.get("state")===e.HistoryDatasetAssociation.STATES.NOT_VIEWABLE)||(this.model.get("state")===e.HistoryDatasetAssociation.STATES.DISCARDED)||(!this.model.get("accessible"))){return
null}var
i={target:this.linkTarget,classes:"dataset-display"};if(this.model.get("purged")){i.disabled=true;i.title=d("Cannot
display datasets removed from
disk")}else{if(this.model.get("state")===e.HistoryDatasetAssociation.STATES.UPLOAD){i.disabled=true;i.title=d("This
dataset must finish uploading before it can be
viewed")}else{if(this.model.get("state")===e.HistoryDatasetAssociation.STATES.NEW){i.disabled=true;i.title=d("This
dataset is not yet viewable")}else{i.title=d("View
data");i.href=this.urls.display;var
h=this;i.onclick=function(j){if(Galaxy.frame&&Galaxy.frame.active){Galaxy.frame.add({title:"Data
Viewer:
"+h.model.get("name"),type:"url",content:h.urls.display});j.preventDefault()}}}}}i.faIcon="fa-eye";return
faIconButton(i)},_render_downloadButton:function(){if(this.model.get("purged")||!this.model.hasData()){return
null}var i=this.urls,j=this.model.get("meta_files");if(_.isEmpty(j)){return
$(['<a href="'+i.download+'"
title="'+d("Download")+'" ','class="icon-btn
dataset-download-btn">','<span class="fa
fa-floppy-o"></span>',"</a>"].join(""))}var
k="dataset-"+this.model.get("id")+"-popup",h=['<div
popupmenu="'+k+'">','<a
href="'+i.download+'">',d("Download
dataset"),"</a>","<a>"+d("Additional
files")+"</a>",_.map(j,function(l){return['<a
class="action-button"
href="',i.meta_download+l.file_type,'">',d("Download"),"
",l.file_type,"</a>"].join("")}).join("\n"),"</div>",'<div
class="icon-btn-group">','<a
href="'+i.download+'"
title="'+d("Download")+'" ','class="icon-btn
dataset-download-btn">','<span class="fa
fa-floppy-o"></span>','</a><a class="icon-btn
popup" id="'+k+'">','<span class="fa
fa-caret-down"></span>',"</a>","</div>"].join("\n");return
$(h)},_render_showParamsButton:function(){return faIconButton({title:d("View
details"),classes:"dataset-params-btn",href:this.urls.show_params,target:this.linkTarget,faIcon:"fa-info-circle"})},_render_body:function(){var
i=$('<div>Error: unknown dataset state
"'+this.model.get("state")+'".</div>'),h=this["_render_body_"+this.model.get("state")];if(_.isFunction(h)){i=h.call(this)}this._setUpBehaviors(i);if(this.expanded){i.show()}return
i},_render_stateBodyHelper:function(h,k){k=k||[];var
i=this,j=$(c.templates.body(_.extend(this.model.toJSON(),{body:h})));j.find(".dataset-actions
.left").append(_.map(k,function(l){return l.call(i)}));return
j},_render_body_new:function(){return
this._render_stateBodyHelper("<div>"+d("This is a new dataset and not
all of its data are available
yet")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_noPermission:function(){return
this._render_stateBodyHelper("<div>"+d("You do not have permission to
view this
dataset")+"</div>")},_render_body_discarded:function(){return
this._render_stateBodyHelper("<div>"+d("The job creating this dataset
was cancelled before
completion")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_queued:function(){return
this._render_stateBodyHelper("<div>"+d("This job is waiting to
run")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_upload:function(){return
this._render_stateBodyHelper("<div>"+d("This dataset is currently
uploading")+"</div>")},_render_body_setting_metadata:function(){return
this._render_stateBodyHelper("<div>"+d("Metadata is being
auto-detected")+"</div>")},_render_body_running:function(){return
this._render_stateBodyHelper("<div>"+d("This job is currently
running")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_paused:function(){return
this._render_stateBodyHelper("<div>"+d('This job is paused. Use the
"Resume Paused Jobs" in the history menu to
resume')+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_error:function(){var
h=['<span class="help-text">',d("An error occurred with this
dataset"),":</span>",'<div
class="job-error-text">',$.trim(this.model.get("misc_info")),"</div>"].join("");if(!this.model.get("purged")){h="<div>"+this.model.get("misc_blurb")+"</div>"+h}return
this._render_stateBodyHelper(h,[this._render_downloadButton].concat(this.defaultPrimaryActionButtonRenderers))},_render_body_empty:function(){return
this._render_stateBodyHelper("<div>"+d("No data")+":
<i>"+this.model.get("misc_blurb")+"</i></div>",this.defaultPrimaryActionButtonRenderers)},_render_body_failed_metadata:function(){var
h=$('<div
class="warningmessagesmall"></div>').append($("<strong/>").text(d("An
error occurred setting the metadata for this
dataset"))),i=this._render_body_ok();i.prepend(h);return
i},_render_body_ok:function(){var
h=this,j=$(c.templates.body(this.model.toJSON())),i=[this._render_downloadButton].concat(this.defaultPrimaryActionButtonRenderers);j.find(".dataset-actions
.left").append(_.map(i,function(k){return
k.call(h)}));if(this.model.isDeletedOrPurged()){return j}return j},events:{"click
.dataset-title-bar":"toggleBodyVisibility","keydown
.dataset-title-bar":"toggleBodyVisibility","click
.dataset-selector":"toggleSelect"},expandBody:function(){var
h=this;function
i(){h.$el.children(".dataset-body").replaceWith(h._render_body());h.$el.children(".dataset-body").slideDown(h.fxSpeed,function(){h.expanded=true;h.trigger("body-expanded",h.model.get("id"))})}if(this.model.inReadyState()&&!this.model.hasDetails()){this.model.fetch({silent:true}).always(function(j){h.urls=h.model.urls();i()})}else{i()}},collapseBody:function(){var
h=this;this.$el.children(".dataset-body").slideUp(h.fxSpeed,function(){h.expanded=false;h.trigger("body-collapsed",h.model.get("id"))})},draggableOn:function(){this.draggable=true;this.dragStartHandler=_.bind(this._dragStartHandler,this);this.dragEndHandler=_.bind(this._dragEndHandler,this);var
h=this.$el.find(".dataset-title-bar").attr("draggable",true).get(0);h.addEventListener("dragstart",this.dragStartHandler,false);h.addEventListener("dragend",this.dragEndHandler,false)},draggableOff:function(){this.draggable=false;var
h=this.$el.find(".dataset-title-bar").attr("draggable",false).get(0);h.removeEventListener("dragstart",this.dragStartHandler,false);h.removeEventListener("dragend",this.dragEndHandler,false)},toggleDraggable:function(){if(this.draggable){this.draggableOff()}else{this.draggableOn()}},_dragStartHandler:function(h){this.trigger("dragstart",this);h.dataTransfer.effectAllowed="move";h.dataTransfer.setData("text",JSON.stringify(this.model.toJSON()));return
false},_dragEndHandler:function(h){this.trigger("dragend",this);return
false},remove:function(i){var
h=this;this.$el.fadeOut(h.fxSpeed,function(){h.$el.remove();h.off();if(i){i()}})},toString:function(){var
h=(this.model)?(this.model+""):("(no
model)");return"HDABaseView("+h+")"}});var a=['<div
class="dataset hda">','<div
class="dataset-warnings">',"<% if( hda.error ){
%>",'<div class="errormessagesmall">',d("There was an
error getting the data for this dataset"),":<%- hda.error
%>","</div>","<% } %>","<% if( hda.deleted
){ %>","<% if( hda.purged ){ %>",'<div
class="dataset-purged-msg
warningmessagesmall"><strong>',d("This dataset has been deleted and
removed from disk")+".","</strong></div>","<%
} else { %>",'<div class="dataset-deleted-msg
warningmessagesmall"><strong>',d("This dataset has been
deleted")+".","</strong></div>","<% }
%>","<% } %>","<% if( !hda.visible ){
%>",'<div class="dataset-hidden-msg
warningmessagesmall"><strong>',d("This dataset has been
hidden")+".","</strong></div>","<% }
%>","</div>",'<div
class="dataset-selector">','<span class="fa fa-2x
fa-square-o"></span>',"</div>",'<div
class="dataset-primary-actions"></div>','<div
class="dataset-title-bar clear" tabindex="0">','<span
class="dataset-state-icon state-icon"></span>','<div
class="dataset-title">','<span class="hda-hid"><%-
hda.hid %></span> ','<span class="dataset-name"><%-
hda.name
%></span>',"</div>","</div>",'<div
class="dataset-body"></div>',"</div>"].join("");var
f=['<div class="dataset-body">',"<% if( hda.body ){
%>",'<div class="dataset-summary">',"<%= hda.body
%>","</div>",'<div class="dataset-actions
clear">','<div class="left"></div>','<div
class="right"></div>',"</div>","<% } else {
%>",'<div class="dataset-summary">',"<% if(
hda.misc_blurb ){ %>",'<div
class="dataset-blurb">','<span class="value"><%-
hda.misc_blurb %></span>',"</div>","<% }
%>","<% if( hda.data_type ){ %>",'<div
class="dataset-datatype">','<label
class="prompt">',d("format"),"</label>",'<span
class="value"><%- hda.data_type
%></span>',"</div>","<% } %>","<% if(
hda.metadata_dbkey ){ %>",'<div
class="dataset-dbkey">','<label
class="prompt">',d("database"),"</label>",'<span
class="value">',"<%- hda.metadata_dbkey
%>","</span>","</div>","<% }
%>","<% if( hda.misc_info ){ %>",'<div
class="dataset-info">','<span class="value"><%-
hda.misc_info %></span>',"</div>","<% }
%>","</div>",'<div class="dataset-actions
clear">','<div class="left"></div>','<div
class="right"></div>',"</div>","<% if(
!hda.deleted ){ %>",'<div
class="tags-display"></div>','<div
class="annotation-display"></div>','<div
class="dataset-display-applications">',"<% _.each(
hda.display_apps, function( app ){ %>",'<div
class="display-application">','<span
class="display-application-location"><%- app.label %></span>
','<span class="display-application-links">',"<%
_.each( app.links, function( link ){ %>",'<a target="<%=
link.target %>" href="<%= link.href %>">',"<%
print( _l( link.text ) ); %>","</a> ","<% });
%>","</span>","</div>","<% });
%>","<% _.each( hda.display_types, function( app ){
%>",'<div class="display-application">','<span
class="display-application-location"><%- app.label %></span>
','<span class="display-application-links">',"<%
_.each( app.links, function( link ){ %>",'<a target="<%=
link.target %>" href="<%= link.href %>">',"<%
print( _l( link.text ) ); %>","</a> ","<% });
%>","</span>","</div>","<% });
%>","</div>",'<div
class="dataset-peek">',"<% if( hda.peek ){
%>",'<pre class="peek"><%= hda.peek
%></pre>',"<% } %>","</div>","<% }
%>","<% }
%>","</div>"].join("");c.templates={skeleton:function(h){return
_.template(a,h,{variable:"hda"})},body:function(h){return
_.template(f,h,{variable:"hda"})}};return{HistoryContentBaseView:g,HDABaseView:c}});
\ No newline at end of file
+define(["mvc/dataset/hda-model","mvc/base-mvc","utils/localization"],function(e,b,d){var
g=Backbone.View.extend(b.LoggableMixin).extend({tagName:"div",fxSpeed:"fast",_queueNewRender:function(i,j){j=(j===undefined)?(true):(j);var
h=this;if(j){$(h).queue(function(k){this.$el.fadeOut(h.fxSpeed,k)})}$(h).queue(function(k){this.$el.empty().attr("class",h.className).addClass("state-"+h.model.get("state")).append(i.children());if(this.selectable){this.showSelector(0)}k()});if(j){$(h).queue(function(k){this.$el.fadeIn(h.fxSpeed,k)})}$(h).queue(function(k){this.trigger("rendered",h);if(this.model.inReadyState()){this.trigger("rendered:ready",h)}if(this.draggable){this.draggableOn()}k()})},toggleBodyVisibility:function(k,i){var
h=32,j=13;if(k&&(k.type==="keydown")&&!(k.keyCode===h||k.keyCode===j)){return
true}var
l=this.$el.find(".dataset-body");i=(i===undefined)?(!l.is(":visible")):(i);if(i){this.expandBody()}else{this.collapseBody()}return
false},showSelector:function(){if(this.selected){this.select(null,true)}this.selectable=true;this.trigger("selectable",true,this);this.$(".dataset-primary-actions").hide();this.$(".dataset-selector").show()},hideSelector:function(){this.selectable=false;this.trigger("selectable",false,this);this.$(".dataset-selector").hide();this.$(".dataset-primary-actions").show()},toggleSelector:function(){if(!this.$el.find(".dataset-selector").is(":visible")){this.showSelector()}else{this.hideSelector()}},select:function(h){this.$el.find(".dataset-selector
span").removeClass("fa-square-o").addClass("fa-check-square-o");if(!this.selected){this.trigger("selected",this);this.selected=true}return
false},deselect:function(h){this.$el.find(".dataset-selector
span").removeClass("fa-check-square-o").addClass("fa-square-o");if(this.selected){this.trigger("de-selected",this);this.selected=false}return
false},toggleSelect:function(h){if(this.selected){this.deselect(h)}else{this.select(h)}},});var
c=g.extend({className:"dataset hda
history-panel-hda",id:function(){return"hda-"+this.model.get("id")},initialize:function(h){if(h.logger){this.logger=this.model.logger=h.logger}this.log(this+".initialize:",h);this.defaultPrimaryActionButtonRenderers=[this._render_showParamsButton];this.linkTarget=h.linkTarget||"_blank";this.selectable=h.selectable||false;this.selected=h.selected||false;this.expanded=h.expanded||false;this.draggable=h.draggable||false;this._setUpListeners()},_setUpListeners:function(){this.model.on("change",function(i,h){if(this.model.changedAttributes().state&&this.model.inReadyState()&&this.expanded&&!this.model.hasDetails()){this.model.fetch()}else{this.render()}},this)},render:function(i){this.$el.find("[title]").tooltip("destroy");this.urls=this.model.urls();var
h=this._buildNewRender();this._queueNewRender(h,i);return
this},_buildNewRender:function(){var
h=$(c.templates.skeleton(this.model.toJSON()));h.find(".dataset-primary-actions").append(this._render_titleButtons());h.children(".dataset-body").replaceWith(this._render_body());this._setUpBehaviors(h);return
h},_setUpBehaviors:function(h){h=h||this.$el;make_popup_menus(h);h.find("[title]").tooltip({placement:"bottom"})},_render_titleButtons:function(){return[this._render_displayButton()]},_render_displayButton:function(){if((this.model.get("state")===e.HistoryDatasetAssociation.STATES.NOT_VIEWABLE)||(this.model.get("state")===e.HistoryDatasetAssociation.STATES.DISCARDED)||(!this.model.get("accessible"))){return
null}var
i={target:this.linkTarget,classes:"dataset-display"};if(this.model.get("purged")){i.disabled=true;i.title=d("Cannot
display datasets removed from
disk")}else{if(this.model.get("state")===e.HistoryDatasetAssociation.STATES.UPLOAD){i.disabled=true;i.title=d("This
dataset must finish uploading before it can be
viewed")}else{if(this.model.get("state")===e.HistoryDatasetAssociation.STATES.NEW){i.disabled=true;i.title=d("This
dataset is not yet viewable")}else{i.title=d("View
data");i.href=this.urls.display;var
h=this;i.onclick=function(j){if(Galaxy.frame&&Galaxy.frame.active){Galaxy.frame.add({title:"Data
Viewer:
"+h.model.get("name"),type:"url",content:h.urls.display});j.preventDefault()}}}}}i.faIcon="fa-eye";return
faIconButton(i)},_render_downloadButton:function(){if(this.model.get("purged")||!this.model.hasData()){return
null}var i=this.urls,j=this.model.get("meta_files");if(_.isEmpty(j)){return
$(['<a href="'+i.download+'"
title="'+d("Download")+'" ','class="icon-btn
dataset-download-btn">','<span class="fa
fa-floppy-o"></span>',"</a>"].join(""))}var
k="dataset-"+this.model.get("id")+"-popup",h=['<div
popupmenu="'+k+'">','<a
href="'+i.download+'">',d("Download
dataset"),"</a>","<a>"+d("Additional
files")+"</a>",_.map(j,function(l){return['<a
class="action-button"
href="',i.meta_download+l.file_type,'">',d("Download"),"
",l.file_type,"</a>"].join("")}).join("\n"),"</div>",'<div
class="icon-btn-group">','<a
href="'+i.download+'"
title="'+d("Download")+'" ','class="icon-btn
dataset-download-btn">','<span class="fa
fa-floppy-o"></span>','</a><a class="icon-btn
popup" id="'+k+'">','<span class="fa
fa-caret-down"></span>',"</a>","</div>"].join("\n");return
$(h)},_render_showParamsButton:function(){return faIconButton({title:d("View
details"),classes:"dataset-params-btn",href:this.urls.show_params,target:this.linkTarget,faIcon:"fa-info-circle"})},_render_body:function(){var
i=$('<div>Error: unknown dataset state
"'+this.model.get("state")+'".</div>'),h=this["_render_body_"+this.model.get("state")];if(_.isFunction(h)){i=h.call(this)}this._setUpBehaviors(i);if(this.expanded){i.show()}return
i},_render_stateBodyHelper:function(h,k){k=k||[];var
i=this,j=$(c.templates.body(_.extend(this.model.toJSON(),{body:h})));j.find(".dataset-actions
.left").append(_.map(k,function(l){return l.call(i)}));return
j},_render_body_new:function(){return
this._render_stateBodyHelper("<div>"+d("This is a new dataset and not
all of its data are available
yet")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_noPermission:function(){return
this._render_stateBodyHelper("<div>"+d("You do not have permission to
view this
dataset")+"</div>")},_render_body_discarded:function(){return
this._render_stateBodyHelper("<div>"+d("The job creating this dataset
was cancelled before
completion")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_queued:function(){return
this._render_stateBodyHelper("<div>"+d("This job is waiting to
run")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_upload:function(){return
this._render_stateBodyHelper("<div>"+d("This dataset is currently
uploading")+"</div>")},_render_body_setting_metadata:function(){return
this._render_stateBodyHelper("<div>"+d("Metadata is being
auto-detected")+"</div>")},_render_body_running:function(){return
this._render_stateBodyHelper("<div>"+d("This job is currently
running")+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_paused:function(){return
this._render_stateBodyHelper("<div>"+d('This job is paused. Use the
"Resume Paused Jobs" in the history menu to
resume')+"</div>",this.defaultPrimaryActionButtonRenderers)},_render_body_error:function(){var
h=['<span class="help-text">',d("An error occurred with this
dataset"),":</span>",'<div
class="job-error-text">',$.trim(this.model.get("misc_info")),"</div>"].join("");if(!this.model.get("purged")){h="<div>"+this.model.get("misc_blurb")+"</div>"+h}return
this._render_stateBodyHelper(h,[this._render_downloadButton].concat(this.defaultPrimaryActionButtonRenderers))},_render_body_empty:function(){return
this._render_stateBodyHelper("<div>"+d("No data")+":
<i>"+this.model.get("misc_blurb")+"</i></div>",this.defaultPrimaryActionButtonRenderers)},_render_body_failed_metadata:function(){var
h=$('<div
class="warningmessagesmall"></div>').append($("<strong/>").text(d("An
error occurred setting the metadata for this
dataset"))),i=this._render_body_ok();i.prepend(h);return
i},_render_body_ok:function(){var
h=this,j=$(c.templates.body(this.model.toJSON())),i=[this._render_downloadButton].concat(this.defaultPrimaryActionButtonRenderers);j.find(".dataset-actions
.left").append(_.map(i,function(k){return
k.call(h)}));if(this.model.isDeletedOrPurged()){return j}return j},events:{"click
.dataset-title-bar":"toggleBodyVisibility","keydown
.dataset-title-bar":"toggleBodyVisibility","click
.dataset-selector":"toggleSelect"},expandBody:function(){var
h=this;function
i(){h.$el.children(".dataset-body").replaceWith(h._render_body());h.$el.children(".dataset-body").slideDown(h.fxSpeed,function(){h.expanded=true;h.trigger("body-expanded",h.model.get("id"))})}if(this.model.inReadyState()&&!this.model.hasDetails()){this.model.fetch({silent:true}).always(function(j){h.urls=h.model.urls();i()})}else{i()}},collapseBody:function(){var
h=this;this.$el.children(".dataset-body").slideUp(h.fxSpeed,function(){h.expanded=false;h.trigger("body-collapsed",h.model.get("id"))})},draggableOn:function(){this.draggable=true;this.dragStartHandler=_.bind(this._dragStartHandler,this);this.dragEndHandler=_.bind(this._dragEndHandler,this);var
h=this.$el.find(".dataset-title-bar").attr("draggable",true).get(0);h.addEventListener("dragstart",this.dragStartHandler,false);h.addEventListener("dragend",this.dragEndHandler,false)},draggableOff:function(){this.draggable=false;var
h=this.$el.find(".dataset-title-bar").attr("draggable",false).get(0);h.removeEventListener("dragstart",this.dragStartHandler,false);h.removeEventListener("dragend",this.dragEndHandler,false)},toggleDraggable:function(){if(this.draggable){this.draggableOff()}else{this.draggableOn()}},_dragStartHandler:function(h){this.trigger("dragstart",this);h.dataTransfer.effectAllowed="move";h.dataTransfer.setData("text",JSON.stringify(this.model.toJSON()));return
false},_dragEndHandler:function(h){this.trigger("dragend",this);return
false},remove:function(i){var
h=this;this.$el.fadeOut(h.fxSpeed,function(){h.$el.remove();h.off();if(i){i()}})},toString:function(){var
h=(this.model)?(this.model+""):("(no
model)");return"HDABaseView("+h+")"}});var
a=_.template(['<div class="dataset hda">','<div
class="dataset-warnings">',"<% if( hda.error ){
%>",'<div class="errormessagesmall">',d("There was an
error getting the data for this dataset"),":<%- hda.error
%>","</div>","<% } %>","<% if( hda.deleted
){ %>","<% if( hda.purged ){ %>",'<div
class="dataset-purged-msg
warningmessagesmall"><strong>',d("This dataset has been deleted and
removed from disk")+".","</strong></div>","<%
} else { %>",'<div class="dataset-deleted-msg
warningmessagesmall"><strong>',d("This dataset has been
deleted")+".","</strong></div>","<% }
%>","<% } %>","<% if( !hda.visible ){
%>",'<div class="dataset-hidden-msg
warningmessagesmall"><strong>',d("This dataset has been
hidden")+".","</strong></div>","<% }
%>","</div>",'<div
class="dataset-selector">','<span class="fa fa-2x
fa-square-o"></span>',"</div>",'<div
class="dataset-primary-actions"></div>','<div
class="dataset-title-bar clear" tabindex="0">','<span
class="dataset-state-icon state-icon"></span>','<div
class="dataset-title">','<span class="hda-hid"><%-
hda.hid %></span> ','<span class="dataset-name"><%-
hda.name
%></span>',"</div>","</div>",'<div
class="dataset-body"></div>',"</div>"].join(""));var
f=_.template(['<div class="dataset-body">',"<% if(
hda.body ){ %>",'<div
class="dataset-summary">',"<%= hda.body
%>","</div>",'<div class="dataset-actions
clear">','<div class="left"></div>','<div
class="right"></div>',"</div>","<% } else {
%>",'<div class="dataset-summary">',"<% if(
hda.misc_blurb ){ %>",'<div
class="dataset-blurb">','<span class="value"><%-
hda.misc_blurb %></span>',"</div>","<% }
%>","<% if( hda.data_type ){ %>",'<div
class="dataset-datatype">','<label
class="prompt">',d("format"),"</label>",'<span
class="value"><%- hda.data_type
%></span>',"</div>","<% } %>","<% if(
hda.metadata_dbkey ){ %>",'<div
class="dataset-dbkey">','<label
class="prompt">',d("database"),"</label>",'<span
class="value">',"<%- hda.metadata_dbkey
%>","</span>","</div>","<% }
%>","<% if( hda.misc_info ){ %>",'<div
class="dataset-info">','<span class="value"><%-
hda.misc_info %></span>',"</div>","<% }
%>","</div>",'<div class="dataset-actions
clear">','<div class="left"></div>','<div
class="right"></div>',"</div>","<% if(
!hda.deleted ){ %>",'<div
class="tags-display"></div>','<div
class="annotation-display"></div>','<div
class="dataset-display-applications">',"<% _.each(
hda.display_apps, function( app ){ %>",'<div
class="display-application">','<span
class="display-application-location"><%- app.label %></span>
','<span class="display-application-links">',"<%
_.each( app.links, function( link ){ %>",'<a target="<%=
link.target %>" href="<%= link.href %>">',"<%
print( _l( link.text ) ); %>","</a> ","<% });
%>","</span>","</div>","<% });
%>","<% _.each( hda.display_types, function( app ){
%>",'<div class="display-application">','<span
class="display-application-location"><%- app.label %></span>
','<span class="display-application-links">',"<%
_.each( app.links, function( link ){ %>",'<a target="<%=
link.target %>" href="<%= link.href %>">',"<%
print( _l( link.text ) ); %>","</a> ","<% });
%>","</span>","</div>","<% });
%>","</div>",'<div
class="dataset-peek">',"<% if( hda.peek ){
%>",'<pre class="peek"><%= hda.peek
%></pre>',"<% } %>","</div>","<% }
%>","<% }
%>","</div>"].join(""));c.templates={skeleton:function(h){return
a({_l:d,hda:h})},body:function(h){return
f({_l:d,hda:h})}};return{HistoryContentBaseView:g,HDABaseView:c}});
\ No newline at end of file
diff -r 7fd77febf6bb8aa7a6acde9c3a31429f7b1ee99f -r
31740dffaf9ae4e345fd2d4de4ab44ed133dd567 static/scripts/packed/viz/trackster.js
--- a/static/scripts/packed/viz/trackster.js
+++ b/static/scripts/packed/viz/trackster.js
@@ -1,1 +1,1 @@
-var ui=null;var view=null;var
browser_router=null;require(["utils/utils","libs/jquery/jstorage","libs/jquery/jquery.event.drag","libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel","libs/jquery/jquery-ui","libs/jquery/select2","libs/farbtastic","libs/jquery/jquery.form","libs/jquery/jquery.rating","mvc/ui"],function(a){a.cssLoadFile("static/style/jquery.rating.css");a.cssLoadFile("static/style/autocomplete_tagging.css");a.cssLoadFile("static/style/jquery-ui/smoothness/jquery-ui.css");a.cssLoadFile("static/style/library.css");a.cssLoadFile("static/style/trackster.css")});define(["libs/backbone/backbone","viz/trackster_ui"],function(b,a){var
c=Backbone.View.extend({initialize:function(){ui=new
a.TracksterUI(galaxy_config.root);ui.createButtonMenu();ui.buttonMenu.$el.attr("style","float:
right");$("#center
.unified-panel-header-inner").append(ui.buttonMenu.$el);$("#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>");$("#right-border").click(function(){view.resize_window()});force_right_panel("hide");if(galaxy_config.app.id){this.view_existing()}else{this.view_new()}},view_existing:function(){var
d=galaxy_config.app.viz_config;view=ui.create_visualization({container:$("#center
.unified-panel-body"),name:d.title,vis_id:d.vis_id,dbkey:d.dbkey},d.viewport,d.tracks,d.bookmarks,true);this.init_editor()},view_new:function(){var
d=this;$.ajax({url:galaxy_config.root+"api/genomes?chrom_info=True",data:{},error:function(){alert("Couldn't
create new browser.")},success:function(e){Galaxy.modal.show({title:"New
Visualization",body:d.template_view_new(e),buttons:{Cancel:function(){window.location=galaxy_config.root+"visualization/list"},Create:function(){d.create_browser($("#new-title").val(),$("#new-dbkey").val());Galaxy.modal.hide()}}});if(galaxy_config.app.default_dbkey){$("#new-dbkey").val(galaxy_config.app.default_dbkey)}$("#new-title").focus();$("select[name='dbkey']").select2();$("#overlay").css("overflow","auto")}})},template_view_new:function(d){var
f='<form id="new-browser-form" action="javascript:void(0);"
method="post" onsubmit="return false;"><div
class="form-row"><label for="new-title">Browser
name:</label><div class="form-row-input"><input
type="text" name="title" id="new-title"
value="Unnamed"></input></div><div style="clear:
both;"></div></div><div class="form-row"><label
for="new-dbkey">Reference genome build (dbkey): </label><div
class="form-row-input"><select name="dbkey"
id="new-dbkey">';for(var e=0;e<d.length;e++){f+='<option
value="'+d[e][1]+'">'+d[e][0]+"</option>"}f+='</select></div><div
style="clear: both;"></div></div><div
class="form-row">Is the build not listed here? <a
href="'+galaxy_config.root+'user/dbkeys?use_panels=True">Add a Custom
Build</a></div></form>';return
f},create_browser:function(e,d){$(document).trigger("convert_to_values");view=ui.create_visualization({container:$("#center
.unified-panel-body"),name:e,dbkey:d},galaxy_config.app.gene_region);this.init_editor();view.editor=true},init_editor:function(){$("#center
.unified-panel-title").text(view.config.get_value("name")+"
("+view.dbkey+")");if(galaxy_config.app.add_dataset){$.ajax({url:galaxy_config.root+"api/datasets/"+galaxy_config.app.add_dataset,data:{hda_ldda:"hda",data_type:"track_config"},dataType:"json",success:function(d){view.add_drawable(a.object_from_template(d,view,view))}})}$("#add-bookmark-button").click(function(){var
e=view.chrom+":"+view.low+"-"+view.high,d="Bookmark
description";return
ui.add_bookmark(e,d,true)});ui.init_keyboard_nav(view)}});return{GalaxyApp:c}});
\ No newline at end of file
+var ui=null;var view=null;var
browser_router=null;require(["utils/utils","libs/jquery/jquery.event.drag","libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel","libs/jquery/jquery-ui","libs/jquery/select2","libs/farbtastic","libs/jquery/jquery.form","libs/jquery/jquery.rating","mvc/ui"],function(a){a.cssLoadFile("static/style/jquery.rating.css");a.cssLoadFile("static/style/autocomplete_tagging.css");a.cssLoadFile("static/style/jquery-ui/smoothness/jquery-ui.css");a.cssLoadFile("static/style/library.css");a.cssLoadFile("static/style/trackster.css")});define(["libs/backbone/backbone","viz/trackster_ui"],function(b,a){var
c=Backbone.View.extend({initialize:function(){ui=new
a.TracksterUI(galaxy_config.root);ui.createButtonMenu();ui.buttonMenu.$el.attr("style","float:
right");$("#center
.unified-panel-header-inner").append(ui.buttonMenu.$el);$("#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>");$("#right-border").click(function(){view.resize_window()});force_right_panel("hide");if(galaxy_config.app.id){this.view_existing()}else{this.view_new()}},view_existing:function(){var
d=galaxy_config.app.viz_config;view=ui.create_visualization({container:$("#center
.unified-panel-body"),name:d.title,vis_id:d.vis_id,dbkey:d.dbkey},d.viewport,d.tracks,d.bookmarks,true);this.init_editor()},view_new:function(){var
d=this;$.ajax({url:galaxy_config.root+"api/genomes?chrom_info=True",data:{},error:function(){alert("Couldn't
create new browser.")},success:function(e){Galaxy.modal.show({title:"New
Visualization",body:d.template_view_new(e),buttons:{Cancel:function(){window.location=galaxy_config.root+"visualization/list"},Create:function(){d.create_browser($("#new-title").val(),$("#new-dbkey").val());Galaxy.modal.hide()}}});if(galaxy_config.app.default_dbkey){$("#new-dbkey").val(galaxy_config.app.default_dbkey)}$("#new-title").focus();$("select[name='dbkey']").select2();$("#overlay").css("overflow","auto")}})},template_view_new:function(d){var
f='<form id="new-browser-form" action="javascript:void(0);"
method="post" onsubmit="return false;"><div
class="form-row"><label for="new-title">Browser
name:</label><div class="form-row-input"><input
type="text" name="title" id="new-title"
value="Unnamed"></input></div><div style="clear:
both;"></div></div><div class="form-row"><label
for="new-dbkey">Reference genome build (dbkey): </label><div
class="form-row-input"><select name="dbkey"
id="new-dbkey">';for(var e=0;e<d.length;e++){f+='<option
value="'+d[e][1]+'">'+d[e][0]+"</option>"}f+='</select></div><div
style="clear: both;"></div></div><div
class="form-row">Is the build not listed here? <a
href="'+galaxy_config.root+'user/dbkeys?use_panels=True">Add a Custom
Build</a></div></form>';return
f},create_browser:function(e,d){$(document).trigger("convert_to_values");view=ui.create_visualization({container:$("#center
.unified-panel-body"),name:e,dbkey:d},galaxy_config.app.gene_region);this.init_editor();view.editor=true},init_editor:function(){$("#center
.unified-panel-title").text(view.config.get_value("name")+"
("+view.dbkey+")");if(galaxy_config.app.add_dataset){$.ajax({url:galaxy_config.root+"api/datasets/"+galaxy_config.app.add_dataset,data:{hda_ldda:"hda",data_type:"track_config"},dataType:"json",success:function(d){view.add_drawable(a.object_from_template(d,view,view))}})}$("#add-bookmark-button").click(function(){var
e=view.chrom+":"+view.low+"-"+view.high,d="Bookmark
description";return
ui.add_bookmark(e,d,true)});ui.init_keyboard_nav(view)}});return{GalaxyApp:c}});
\ No newline at end of file
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.