Skip to content

Commit

Permalink
Merge pull request #1 from rda1902/master
Browse files Browse the repository at this point in the history
Backbone was updated to 1.2.3
  • Loading branch information
jmadureira committed Jun 2, 2016
2 parents 231090b + ce1432c commit 9daf09b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Backbone-Rails [![Build Status](https://secure.travis-ci.org/codebrew/backbone-rails.png)](http://travis-ci.org/codebrew/backbone-rails)[![Gem Version](https://badge.fury.io/rb/rails-backbone.png)](http://badge.fury.io/rb/rails-backbone)

Easily setup and use backbone.js (1.2.2) with Rails 3.1 and greater
Easily setup and use backbone.js (1.2.3) with Rails 3.1 and greater

##Version##

###Github master branch###

Gem version : 1.2.2
Gem version : 1.2.3

Backbone version : 1.2.2
Backbone version : 1.2.3

Underscore version : 1.8.3

###Rubygems###

Gem version : 1.2.2
Gem version : 1.2.3

Backbone version : 1.2.2
Backbone version : 1.2.3

Underscore version : 1.8.3

Expand Down
2 changes: 1 addition & 1 deletion backbone-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# project in your rails apps through git.
Gem::Specification.new do |s|
s.name = "rails-backbone"
s.version = "1.2.2"
s.version = "1.2.3"
s.authors = ["Ryan Fitzgerald", "Code Brew Studios", "Manu S Ajith"]
s.email = ["[email protected]", "[email protected]"]
s.homepage = "http://github.com/codebrew/backbone-rails"
Expand Down
5 changes: 3 additions & 2 deletions vendor/assets/javascripts/backbone.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Backbone.js 1.2.2
// Backbone.js 1.2.3

// (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Backbone may be freely distributed under the MIT license.
Expand Down Expand Up @@ -44,7 +44,7 @@
var slice = Array.prototype.slice;

// Current version of the library. Keep in sync with `package.json`.
Backbone.VERSION = '1.2.2';
Backbone.VERSION = '1.2.3';

// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
// the `$` variable.
Expand Down Expand Up @@ -766,6 +766,7 @@

// Splices `insert` into `array` at index `at`.
var splice = function(array, insert, at) {
at = Math.min(Math.max(at, 0), array.length);
var tail = Array(array.length - at);
var length = insert.length;
for (var i = 0; i < tail.length; i++) tail[i] = array[i + at];
Expand Down

0 comments on commit 9daf09b

Please sign in to comment.