Skip to content

Commit

Permalink
Merge branch 'release/0.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed May 20, 2016
2 parents b47d607 + 0ab5b0c commit cf2e3cd
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion 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.10.0');
app.constant('version', 'v0.11.1');
app.config(config);

angular.element(document).ready(function() {
Expand Down
20 changes: 16 additions & 4 deletions dist/ngHandsontable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* ngHandsontable 0.10.0
* ngHandsontable 0.11.1
*
* 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: Fri Apr 08 2016 16:20:06 GMT+0200 (CEST)
* Date: Fri May 20 2016 09:23:23 GMT+0200 (CEST)
*/

if (document.all && !document.addEventListener) { // IE 8 and lower
Expand Down Expand Up @@ -133,7 +133,7 @@ Handsontable.hooks.add('afterContextMenuShow', function() {

container.className = this.containerClassName;

if (!container.id && htSettings.hotId) {
if (htSettings.hotId) {
container.id = htSettings.hotId;
}
element[0].appendChild(container);
Expand Down Expand Up @@ -567,7 +567,6 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
} else {
scope.hotInstance.loadData(newValue);
scope.htSettings.data = newValue;

}
} else if (newValue !== oldValue) {
scope.htSettings[key] = newValue;
Expand All @@ -576,6 +575,19 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
}, ['datarows', 'columns', 'rowHeights', 'colWidths', 'rowHeaders', 'colHeaders'].indexOf(key) >= 0);
});

/**
* Check for reference equality changes for datarows
* TODO: must the remaining bindingsKeys need to be added also if their reference changes
*/
scope.$watch('datarows', function(newValue) {
if (newValue === void 0) {
return;
}
if (scope.hotInstance.getSettings().data !== newValue) {
scope.hotInstance.loadData(newValue);
}
});

/**
* Check if data length has been changed
*/
Expand Down
6 changes: 3 additions & 3 deletions dist/ngHandsontable.min.js

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

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.11.0",
"version": "0.11.1",
"devDependencies": {
"angular": "^1.5.0",
"angular-mocks": "^1.5.0",
Expand Down

0 comments on commit cf2e3cd

Please sign in to comment.