Skip to content

Commit

Permalink
bump and build 1.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
samccone committed Mar 24, 2014
1 parent 622bb2e commit b71b7e0
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 24 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"./lib/backbone.marionette.js",
"./lib/core/amd/backbone.marionette.js"
],
"version": "1.7.0",
"version": "1.7.1",
"keywords": [
"backbone",
"framework",
Expand Down
19 changes: 12 additions & 7 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
### v1.7.1 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.7.0...v1.7.1)

* Fixes
* Enables the use of string based behavior event methods.

### v1.7.0 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.6.4...v1.7.0)

Version 1.7 represents a significant step in formalizing the ways to improve your `view` code though reusable `behaviors`. Say goodbye to custom mixin strategies and welcome `behaviors` into town.

* Behaviors

A `Behavior` is an isolated set of DOM / user interactions interactions that can be mixed into any `View`. `Behaviors` allow you to blackbox `View` specific interactions into portable logical chunks, keeping your `views` simple and your code DRY. **[Read the docs here.](https://github.com/marionettejs/backbone.marionette/blob/master/docs/marionette.behavior.md)**

* Modules
* Call stop listening on module stop.

* Events
* add a before:show event for views and regions

* Docs
* Entire refactor of application docs.
* Entire refactor of application docs.

* Tests
* Rework the module tests to improve readability and consistency.
* Rework the module tests to improve readability and consistency.

* General
* switch from `~` to `^` for *trusted* dependencies.
* switch from `~` to `^` for *trusted* dependencies.

### v1.6.4 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.6.3...v1.6.4)
* Fixes
* Patches a bug that would cause modules to be initialized twice when a custom module class is passed
Expand All @@ -31,7 +36,7 @@ Version 1.7 represents a significant step in formalizing the ways to improve you
```js
var ItemModule = Marionette.Module.extend({
startWithParent: false,
initialize: function(options) {},
initialize: function(options) {},
onStart: function() {}
});

Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.marionette",
"description": "Make your Backbone.js apps dance!",
"version": "1.7.0",
"version": "1.7.1",
"repo": "marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down
7 changes: 5 additions & 2 deletions lib/backbone.marionette.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.7.0
// v1.7.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2273,7 +2273,10 @@ Marionette.Behaviors = (function(Marionette, _) {
// append white-space at the end of each key to prevent behavior key collisions
// this is relying on the fact backbone events considers "click .foo" the same "click .foo "
var whitespace = (new Array(i+1)).join(" ");
_events[key + whitespace] = behaviorEvents[key];
var eventKey = key + whitespace;
var handler = _.isFunction(behaviorEvents[key]) ? behaviorEvents[key] : b[behaviorEvents[key]];

_events[eventKey] = handler;
});

_behaviorsEvents = _.extend(_behaviorsEvents, _events);
Expand Down
2 changes: 1 addition & 1 deletion lib/backbone.marionette.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/backbone.marionette.min.js

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions lib/core/amd/backbone.marionette.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.7.0
// v1.7.1
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -1863,7 +1863,10 @@ Marionette.Behaviors = (function(Marionette, _) {
// append white-space at the end of each key to prevent behavior key collisions
// this is relying on the fact backbone events considers "click .foo" the same "click .foo "
var whitespace = (new Array(i+1)).join(" ");
_events[key + whitespace] = behaviorEvents[key];
var eventKey = key + whitespace;
var handler = _.isFunction(behaviorEvents[key]) ? behaviorEvents[key] : b[behaviorEvents[key]];

_events[eventKey] = handler;
});

_behaviorsEvents = _.extend(_behaviorsEvents, _events);
Expand Down
4 changes: 2 additions & 2 deletions lib/core/amd/backbone.marionette.min.js

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion lib/core/backbone.marionette.js
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,10 @@ Marionette.Behaviors = (function(Marionette, _) {
// append white-space at the end of each key to prevent behavior key collisions
// this is relying on the fact backbone events considers "click .foo" the same "click .foo "
var whitespace = (new Array(i+1)).join(" ");
_events[key + whitespace] = behaviorEvents[key];
var eventKey = key + whitespace;
var handler = _.isFunction(behaviorEvents[key]) ? behaviorEvents[key] : b[behaviorEvents[key]];

_events[eventKey] = handler;
});

_behaviorsEvents = _.extend(_behaviorsEvents, _events);
Expand Down
2 changes: 1 addition & 1 deletion lib/core/backbone.marionette.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/core/backbone.marionette.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backbone.marionette",
"description": "Make your Backbone.js apps dance!",
"version": "1.7.0",
"version": "1.7.1",
"homepage": "https://github.com/marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion upgradeGuide.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Upgrade to v.1.5.0 ~ v.1.7.0
## Upgrade to v.1.5.0 ~ v.1.7.x
If you are overriding `appendHTML` in your `collectionView` or `compositeView` make sure to update your method to match the [buffering implementation](https://github.com/marionettejs/backbone.marionette/blob/master/src/marionette.collectionview.js#L299). If you do not you may observe the `show` event not being called per `itemViews`

## Upgrade to v.1.1.0 ~ v.1.4.x
Expand Down

0 comments on commit b71b7e0

Please sign in to comment.