mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-07 01:57:50 +00:00
Update Backbone/Underscore vendor folders.
Former-commit-id: 3317d501fe535d91eefab8a5dcb3a88a791e20ac
This commit is contained in:
4
vendor/backbone/backbone.js
vendored
4
vendor/backbone/backbone.js
vendored
@@ -1234,8 +1234,8 @@
|
||||
// memory leaks.
|
||||
dispose: function() {
|
||||
this.undelegateEvents();
|
||||
if (this.model) this.model.off(null, null, this);
|
||||
if (this.collection) this.collection.off(null, null, this);
|
||||
if (this.model && this.model.off) this.model.off(null, null, this);
|
||||
if (this.collection && this.collection.off) this.collection.off(null, null, this);
|
||||
return this;
|
||||
},
|
||||
|
||||
|
||||
11
vendor/backbone/test/view.js
vendored
11
vendor/backbone/test/view.js
vendored
@@ -286,11 +286,11 @@ $(document).ready(function() {
|
||||
test("dispose", 0, function() {
|
||||
var View = Backbone.View.extend({
|
||||
events: {
|
||||
click: function() { ok(false); }
|
||||
click: function() { fail(); }
|
||||
},
|
||||
initialize: function() {
|
||||
this.model.on('all x', function(){ ok(false); }, this);
|
||||
this.collection.on('all x', function(){ ok(false); }, this);
|
||||
this.model.on('all x', function(){ fail(); }, this);
|
||||
this.collection.on('all x', function(){ fail(); }, this);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -305,6 +305,11 @@ $(document).ready(function() {
|
||||
view.$el.click();
|
||||
});
|
||||
|
||||
test("dispose with non Backbone objects", 0, function() {
|
||||
var view = new Backbone.View({model: {}, collection: {}});
|
||||
view.dispose();
|
||||
});
|
||||
|
||||
test("view#remove calls dispose.", 1, function() {
|
||||
var view = new Backbone.View();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user