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.

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

Bump version #133

Merged
merged 12 commits into from
Dec 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
sudo: false
language: node_js
before_install: npm install -g grunt-cli
before_install:
- npm install -g grunt-cli
node_js:
- "0.10"
- "4"
- "6"
env:
- CXX=g++-4.8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ module.exports = function(grunt) {
jshint: {
src: {
options: {
jshintrc: '.jshintrc'
jshintrc: '.jshintrc',
reporterOutput: ''
},
src: ['src/**.js']
},
Expand Down
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backbone.syphon",
"version": "0.6.3",
"version": "0.7.0",
"description": "Serialize a Backbone.View in to a JavaScript object.",
"main": "./lib/backbone.syphon.js",
"homepage": "https://github.com/marionettejs/backbone.syphon",
Expand All @@ -23,9 +23,9 @@
}
],
"dependencies": {
"jquery": "^1.8.0 || ^2.1.0",
"backbone" : "1.0.0 - 1.3.x",
"underscore": "1.4.4 - 1.8.3"
"backbone": "1.3.3",
"jquery": "^1.8.0 - ^3.1.1",
"underscore": "^1.8.3"
},
"ignore": [
"apidoc.md",
Expand Down
10 changes: 5 additions & 5 deletions lib/backbone.syphon.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Backbone.Syphon, v0.6.3
// Backbone.Syphon, v1.0.0
// ----------------------------------
//
// Copyright (c) 2015 Derick Bailey, Muted Solutions, LLC.
// Copyright (c) 2016 Derick Bailey, Muted Solutions, LLC.
// Distributed under MIT license
//
// http://github.com/marionettejs/backbone.syphon
Expand All @@ -27,7 +27,7 @@

var Syphon = Backbone.Syphon = {};

Syphon.VERSION = '0.6.3';
Syphon.VERSION = '1.0.0';

Syphon.noConflict = function() {
Backbone.Syphon = previousSyphon;
Expand Down Expand Up @@ -135,8 +135,8 @@
return (ignoredTypeOrSelector === myType) || $(el).is(ignoredTypeOrSelector);
});

var foundInInclude = _.include(config.include, identifier);
var foundInExclude = _.include(config.exclude, identifier);
var foundInInclude = _.includes(config.include, identifier);
var foundInExclude = _.includes(config.exclude, identifier);

if (foundInInclude) {
reject = false;
Expand Down
6 changes: 3 additions & 3 deletions lib/backbone.syphon.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading