Skip to content

Commit

Permalink
Merge branch 'release/0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed Mar 3, 2016
2 parents 98bde9b + 30c8233 commit 72950f7
Show file tree
Hide file tree
Showing 8 changed files with 85 additions and 13 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ngHandsontable",
"dependencies": {
"angular": "~1.4",
"handsontable": "~0.22.0"
"handsontable": "~0.23.0"
},
"homepage": "https://github.com/handsontable/ngHandsontable",
"authors": [
Expand Down
31 changes: 29 additions & 2 deletions demo/build/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
}
config.$inject = ['$sceDelegateProvider', '$httpProvider', '$stateProvider', '$compileProvider', '$urlRouterProvider', 'demoMapProvider'];

app.constant('version', 'v0.8.0');
app.constant('version', 'v0.9.0');
app.config(config);

angular.element(document).ready(function() {
Expand Down Expand Up @@ -346,7 +346,34 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof requ
title: 'Custom renderer',
description: 'Custom renderer'
},
}
},
'PRO': {
'collapsing-columns-with-nested-headers': {
url: getUrl('wilani/3'),
title: 'Collapsing columns with nested headers',
description: 'Create a nested, hierarchical structure of headers with expandable and collapsible columns'
},
'filtering-simple': {
url: getUrl('fijida/3'),
title: 'Data filtering (simple example)',
description: 'Display rows that meet your criteria and hide the rest'
},
'filtering-external-inputs': {
url: getUrl('rewefa/9'),
title: 'Data filtering (external inputs)',
description: 'Display rows that meet your criteria and hide the rest'
},
'hiding-columns': {
url: getUrl('wapufa/2'),
title: 'Hiding columns',
description: 'Hide specific columns and show the rest'
},
'hiding-rows': {
url: getUrl('roximi/3'),
title: 'Hiding rows',
description: 'Hide specific rows and show the rest'
},
},
};
}());

Expand Down
29 changes: 28 additions & 1 deletion demo/js/demos.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,33 @@
title: 'Custom renderer',
description: 'Custom renderer'
},
}
},
'PRO': {
'collapsing-columns-with-nested-headers': {
url: getUrl('wilani/3'),
title: 'Collapsing columns with nested headers',
description: 'Create a nested, hierarchical structure of headers with expandable and collapsible columns'
},
'filtering-simple': {
url: getUrl('fijida/3'),
title: 'Data filtering (simple example)',
description: 'Display rows that meet your criteria and hide the rest'
},
'filtering-external-inputs': {
url: getUrl('rewefa/9'),
title: 'Data filtering (external inputs)',
description: 'Display rows that meet your criteria and hide the rest'
},
'hiding-columns': {
url: getUrl('wapufa/2'),
title: 'Hiding columns',
description: 'Hide specific columns and show the rest'
},
'hiding-rows': {
url: getUrl('roximi/3'),
title: 'Hiding rows',
description: 'Hide specific rows and show the rest'
},
},
};
}());
4 changes: 2 additions & 2 deletions dist/ngHandsontable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* ngHandsontable 0.8.0
* ngHandsontable 0.9.0
*
* Copyright 2012-2015 Marcin Warpechowski
* Copyright 2015 Handsoncode sp. z o.o. <hello@handsontable.com>
* Licensed under the MIT license.
* https://github.com/handsontable/ngHandsontable
* Date: Thu Feb 11 2016 16:39:03 GMT+0100 (CET)
* Date: Thu Mar 03 2016 16:35:01 GMT+0100 (CET)
*/

if (document.all && !document.addEventListener) { // IE 8 and lower
Expand Down
4 changes: 2 additions & 2 deletions dist/ngHandsontable.min.js

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

23 changes: 20 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,26 @@ <h2>Code</h2>
It's recommended to put all your settings in one big object (<code>settings="ctrl.settings"</code>).
Settings attribute unlike any other attributes is not watched so using this can be helpful to achieve higher performance.
</p>
<p>
Click <a href="demo">here</a> to see more examples.
</p>

<h2>More demos</h2>
<ul>
<li><a href="demo/index.html#/intro-simple-example">Simple example</a></li>
<li><a href="demo/index.html#/columns-add-remove-column-ng-repeat">Add/Remove dynamically column</a></li>
<li><a href="demo/index.html#/binding-data-binding">Data binding</a></li>
<li><a href="demo/index.html#/callbacks-callbacks-by-object">Callbacks</a></li>
<li><a href="demo/index.html#/pagination-rows-pagination">Pagination</a></li>
<li><a href="demo/index.html#/PRO-filtering-external-inputs">Data filtering</a></li>
<li><a href="demo/index.html#/PRO-collapsing-columns-with-nested-headers">Collapsing columns with nested headers</a></li>
<li><a href="demo/index.html">More...</a></li>
</ul>

<h2>PRO features</h2>
<br>
To install Handsontable PRO overwrite regular handsontable version with new one:
<pre><code class="bash">
$ bower install handsontable=git@git.handsontable.com:handsontable/handsontable-pro.git --save
</code></pre>
<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>


<script>hljs.initHighlightingOnLoad();</script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"url": "https://github.com/handsontable/ngHandsontable/issues"
},
"author": "Marcin Warpechowski <hello@handsontable.com>",
"version": "0.8.0",
"version": "0.9.0",
"devDependencies": {
"angular": "^1.4.2",
"angular-mocks": "^1.4.2",
Expand Down
3 changes: 2 additions & 1 deletion test/directives/hotTable/watchingOptions.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ describe('hotTable - Watching options', function() {

scope.$digest();

expect(scope.hotInstance.getData()).toBe(rootScope.value);
expect(scope.hotInstance.getSourceData()).toBe(rootScope.value);
expect(scope.hotInstance.getData()).toEqual([[null]]);
});

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

0 comments on commit 72950f7

Please sign in to comment.