Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update for lodash v4. compatibility #308

Merged
merged 2 commits into from
Sep 13, 2016
Merged

Update for lodash v4. compatibility #308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39860d5
Update for lodash v4. compatibility
bazineta Sep 13, 2016
194b2a6
Use native bind instead of _.bind
bazineta Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions backbone.stickit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
if (_.isObject(bindingSelector)) {
_.each(bindingSelector, function(v, selector) {
this.unstickit(model, selector);
}, this);
}.bind(this));
return;
}

Expand All @@ -71,10 +71,12 @@
});

// Trigger an event for each model that was unbound.
_.invoke(_.uniq(models), 'trigger', 'stickit:unstuck', this.cid);
_.each(_.uniq(models), function (model) {
model.trigger('stickit:unstuck', this.cid);
}.bind(this));

// Call `_destroy` on a unique list of the binding callbacks.
_.each(_.uniq(destroyFns), function(fn) { fn.call(this); }, this);
_.each(_.uniq(destroyFns), function(fn) { fn.call(this); }.bind(this));

this.$el.off('.stickit' + (model ? '.' + model.cid : ''), bindingSelector);
},
Expand Down Expand Up @@ -118,7 +120,7 @@
var bindings = selector;
_.each(bindings, function(val, key) {
this.addBinding(model, key, val);
}, this);
}.bind(this));
return;
}

Expand Down Expand Up @@ -177,8 +179,8 @@
if (currentVal) setAttr(model, modelAttr, val, options, config);
};
var sel = selector === ':el'? '' : selector;
this.$el.on(eventName, sel, _.bind(listener, this));
}, this);
this.$el.on(eventName, sel, listener.bind(this));
}.bind(this));

// Setup a `change:modelAttr` observer to keep the view element in sync.
// `modelAttr` may be an array of attributes or a single string value.
Expand Down Expand Up @@ -332,7 +334,7 @@
var lastClass = '';
var observed = attrConfig.observe || (attrConfig.observe = modelAttr);
var updateAttr = function() {
var updateType = _.contains(props, attrConfig.name) ? 'prop' : 'attr',
var updateType = _.includes(props, attrConfig.name) ? 'prop' : 'attr',
val = getAttr(model, observed, attrConfig);

// If it is a class then we need to remove the last value and add the new.
Expand Down