Merge branch 'release/0.10.0'

Gruntfile.js

@@ -121,6 +121,7 @@ module.exports = function (grunt) {
   grunt.registerTask('default', ['build']);
   grunt.registerTask('watch-demo-app', ['browserify:demoAppWatch']);
   grunt.registerTask('build-demo-app', ['browserify:demoApp']);
+  grunt.registerTask('build-release', ['build', 'build-demo-app']);
 
   grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('grunt-contrib-concat');

README.md

@@ -4,7 +4,7 @@ Enables creation of data grid applications in AngularJS.
 
 ## Demo
 
-See the demo at http://handsontable.github.io/ngHandsontable
+See the demo at http://handsontable.github.io/ngHandsontable.
 
 ## Usage
 

demo/build/app.js

@@ -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.9.0');
+    app.constant('version', 'v0.10.0');
     app.config(config);
 
     angular.element(document).ready(function() {

dist/ngHandsontable.js

@@ -1,11 +1,11 @@
 /**
- * ngHandsontable 0.9.0
+ * ngHandsontable 0.10.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 Mar 03 2016 16:35:01 GMT+0100 (CET)
+ * Date: Fri Apr 08 2016 16:20:06 GMT+0200 (CEST)
 */
 
 if (document.all && !document.addEventListener) { // IE 8 and lower
@@ -132,6 +132,10 @@ Handsontable.hooks.add('afterContextMenuShow', function() {
           hot;
 
         container.className = this.containerClassName;
+
+        if (!container.id && htSettings.hotId) {
+          container.id = htSettings.hotId;
+        }
         element[0].appendChild(container);
         hot = new Handsontable(container, htSettings);
 

karma.conf.js

@@ -17,9 +17,7 @@ module.exports = function(config) {
     files: [
       'test/phantom-polyfill.js',
       'node_modules/handsontable/dist/handsontable.full.js',
-      'src/*.js',
-      'src/**/*.js',
-      'test/*.spec.js',
+      'dist/ngHandsontable.min.js',
       'test/**/*.spec.js'
     ],
 
@@ -71,4 +69,4 @@ module.exports = function(config) {
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: false
   });
-}
+};

package.json

@@ -10,26 +10,26 @@
     "url": "https://github.com/handsontable/ngHandsontable/issues"
   },
   "author": "Marcin Warpechowski <[email protected]>",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "devDependencies": {
-    "angular": "^1.4.2",
-    "angular-mocks": "^1.4.2",
+    "angular": "^1.5.0",
+    "angular-mocks": "^1.5.0",
     "browserify-replace": "^0.9.0",
     "grunt": "~0.4.5",
-    "grunt-browserify": "^3.8.0",
-    "grunt-contrib-concat": "~0.5.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "~0.5.1",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-jscs": "^2.1.0",
-    "handsontable": "git://github.com/handsontable/handsontable",
-    "jasmine-core": "^2.3.4",
-    "karma": "^0.12.37",
-    "karma-angular": "0.0.6",
-    "karma-chrome-launcher": "^0.2.0",
-    "karma-jasmine": "^0.2.2",
-    "karma-phantomjs-launcher": "^0.2.0",
-    "phantomjs": "^1.9.17"
+    "grunt-browserify": "^4.0.0",
+    "grunt-contrib-concat": "^1.0.0",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-uglify": "^0.11.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-jscs": "^2.8.0",
+    "handsontable": "^0.24.0",
+    "jasmine-core": "^2.4.0",
+    "karma": "^0.13.0",
+    "karma-angular": "^0.0.6",
+    "karma-chrome-launcher": "^0.2.2",
+    "karma-jasmine": "^0.3.7",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "phantomjs-prebuilt": "^2.1.4"
   },
   "scripts": {
     "test": "./node_modules/karma/bin/karma start --single-run --browsers PhantomJS"

src/services/settingFactory.js

@@ -31,6 +31,10 @@
           hot;
 
         container.className = this.containerClassName;
+
+        if (!container.id && htSettings.hotId) {
+          container.id = htSettings.hotId;
+        }
         element[0].appendChild(container);
         hot = new Handsontable(container, htSettings);