Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Remove example bower_components from git
Browse files Browse the repository at this point in the history
Signed-off-by: Jarrod Payne <[email protected]>
  • Loading branch information
paynecodes committed Jun 8, 2014
1 parent 9d3574d commit a0ab98a
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist/bower_components
.sass-cache
src/bower_components
test
examples/app/bower_components
10 changes: 5 additions & 5 deletions examples/app/bower_components/backbone.marionette/.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.8.6",
"version": "1.8.7",
"keywords": [
"backbone",
"framework",
Expand Down Expand Up @@ -46,13 +46,13 @@
"sinonjs": "1.7.3",
"jasmine-sinon": "0.3.1"
},
"_release": "1.8.6",
"_release": "1.8.7",
"_resolution": {
"type": "version",
"tag": "v1.8.6",
"commit": "e0185ea1194e5ebfcdb7366d78dc66574885e3de"
"tag": "v1.8.7",
"commit": "23de7e16efa357b6aed6669028f72edd2d04ebaa"
},
"_source": "git://github.com/marionettejs/backbone.marionette.git",
"_target": "~1.8.6",
"_target": "^1.5.0",
"_originalSource": "backbone.marionette"
}
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.8.6",
"version": "1.8.7",
"keywords": [
"backbone",
"framework",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### v1.8.6 [view commit logs](https://github.com/marionettejs/backbone.marionette/compare/v1.8.6...v1.8.7)

* Fixes
* Fixed nasty ui interpolation bug with behaviors.

* General
* Minor Doc cleanup

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

* Regions
Expand Down
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.8.6",
"version": "1.8.7",
"repo": "marionettejs/backbone.marionette",
"main": "lib/core/amd/backbone.marionette.js",
"keywords": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.8.6
// v1.8.7
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2357,7 +2357,7 @@ Marionette.Behaviors = (function(Marionette, _) {

_.each(behaviors, function(b, i) {
var _events = {};
var behaviorEvents = _.result(b, 'events') || {};
var behaviorEvents = _.clone(_.result(b, 'events')) || {};
var behaviorUI = _.result(b, 'ui');

// Construct an internal UI hash first using
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.8.6
// v1.8.7
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -1913,7 +1913,7 @@

_.each(behaviors, function(b, i) {
var _events = {};
var behaviorEvents = _.result(b, 'events') || {};
var behaviorEvents = _.clone(_.result(b, 'events')) || {};
var behaviorUI = _.result(b, 'ui');

// Construct an internal UI hash first using
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// MarionetteJS (Backbone.Marionette)
// ----------------------------------
// v1.8.6
// v1.8.7
//
// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
Expand Down Expand Up @@ -2347,7 +2347,7 @@ Marionette.Behaviors = (function(Marionette, _) {

_.each(behaviors, function(b, i) {
var _events = {};
var behaviorEvents = _.result(b, 'events') || {};
var behaviorEvents = _.clone(_.result(b, 'events')) || {};
var behaviorUI = _.result(b, 'ui');

// Construct an internal UI hash first using
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Marionette.Behaviors = (function(Marionette, _) {

_.each(behaviors, function(b, i) {
var _events = {};
var behaviorEvents = _.result(b, 'events') || {};
var behaviorEvents = _.clone(_.result(b, 'events')) || {};
var behaviorUI = _.result(b, 'ui');

// Construct an internal UI hash first using
Expand Down

0 comments on commit a0ab98a

Please sign in to comment.