Skip to content

Commit 7aad9e3

Browse files
committed
Merge pull request #487 from glenpike/fix-bower-versioning
Bump the patch version to 0.14.1 so we can tag and update bower.
2 parents fda7dc0 + bed2295 commit 7aad9e3

File tree

8 files changed

+14
-23
lines changed

8 files changed

+14
-23
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
bower_components
12
/node_modules/
23
*.iml
34
*.ipr
4-
*.iws
5+
*.iws

bower.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
{
2-
32
"name": "backbone-forms",
4-
5-
"version": "0.14.0",
6-
3+
"version": "0.14.1",
74
"main": "distribution/backbone-forms.js",
8-
95
"dependencies": {
10-
116
"backbone": "1.0"
12-
137
},
14-
15-
"devDependencies": {
16-
17-
}
18-
8+
"devDependencies": {}
199
}

distribution.amd/backbone-forms.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Backbone Forms v0.14.0
2+
* Backbone Forms v0.14.1
33
*
44
* NOTE:
55
* This version is for use with RequireJS
@@ -2505,7 +2505,7 @@ Form.editors.DateTime = Form.editors.Base.extend({
25052505

25062506

25072507
//Metadata
2508-
Form.VERSION = '0.14.0';
2508+
Form.VERSION = '0.14.1';
25092509

25102510
//Exports
25112511
Backbone.Form = Form;

distribution.amd/backbone-forms.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

distribution/backbone-forms.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Backbone Forms v0.14.0
2+
* Backbone Forms v0.14.1
33
*
44
* Copyright (c) 2014 Charles Davison, Pow Media Ltd
55
*
@@ -2516,7 +2516,7 @@ Form.editors.DateTime = Form.editors.Base.extend({
25162516

25172517

25182518
//Metadata
2519-
Form.VERSION = '0.14.0';
2519+
Form.VERSION = '0.14.1';
25202520

25212521

25222522
//Exports

distribution/backbone-forms.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": {
55
"name": "Charles Davison"
66
},
7-
"version": "0.14.0",
7+
"version": "0.14.1",
88
"dependencies": {
99
"backbone": "~1.1.2"
1010
},
@@ -13,7 +13,7 @@
1313
"underscore": "~1.5.2",
1414
"uglify-js": "~2.4.11",
1515
"jquery": "~2.1.0",
16-
"browserify": "~3.23.1"
16+
"browserify": "~3.38.0"
1717
},
1818
"main": "distribution.amd/backbone-forms.js",
1919
"browser": "distribution/backbone-forms.js",

scripts/build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

33
var builder = require('buildify'),
4-
path = require('path');
4+
fs = require('fs');
55

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

6868
//CSS file
69-
if (path.existsSync(baseDir + '/src/editors/'+name+'.css')) {
69+
if (fs.existsSync(baseDir + '/src/editors/'+name+'.css')) {
7070
builder(baseDir)
7171
.load('src/editors/extra/'+name+'.css')
7272
.save('distribution/editors/'+name+'.css')

0 commit comments

Comments
 (0)