Skip to content

Commit

Permalink
Merge branch 'release/0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
budnix committed Feb 11, 2016
2 parents 18f234a + a0de8f2 commit 1af01c4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ module.exports = function (grunt) {
}
});

grunt.registerTask('default', ['jscs', 'jshint', 'concat', 'uglify']);
grunt.registerTask('build', ['jscs', 'jshint', 'concat', 'uglify']);
grunt.registerTask('default', ['build']);
grunt.registerTask('watch-demo-app', ['browserify:demoAppWatch']);
grunt.registerTask('build-demo-app', ['browserify:demoApp']);

Expand Down
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "ngHandsontable",
"version": "0.7.0",
"dependencies": {
"angular": "~1.4",
"handsontable": "~0.19.0"
"handsontable": "~0.22.0"
},
"homepage": "https://github.com/handsontable/ngHandsontable",
"authors": [
Expand Down
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.7.0');
app.constant('version', 'v0.8.0');
app.config(config);

angular.element(document).ready(function() {
Expand Down
6 changes: 4 additions & 2 deletions dist/ngHandsontable.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* ngHandsontable 0.7.0
* ngHandsontable 0.8.0
*
* Copyright 2012-2015 Marcin Warpechowski
* Copyright 2015 Handsoncode sp. z o.o. <[email protected]>
* Licensed under the MIT license.
* https://github.com/handsontable/ngHandsontable
* Date: Thu Oct 15 2015 12:36:18 GMT+0200 (CEST)
* Date: Thu Feb 11 2016 16:39:03 GMT+0100 (CET)
*/

if (document.all && !document.addEventListener) { // IE 8 and lower
Expand Down Expand Up @@ -562,6 +562,8 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
settingFactory.renderHandsontable(scope.hotInstance);
} else {
scope.hotInstance.loadData(newValue);
scope.htSettings.data = newValue;

}
} else if (newValue !== oldValue) {
scope.htSettings[key] = newValue;
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 <[email protected]>",
"version": "0.7.0",
"version": "0.8.0",
"devDependencies": {
"angular": "^1.4.2",
"angular-mocks": "^1.4.2",
Expand Down
2 changes: 2 additions & 0 deletions src/directives/hotTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@
settingFactory.renderHandsontable(scope.hotInstance);
} else {
scope.hotInstance.loadData(newValue);
scope.htSettings.data = newValue;

}
} else if (newValue !== oldValue) {
scope.htSettings[key] = newValue;
Expand Down

0 comments on commit 1af01c4

Please sign in to comment.