Skip to content

Commit b8b7495

Browse files
committed
Merge branch 'release/0.13.0'
2 parents 59a3066 + 977c4b1 commit b8b7495

File tree

9 files changed

+76
-24
lines changed

9 files changed

+76
-24
lines changed

.npmignore

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Editor conf
2+
.idea
3+
dump.rdb
4+
5+
# Logs
6+
logs
7+
*.log
8+
9+
# Runtime data
10+
pids
11+
*.pid
12+
*.seed
13+
14+
coverage
15+
node_modules
16+
bower_components
17+
18+
# Common
19+
tmp
20+
.DS_Store
21+
*/.DS_Store
22+
*/*/.DS_Store
23+
lib-cov
24+
dev.html

.release.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"package_file_location": "./package.json",
3+
"no_confirm": false,
4+
"skip_git_pull": false,
5+
"skip_git_push": false,
6+
"release_message": true,
7+
"remote": "origin",
8+
"pre_commit_commands": [
9+
"npm run build",
10+
"npm run test"
11+
],
12+
"post_commit_commands": [],
13+
"post_complete_commands": [
14+
"npm publish"
15+
],
16+
"files_to_commit": [
17+
"./dist/**/*",
18+
"./demo/**/*"
19+
]
20+
}

bower.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "ngHandsontable",
33
"dependencies": {
4-
"angular": "~1.4",
5-
"handsontable": "~0.25.0"
4+
"angular": "~1.5.0",
5+
"handsontable": "~0.28.4"
66
},
77
"homepage": "https://github.com/handsontable/ngHandsontable",
88
"authors": [
@@ -28,8 +28,5 @@
2828
"src",
2929
"test",
3030
"tests"
31-
],
32-
"devDependencies": {
33-
"angular-ui-router": "~0.2.15"
34-
}
31+
]
3532
}

demo/build/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
3838
}
3939
config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];
4040

41-
app.constant('version', 'v0.12.0');
41+
app.constant('version', 'v0.13.0');
4242
app.config(config);
4343

4444
angular.element(document).ready(function() {

demo/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<!--
1515
Loading Handsontable (full distribution that includes all dependencies)
1616
-->
17-
<link rel="stylesheet" media="screen" href="../bower_components/handsontable/dist/handsontable.full.css">
18-
<script src="../bower_components/angular/angular.js"></script>
19-
<script src="../bower_components/angular-ui-router/release/angular-ui-router.js"></script>
20-
<script src="../bower_components/handsontable/dist/handsontable.full.js"></script>
17+
<link rel="stylesheet" media="screen" href="../node_modules/handsontable/dist/handsontable.full.css">
18+
<script src="../node_modules/angular/angular.js"></script>
19+
<script src="../node_modules/angular-ui-router/release/angular-ui-router.js"></script>
20+
<script src="../node_modules/handsontable/dist/handsontable.full.js"></script>
2121
<script src="../dist/ngHandsontable.js"></script>
2222

2323
<script src="build/app.js"></script>

dist/ngHandsontable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
2-
* ngHandsontable 0.12.0
2+
* ng-handsontable 0.13.0
33
*
44
* Copyright 2012-2015 Marcin Warpechowski
55
* Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
66
* Licensed under the MIT license.
77
* https://github.com/handsontable/ngHandsontable
8-
* Date: Wed May 25 2016 15:56:21 GMT+0200 (CEST)
8+
* Date: Wed Oct 26 2016 10:00:05 GMT+0200 (CEST)
99
*/
1010

1111
if (document.all && !document.addEventListener) { // IE 8 and lower

dist/ngHandsontable.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<!--
1515
Loading Handsontable (full distribution that includes all dependencies)
1616
-->
17-
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="bower_components/handsontable/dist/handsontable.full.css">
18-
<script data-jsfiddle="common" src="bower_components/angular/angular.js"></script>
19-
<script data-jsfiddle="common" src="bower_components/handsontable/dist/handsontable.full.js"></script>
17+
<link data-jsfiddle="common" rel="stylesheet" media="screen" href="node_modules/handsontable/dist/handsontable.full.css">
18+
<script data-jsfiddle="common" src="node_modules/angular/angular.js"></script>
19+
<script data-jsfiddle="common" src="node_modules/handsontable/dist/handsontable.full.js"></script>
2020
<script data-jsfiddle="common" src="dist/ngHandsontable.js"></script>
2121

2222
<script data-jsfiddle="common" src="demo/js/services/dataFactory.js"></script>
@@ -48,6 +48,10 @@ <h2>Install</h2>
4848
<pre><code class="bash">
4949
$ bower install ngHandsontable --save
5050
</code></pre>
51+
using NPM:
52+
<pre><code class="bash">
53+
$ npm install ng-handsontable --save
54+
</code></pre>
5155
Or <a href="https://github.com/handsontable/ngHandsontable/archive/master.zip">download as ZIP</a>.
5256

5357
<h2>Usage</h2>

0 commit comments

Comments
 (0)