mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge pull request #3799 from jmchilton/fix_extend_usage
Fix usage of _.extend in joint collection builder templates.
This commit is contained in:
@@ -743,7 +743,7 @@ var ListCollectionCreator = Backbone.View.extend( BASE_MVC.LoggableMixin ).exten
|
||||
//TODO: underscore currently unnecc. bc no vars are used
|
||||
//TODO: better way of localizing text-nodes in long strings
|
||||
/** underscore template fns attached to class */
|
||||
templates : _.extend(baseCreator.CollectionCreatorMixin._creatorTemplates, {
|
||||
templates : _.extend({}, baseCreator.CollectionCreatorMixin._creatorTemplates, {
|
||||
|
||||
/** the header (not including help text) */
|
||||
header : _.template([
|
||||
|
||||
@@ -1418,7 +1418,7 @@ var PairedCollectionCreator = Backbone.View.extend( baseMVC.LoggableMixin ).exte
|
||||
//TODO: underscore currently unnecc. bc no vars are used
|
||||
//TODO: better way of localizing text-nodes in long strings
|
||||
/** underscore template fns attached to class */
|
||||
PairedCollectionCreator.templates = PairedCollectionCreator.templates || _.extend(baseCreator.CollectionCreatorMixin._creatorTemplates, {
|
||||
PairedCollectionCreator.templates = _.extend(PairedCollectionCreator.templates || {}, baseCreator.CollectionCreatorMixin._creatorTemplates, {
|
||||
|
||||
/** the header (not including help text) */
|
||||
header : _.template([
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user