opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 08:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix review comments: removing self from multiple places and correct '>'

Browse Source
This commit is contained in:
anuprulez
2017-07-30 19:06:46 +02:00
parent 60aa8e0caf
commit 02c40bbcbe
9 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/workflow/workflow.js
+25 -27
View File
@@ -1,19 +1,17 @@
/** Workflow view */
define( [ 'utils/utils' ], function( Utils ) {
define( [ 'utils/utils', 'mvc/ui/ui-misc' ], function( Utils, Ui ) {
/** Build messages after user action */
function build_messages( self ) {
var $el_message = self.$el.find( '.response-message' ),
status = Utils.getQueryString( 'status' ),
message = Utils.getQueryString( 'message' );
if( message && message !== null && message !== "" ) {
$el_message.addClass( status + 'message' );
$el_message.html( '<p>' + _.escape( message ) + '</p>' );
}
else {
$el_message.html("");
}
function build_messages() {
var $el_message = this.$( '.response-message' ),
response = {};
response = {
'status': Utils.getQueryString( 'status' ),
'message': _.escape( Utils.getQueryString( 'message' ) ),
'persistent': true,
'cls': Utils.getQueryString( 'status' ) + 'message'
};
$el_message.empty().html( new Ui.Message( response ).$el );
}
/** View of the main workflow list page */
@@ -32,8 +30,8 @@ define( [ 'utils/utils' ], function( Utils ) {
// Add workflow header
self.$el.empty().append( self._templateHeader() );
// Add user actions message if any
build_messages( self );
$el_workflow = self.$el.find( '.user-workflows' );
build_messages();
$el_workflow = self.$( '.user-workflows' );
// Add the actions buttons
$el_workflow.append( self._templateActionButtons() );
if( workflows.length > 0) {
@@ -41,11 +39,11 @@ define( [ 'utils/utils' ], function( Utils ) {
self.adjust_actiondropdown( $el_workflow );
// Register delete and run workflow events
_.each( workflows, function( wf ) {
self.confirm_delete( self, wf );
self.confirm_delete( wf );
});
self.register_show_tool_menu( self );
self.register_show_tool_menu();
// Register search workflow event
self.search_workflow( self, self.$el.find( '.search-wf' ), self.$el.find( '.workflow-search tr' ), min_query_length );
self.search_workflow( self.$( '.search-wf' ), self.$( '.workflow-search tr' ), min_query_length );
}
else {
$el_workflow.append( self._templateNoWorkflow() );
@@ -54,8 +52,8 @@ define( [ 'utils/utils' ], function( Utils ) {
},
// Save the workflow as an item in Tool panel
register_show_tool_menu: function( self ) {
var $el_checkboxes = self.$el.find( '.show-in-tool-panel' );
register_show_tool_menu: function() {
var $el_checkboxes = this.$( '.show-in-tool-panel' );
$el_checkboxes.on( 'click', function( e ) {
var ids = [];
// Look for all the checked checkboxes
@@ -78,9 +76,9 @@ define( [ 'utils/utils' ], function( Utils ) {
},
/** Add confirm box before removing/unsharing workflow */
confirm_delete: function( self, workflow ) {
var $el_wf_link = self.$el.find( '.link-confirm-' + workflow.id ),
$el_shared_wf_link = self.$el.find( '.link-confirm-shared-' + workflow.id );
confirm_delete: function( workflow ) {
var $el_wf_link = this.$( '.link-confirm-' + workflow.id ),
$el_shared_wf_link = this.$( '.link-confirm-shared-' + workflow.id );
$el_wf_link.click( function() {
return confirm( "Are you sure you want to delete workflow '" + workflow.name + "'?" );
});
@@ -90,7 +88,7 @@ define( [ 'utils/utils' ], function( Utils ) {
},
/** Implement client side workflow search/filtering */
search_workflow: function( self, $el_searchinput, $el_tabletr, min_querylen ) {
search_workflow: function( $el_searchinput, $el_tabletr, min_querylen ) {
$el_searchinput.on( 'keyup', function () {
var query = $( this ).val();
// Filter when query is at least 3 characters
@@ -156,7 +154,7 @@ define( [ 'utils/utils' ], function( Utils ) {
'<th>Show in Tools panel</th>' +
'</tr></thead>';
_.each( workflows, function( wf ) {
var checkbox_html = wf.show_in_tool_panel ? '<input type="checkbox" class="show-in-tool-panel" value="'+ wf.wf_id +'" checked="'+ wf.show_in_tool_panel +'">' : '<input type="checkbox" class="show-in-tool-panel" value="'+ wf.wf_id +'"';
var checkbox_html = '<input type="checkbox" class="show-in-tool-panel" '+ ( wf.show_in_tool_panel ? 'checked="' + wf.show_in_tool_panel + '"' : "" ) +' value="' + wf.wf_id + '">';
trHtml = trHtml + '<tr>' +
'<td>' +
'<div class="dropdown">' +
@@ -220,12 +218,12 @@ define( [ 'utils/utils' ], function( Utils ) {
render: function() {
var self = this;
$.getJSON( Galaxy.root + 'workflow/upload_import_workflow', function( options ) {
self.$el.empty().append( self._mainTemplate( self, options ) );
self.$el.empty().append( self._mainTemplate( options ) );
});
},
/** Template for the import workflow page */
_mainTemplate: function( self, options ) {
_mainTemplate: function( options ) {
return "<div class='toolForm'>" +
"<div class='toolFormTitle'>Import Galaxy workflow</div>" +
"<div class='toolFormBody'>" +
static/maps/mvc/workflow/workflow.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"workflow.js","sources":["../../../src/mvc/workflow/workflow.js"],"names":["define","Utils","build_messages","self","$el_message","$el","find","status","getQueryString","message","addClass","html","_","escape","View","Backbone","extend","initialize","this","setElement","render","min_query_length","$","getJSON","Galaxy","root","workflows","$el_workflow","empty","append","_templateHeader","_templateActionButtons","length","_templateWorkflowTable","adjust_actiondropdown","each","wf","confirm_delete","register_show_tool_menu","search_workflow","_templateNoWorkflow","$el_checkboxes","on","ids","item","checkbox","checked","push","value","ajax","type","url","data","JSON","stringify","workflow_ids","contentType","done","window","location","workflow","$el_wf_link","id","$el_shared_wf_link","click","confirm","name","$el_searchinput","$el_tabletr","min_querylen","query","val","regular_expression","RegExp","hide","filter","test","text","show","css","tableHtml","trHtml","checkbox_html","show_in_tool_panel","wf_id","_templateActions","owner","user","attributes","username","number_of_steps","published","slug","ImportWorkflowView","options","_mainTemplate","myexperiment_target_url"],"mappings":"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"}
{"version":3,"file":"workflow.js","sources":["../../../src/mvc/workflow/workflow.js"],"names":["define","Utils","Ui","build_messages","$el_message","this","$","response","status","getQueryString","message","_","escape","persistent","cls","empty","html","Message","$el","View","Backbone","extend","initialize","setElement","render","self","min_query_length","getJSON","Galaxy","root","workflows","$el_workflow","append","_templateHeader","_templateActionButtons","length","_templateWorkflowTable","adjust_actiondropdown","each","wf","confirm_delete","register_show_tool_menu","search_workflow","_templateNoWorkflow","$el_checkboxes","on","ids","item","checkbox","checked","push","value","ajax","type","url","data","JSON","stringify","workflow_ids","contentType","done","window","location","workflow","$el_wf_link","id","$el_shared_wf_link","click","confirm","name","$el_searchinput","$el_tabletr","min_querylen","query","val","regular_expression","RegExp","hide","filter","test","text","show","css","tableHtml","trHtml","checkbox_html","show_in_tool_panel","wf_id","_templateActions","owner","user","attributes","username","number_of_steps","published","slug","ImportWorkflowView","options","_mainTemplate","myexperiment_target_url"],"mappings":"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"}
static/maps/nls/fr/locale.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/workflow/workflow.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/nls/fr/locale.js
+1 -1
View File
File diff suppressed because one or more lines are too long