v2.4.7 (#3034)

* CollectionView#reorder will remove an already displayed emptyView * Bump and build 2.4.7
marionettejs · May 31, 2016 · e1a512a · e1a512a
1 parent e9de4a1
commit e1a512a
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 16 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -86,7 +86,7 @@ module.exports = function(grunt) {
         options : {
           banner: '<%= meta.core_bundle %>',
           sourceMap : true,
-          sourceMapName : 'lib/core/backbone.marionette.map',
+          sourceMapName : 'lib/core/backbone.marionette.min.js.map',
           sourceMappingURL : '<%= uglify.bundle.options.sourceMappingURL %>',
           sourceMapPrefix : 1
         }
@@ -98,7 +98,7 @@ module.exports = function(grunt) {
         options : {
           banner: '<%= meta.banner %>',
           sourceMap : true,
-          sourceMapName : 'lib/backbone.marionette.map',
+          sourceMapName : 'lib/backbone.marionette.min.js.map',
           sourceMappingURL : 'backbone.marionette.map',
           sourceMapPrefix : 2
         }

diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description": "Make your Backbone.js apps dance with a composite application architecture!",
   "homepage": "http://marionettejs.org",
   "main": "./lib/core/backbone.marionette.js",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "keywords": [
     "backbone",
     "framework",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,10 @@
+### v2.4.7 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.4.6...v2.4.7)
+
+#### Fixes
+
+* CollectionView#reorder will no longer remove an already displayed emptyView.
+* Fixed build of sourcemap files.
+
 ### v2.4.6 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v2.4.5...v2.4.6)
 
 #### Misc

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "repo": "marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [

diff --git a/lib/backbone.marionette.js b/lib/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.4.6
+// v2.4.7
 //
 // Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -489,7 +489,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.4.6';
+  Marionette.VERSION = '2.4.7';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -2310,6 +2310,9 @@
     reorder: function() {
       var children = this.children;
       var models = this._filteredSortedModels();
+
+      if (!models.length && this._showingEmptyView) { return this; }
+
       var anyModelsAdded = _.some(models, function(model) {
         return !children.findByModel(model);
       });

diff --git a/lib/backbone.marionette.min.js b/lib/backbone.marionette.min.js
diff --git a/lib/backbone.marionette.min.js.map b/lib/backbone.marionette.min.js.map
diff --git a/lib/core/backbone.marionette.js b/lib/core/backbone.marionette.js
@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.4.6
+// v2.4.7
 //
 // Copyright (c)2016 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -31,7 +31,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.4.6';
+  Marionette.VERSION = '2.4.7';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -1857,6 +1857,9 @@
     reorder: function() {
       var children = this.children;
       var models = this._filteredSortedModels();
+
+      if (!models.length && this._showingEmptyView) { return this; }
+
       var anyModelsAdded = _.some(models, function(model) {
         return !children.findByModel(model);
       });

diff --git a/lib/core/backbone.marionette.min.js b/lib/core/backbone.marionette.min.js
diff --git a/lib/core/backbone.marionette.min.js.map b/lib/core/backbone.marionette.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.marionette",
   "description": "Make your Backbone.js apps dance!",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "homepage": "https://github.com/marionettejs/backbone.marionette",
   "main": "lib/core/backbone.marionette.js",
   "keywords": [

diff --git a/src/collection-view.js b/src/collection-view.js
@@ -165,6 +165,9 @@ Marionette.CollectionView = Marionette.View.extend({
   reorder: function() {
     var children = this.children;
     var models = this._filteredSortedModels();
+
+    if (!models.length && this._showingEmptyView) { return this; }
+
     var anyModelsAdded = _.some(models, function(model) {
       return !children.findByModel(model);
     });

diff --git a/test/unit/collection-view.empty-view.spec.js b/test/unit/collection-view.empty-view.spec.js
@@ -332,6 +332,23 @@ describe('collectionview - emptyView', function() {
     });
   });
 
+  describe('when reorder is called with an emptyView', function() {
+    beforeEach(function() {
+      this.collection = new Backbone.Collection([]);
+      this.collectionView = new this.EmptyCollectionView({
+        collection: this.collection
+      });
+
+      this.collectionView.render();
+
+      this.collectionView.reorder();
+    });
+
+    it('should append the html for the emptyView', function() {
+      expect(this.collectionView.$el).to.have.$html('<span>empty</span>');
+    });
+  });
+
   describe('when rendering and an "emptyViewOptions" is provided', function() {
     beforeEach(function() {
       this.collection = new Backbone.Collection();