Merge pull request #3799 from jmchilton/fix_extend_usage

Fix usage of _.extend in joint collection builder templates.
This commit is contained in:
Dannon Baker
2017-03-22 09:09:30 -04:00
committed by GitHub
9 changed files with 10 additions and 10 deletions
@@ -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