Skip to content

Commit 72950f7

Browse files
committed
Merge branch 'release/0.9.0'
2 parents 98bde9b + 30c8233 commit 72950f7

File tree

8 files changed

+85
-13
lines changed

8 files changed

+85
-13
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ngHandsontable",
33
"dependencies": {
44
"angular": "~1.4",
5-
"handsontable": "~0.22.0"
5+
"handsontable": "~0.23.0"
66
},
77
"homepage": "https://github.com/handsontable/ngHandsontable",
88
"authors": [

demo/build/app.js

+29-2
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.8.0');
41+
app.constant('version', 'v0.9.0');
4242
app.config(config);
4343

4444
angular.element(document).ready(function() {
@@ -346,7 +346,34 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
346346
title: 'Custom renderer',
347347
description: 'Custom renderer'
348348
},
349-
}
349+
},
350+
'PRO': {
351+
'collapsing-columns-with-nested-headers': {
352+
url: getUrl('wilani/3'),
353+
title: 'Collapsing columns with nested headers',
354+
description: 'Create a nested, hierarchical structure of headers with expandable and collapsible columns'
355+
},
356+
'filtering-simple': {
357+
url: getUrl('fijida/3'),
358+
title: 'Data filtering (simple example)',
359+
description: 'Display rows that meet your criteria and hide the rest'
360+
},
361+
'filtering-external-inputs': {
362+
url: getUrl('rewefa/9'),
363+
title: 'Data filtering (external inputs)',
364+
description: 'Display rows that meet your criteria and hide the rest'
365+
},
366+
'hiding-columns': {
367+
url: getUrl('wapufa/2'),
368+
title: 'Hiding columns',
369+
description: 'Hide specific columns and show the rest'
370+
},
371+
'hiding-rows': {
372+
url: getUrl('roximi/3'),
373+
title: 'Hiding rows',
374+
description: 'Hide specific rows and show the rest'
375+
},
376+
},
350377
};
351378
}());
352379

demo/js/demos.js

+28-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,33 @@
105105
title: 'Custom renderer',
106106
description: 'Custom renderer'
107107
},
108-
}
108+
},
109+
'PRO': {
110+
'collapsing-columns-with-nested-headers': {
111+
url: getUrl('wilani/3'),
112+
title: 'Collapsing columns with nested headers',
113+
description: 'Create a nested, hierarchical structure of headers with expandable and collapsible columns'
114+
},
115+
'filtering-simple': {
116+
url: getUrl('fijida/3'),
117+
title: 'Data filtering (simple example)',
118+
description: 'Display rows that meet your criteria and hide the rest'
119+
},
120+
'filtering-external-inputs': {
121+
url: getUrl('rewefa/9'),
122+
title: 'Data filtering (external inputs)',
123+
description: 'Display rows that meet your criteria and hide the rest'
124+
},
125+
'hiding-columns': {
126+
url: getUrl('wapufa/2'),
127+
title: 'Hiding columns',
128+
description: 'Hide specific columns and show the rest'
129+
},
130+
'hiding-rows': {
131+
url: getUrl('roximi/3'),
132+
title: 'Hiding rows',
133+
description: 'Hide specific rows and show the rest'
134+
},
135+
},
109136
};
110137
}());

dist/ngHandsontable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
2-
* ngHandsontable 0.8.0
2+
* ngHandsontable 0.9.0
33
*
44
* Copyright 2012-2015 Marcin Warpechowski
55
* Copyright 2015 Handsoncode sp. z o.o. <[email protected]>
66
* Licensed under the MIT license.
77
* https://github.com/handsontable/ngHandsontable
8-
* Date: Thu Feb 11 2016 16:39:03 GMT+0100 (CET)
8+
* Date: Thu Mar 03 2016 16:35:01 GMT+0100 (CET)
99
*/
1010

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

dist/ngHandsontable.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

+20-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,26 @@ <h2>Code</h2>
132132
It's recommended to put all your settings in one big object (<code>settings="ctrl.settings"</code>).
133133
Settings attribute unlike any other attributes is not watched so using this can be helpful to achieve higher performance.
134134
</p>
135-
<p>
136-
Click <a href="demo">here</a> to see more examples.
137-
</p>
135+
136+
<h2>More demos</h2>
137+
<ul>
138+
<li><a href="demo/index.html#/intro-simple-example">Simple example</a></li>
139+
<li><a href="demo/index.html#/columns-add-remove-column-ng-repeat">Add/Remove dynamically column</a></li>
140+
<li><a href="demo/index.html#/binding-data-binding">Data binding</a></li>
141+
<li><a href="demo/index.html#/callbacks-callbacks-by-object">Callbacks</a></li>
142+
<li><a href="demo/index.html#/pagination-rows-pagination">Pagination</a></li>
143+
<li><a href="demo/index.html#/PRO-filtering-external-inputs">Data filtering</a></li>
144+
<li><a href="demo/index.html#/PRO-collapsing-columns-with-nested-headers">Collapsing columns with nested headers</a></li>
145+
<li><a href="demo/index.html">More...</a></li>
146+
</ul>
147+
148+
<h2>PRO features</h2>
149+
<br>
150+
To install Handsontable PRO overwrite regular handsontable version with new one:
151+
<pre><code class="bash">
152+
$ bower install [email protected]:handsontable/handsontable-pro.git --save
153+
</code></pre>
154+
<i>If you don't have license for Pro yet, please click <a href="https://handsontable.com/pricing.html">here</a> for more info.</i>
138155

139156

140157
<script>hljs.initHighlightingOnLoad();</script>

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/handsontable/ngHandsontable/issues"
1111
},
1212
"author": "Marcin Warpechowski <[email protected]>",
13-
"version": "0.8.0",
13+
"version": "0.9.0",
1414
"devDependencies": {
1515
"angular": "^1.4.2",
1616
"angular-mocks": "^1.4.2",

test/directives/hotTable/watchingOptions.spec.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ describe('hotTable - Watching options', function() {
2020

2121
scope.$digest();
2222

23-
expect(scope.hotInstance.getData()).toBe(rootScope.value);
23+
expect(scope.hotInstance.getSourceData()).toBe(rootScope.value);
24+
expect(scope.hotInstance.getData()).toEqual([[null]]);
2425
});
2526

2627
it('should create table with `dataSchema` attribute', function() {

0 commit comments

Comments
 (0)