Skip to content

Commit 4e5218f

Browse files
committed
Charts: fix script tag order to prevent new version of Backbone loading as AMD; UI, Histories: remove debug statement
1 parent a4d5d9d commit 4e5218f

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

client/galaxy/scripts/mvc/history/history-contents.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,9 @@ var HistoryContents = Backbone.Collection.extend( BASE_MVC.LoggableMixin ).exten
239239
},
240240

241241
// ........................................................................ misc
242-
/** override to get a correct/smarter merge when incoming data is partial */
242+
/** override to ensure type id is set */
243243
set : function( models, options ){
244244
_.each( models, function( model ){
245-
console.debug( 'type_id:', model.type_id )
246245
if( !model.type_id || !model.get( 'type_id' ) ){
247246
model.type_id = HISTORY_CONTENT.typeIdStr( model.history_content_type, model.id );
248247
}

config/plugins/visualizations/charts/templates/charts.mako

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
${h.js( 'libs/jquery/jquery',
1515
'libs/jquery/select2',
1616
'libs/bootstrap',
17-
'libs/require',
1817
'libs/underscore',
1918
'libs/backbone/backbone',
19+
'libs/require',
2020
'libs/d3')}
2121

2222
## shared css

static/scripts/mvc/history/history-contents.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,9 @@ var HistoryContents = Backbone.Collection.extend( BASE_MVC.LoggableMixin ).exten
239239
},
240240

241241
// ........................................................................ misc
242-
/** override to get a correct/smarter merge when incoming data is partial */
242+
/** override to ensure type id is set */
243243
set : function( models, options ){
244244
_.each( models, function( model ){
245-
console.debug( 'type_id:', model.type_id )
246245
if( !model.type_id || !model.get( 'type_id' ) ){
247246
model.type_id = HISTORY_CONTENT.typeIdStr( model.history_content_type, model.id );
248247
}

static/scripts/packed/mvc/history/history-contents.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)