Skip to content

Commit

Permalink
Merge pull request #487 from glenpike/fix-bower-versioning
Browse files Browse the repository at this point in the history
Bump the patch version to 0.14.1 so we can tag and update bower.
  • Loading branch information
glenpike committed Jan 21, 2016
2 parents fda7dc0 + bed2295 commit 7aad9e3
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
bower_components
/node_modules/
*.iml
*.ipr
*.iws
*.iws
14 changes: 2 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
{

"name": "backbone-forms",

"version": "0.14.0",

"version": "0.14.1",
"main": "distribution/backbone-forms.js",

"dependencies": {

"backbone": "1.0"

},

"devDependencies": {

}

"devDependencies": {}
}
4 changes: 2 additions & 2 deletions distribution.amd/backbone-forms.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Backbone Forms v0.14.0
* Backbone Forms v0.14.1
*
* NOTE:
* This version is for use with RequireJS
Expand Down Expand Up @@ -2505,7 +2505,7 @@ Form.editors.DateTime = Form.editors.Base.extend({


//Metadata
Form.VERSION = '0.14.0';
Form.VERSION = '0.14.1';

//Exports
Backbone.Form = Form;
Expand Down
2 changes: 1 addition & 1 deletion distribution.amd/backbone-forms.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions distribution/backbone-forms.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Backbone Forms v0.14.0
* Backbone Forms v0.14.1
*
* Copyright (c) 2014 Charles Davison, Pow Media Ltd
*
Expand Down Expand Up @@ -2516,7 +2516,7 @@ Form.editors.DateTime = Form.editors.Base.extend({


//Metadata
Form.VERSION = '0.14.0';
Form.VERSION = '0.14.1';


//Exports
Expand Down
2 changes: 1 addition & 1 deletion distribution/backbone-forms.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": {
"name": "Charles Davison"
},
"version": "0.14.0",
"version": "0.14.1",
"dependencies": {
"backbone": "~1.1.2"
},
Expand All @@ -13,7 +13,7 @@
"underscore": "~1.5.2",
"uglify-js": "~2.4.11",
"jquery": "~2.1.0",
"browserify": "~3.23.1"
"browserify": "~3.38.0"
},
"main": "distribution.amd/backbone-forms.js",
"browser": "distribution/backbone-forms.js",
Expand Down
4 changes: 2 additions & 2 deletions scripts/build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

var builder = require('buildify'),
path = require('path');
fs = require('fs');

var templateData = {
version: require('../package.json').version
Expand Down Expand Up @@ -66,7 +66,7 @@ builder(baseDir)
.save('distribution/editors/'+name+'.min.js');

//CSS file
if (path.existsSync(baseDir + '/src/editors/'+name+'.css')) {
if (fs.existsSync(baseDir + '/src/editors/'+name+'.css')) {
builder(baseDir)
.load('src/editors/extra/'+name+'.css')
.save('distribution/editors/'+name+'.css')
Expand Down

0 comments on commit 7aad9e3

Please sign in to comment.