Bump Marionette version, misc. bug fix

MeoMix · Sep 10, 2015 · b440c3b · b440c3b
1 parent 3e9895a
commit b440c3b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
         },
         "format": "cjs"
       },
-      "github:marionettejs/[email protected].2": {
+      "github:marionettejs/[email protected].3": {
         "map": {
           "underscore": "common/shim/lodash.reference.shim"
         },

diff --git a/src/js/background/mixin/collectionUniqueVideo.js b/src/js/background/mixin/collectionUniqueVideo.js
@@ -1,7 +1,7 @@
 import _ from 'common/shim/lodash.reference.shim';
 import {Collection, Model} from 'backbone';
 
-export default {
+var CollectionUniqueVideo = {
   initialize: function() {
     // Stub out the default implementation of add with one which enforces uniqueness based on video id.
     this.add = this._add;
@@ -100,4 +100,6 @@ export default {
   _hasVideo: function(video) {
     return !_.isUndefined(this._getByVideoId(video.get('id')));
   }
-};
+};
+
+export default CollectionUniqueVideo;
diff --git a/src/js/foreground/view/selectionBar/selectionBarView.js b/src/js/foreground/view/selectionBar/selectionBarView.js
@@ -11,6 +11,10 @@ var SelectionBarView = LayoutView.extend({
   className: 'selectionBar panel-content panel-content--uncolored',
   template: selectionBarTemplate,
 
+  templateHelpers: {
+    closeIcon: closeIconTemplate
+  },
+
   ui: {
     playButton: 'playButton',
     addButton: 'addButton',

diff --git a/src/js/lib/jspm.config.js b/src/js/lib/jspm.config.js
@@ -32,7 +32,7 @@ System.config({
     "hbs": "github:davis/[email protected]",
     "jquery": "github:components/[email protected]",
     "lodash": "npm:[email protected]",
-    "marionette": "github:marionettejs/[email protected].2",
+    "marionette": "github:marionettejs/[email protected].3",
     "mocha": "npm:[email protected]",
     "process": "npm:[email protected]",
     "sinon": "npm:[email protected]",