Merge branch 'release/0.11.0'

Author: budnix

.travis.yml

@@ -3,7 +3,7 @@ language: node_js
 sudo: false
 
 node_js:
-  - "0.10"
+  - "0.12"
 
 before_script:
   - "npm update -g npm"

bower.json

@@ -2,7 +2,7 @@
   "name": "ngHandsontable",
   "dependencies": {
     "angular": "~1.4",
-    "handsontable": "~0.23.0"
+    "handsontable": "~0.24.0"
   },
   "homepage": "https://github.com/handsontable/ngHandsontable",
   "authors": [

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/ngHandsontable/issues"
   },
   "author": "Marcin Warpechowski <[email protected]>",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "devDependencies": {
     "angular": "^1.5.0",
     "angular-mocks": "^1.5.0",

src/directives/hotTable.js

@@ -117,7 +117,6 @@
                 } else {
                   scope.hotInstance.loadData(newValue);
                   scope.htSettings.data = newValue;
-
                 }
               } else if (newValue !== oldValue) {
                 scope.htSettings[key] = newValue;
@@ -126,6 +125,19 @@
             }, ['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
            */

src/services/settingFactory.js

@@ -32,7 +32,7 @@
 
         container.className = this.containerClassName;
 
-        if (!container.id && htSettings.hotId) {
+        if (htSettings.hotId) {
           container.id = htSettings.hotId;
         }
         element[0].appendChild(container);

test/directives/hotTable/watchingOptions.spec.js

@@ -24,6 +24,25 @@ describe('hotTable - Watching options', function() {
     expect(scope.hotInstance.getData()).toEqual([[null]]);
   });
 
+  it('should ensure a new copy of `datarows` is made when the reference is changed but it has the same value', function() {
+    rootScope.value = [[1,2,3,4]];
+    var scope = angular.element(compile('<hot-table datarows="value"></hot-table>')(rootScope)).isolateScope();
+
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().data).toBe(rootScope.value);
+
+    rootScope.value = [[1, 2, 3, 4]];
+    rootScope.$digest();
+
+    expect(scope.hotInstance.getSettings().data).toBe(rootScope.value);
+
+    rootScope.value.push([[5, 6, 7, 8]]);
+    scope.$digest();
+
+    expect(scope.hotInstance.getSettings().data).toBe(rootScope.value);
+  });
+
   it('should create table with `dataSchema` attribute', function() {
     rootScope.value = {id: null};
     var scope = angular.element(compile('<hot-table dataschema="value"></hot-table>')(rootScope)).isolateScope();

test/services/settingFactory.spec.js

@@ -28,7 +28,7 @@ describe('settingFactory', function() {
     window.Handsontable = HandsontableOrg;
   }));
 
-  it('should create new div element with "id" defined from hot-id attribute', inject(function(settingFactory) {
+  it('should set "id" attribute of wrapper element when "hot-id" attribute is defined', inject(function(settingFactory) {
     var element = [{appendChild: jasmine.createSpy('appendChild')}];
     var hotSettings = {hotId: 'my-table', colHeaders: [1, 2], width: 200, columns: [{width: 100}]};
     var hotInstance = {};
@@ -41,9 +41,7 @@ describe('settingFactory', function() {
 
     settingFactory.initializeHandsontable(element, hotSettings);
 
-    expect(element[0].appendChild).toHaveBeenCalled();
-    expect(element[0].appendChild.calls.argsFor(0)[0].nodeName).toBe('DIV');
-    expect(hotInstance.element.id).toBe('my-table');
+    expect(element[0].appendChild.calls.argsFor(0)[0].id).toBe('my-table');
 
     window.Handsontable = HandsontableOrg;
   }));