Merge branch 'develop' of git://github.com/psmolenski/jquery-handsontable into develop

Author: warpech

CHANGELOG.md

@@ -1,3 +1,27 @@
+## [0.9.12](https://github.com/warpech/jquery-handsontable/tree/v0.9.11) (Aug 06, 2013)
+Features
+
+- closing cell editors when table is being scrolled ([#914](https://github.com/warpech/jquery-handsontable/issues/914))
+- added `sort()` method to programically sort table
+- plugin `contextMenu` can now be enabled or disabled using `updateSettings()` method
+- extension `removeRow` can now be enabled or disabled using `updateSettings()` method
+- plugin `observeChanges` can now be enabled or disabled using `updateSettings()` method
+- plugin `autoColumnSize` can now be enabled or disabled using `updateSettings()` method
+- 2 new events: `beforColumnSort` and `afterColumnSort` fired before and after table sort
+
+Bugfixes
+
+- added more specyfic selectrors in CSS, so that jQuery UI styles and default HandsonTable styles does not interfere ([#498](https://github.com/warpech/jquery-handsontable/issues/498))
+- fixed moving table column, when table is scrolled horizotally ([#527](https://github.com/warpech/jquery-handsontable/issues/527))
+- `afterRender` event is now fired after every table scroll ([#733](https://github.com/warpech/jquery-handsontable/issues/733))
+- fixed inserting and removing rows form sorted table ([#915](https://github.com/warpech/jquery-handsontable/issues/915))
+- added proper mapping of cell properties when table is sorted ([#917](https://github.com/warpech/jquery-handsontable/issues/917))
+- fixed IE `Array.filter()` shim ([#934](https://github.com/warpech/jquery-handsontable/issues/934))
+- fixed tests, so that they all pass on Sauce Labs servers
+
+
+
+
 ## [0.9.11](https://github.com/warpech/jquery-handsontable/tree/v0.9.11) (Jul 29, 2013)
 
 This version fixes some severe cell listener issues introduced in the last version.

Gruntfile.js

@@ -88,7 +88,8 @@ module.exports = function (grunt) {
 
         'src/3rdparty/jquery.autoresize.js',
         'src/3rdparty/sheetclip.js',
-        'src/3rdparty/copypaste.js'
+        'src/3rdparty/copypaste.js',
+        'src/3rdparty/json-patch-duplex.js'
       ],
       walkontable: [
         'src/3rdparty/walkontable/src/*.js',
@@ -110,10 +111,10 @@ module.exports = function (grunt) {
       dist: {
         files: {
           'dist/jquery.handsontable.js': [
-            '<%= meta.shims %>',
             'tmp/intro.js',
             '<%= meta.src %>',
             '<%= meta.walkontable %>',
+            '<%= meta.shims %>',
             'src/outro.js'
           ]
         }

demo/bigCells.html

@@ -60,6 +60,7 @@ <h1><a href="../index.html">Handsontable</a></h1>
           <h2>Big cells</h2>
 
 
+          <div id="example0" style="width: 400px; height: 300px; overflow: scroll"></div>
           <div id="example1" style="width: 400px; height: 300px; overflow: scroll"></div>
           <div id="example2" style="width: 400px; height: 300px; overflow: scroll"></div>
           <div id="example3" style="width: 400px; height: 300px; overflow: scroll"></div>
@@ -79,6 +80,26 @@ <h2>Big cells</h2>
           </div>
 
           <script data-jsfiddle="example1">
+
+            colHeaders = ["Column1", "Column2", "Column3", "Column4", "Column5", "Column6", "Column7", "Column8", "Column9", "Column10", "Column11", "Column12", "Column13", "Column14", "Column15", "Column16", "Column17", "Column18", "Column19", "Column20"];
+            rowHeaders = ["Value"];
+
+            var exampleData = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]];
+
+            var exampleGrid = $("#example0");
+            exampleGrid.handsontable({
+              rowHeaders: rowHeaders,
+              colHeaders: colHeaders,
+              colWidths: 50,
+              manualColumnResize: true,
+              stretchH: 'all',
+              minSpareCols: 0,
+              minSpareRows: 0,
+              contextMenu: false,
+            });
+            exampleGrid.handsontable("loadData", exampleData);
+
+
             var data = [
               [1, "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. ", "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a ga" ],
               [2, "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like)."],

extensions/jquery.handsontable.removeRow.js

@@ -5,54 +5,78 @@
    * Handsontable RemoveRow extension. See `demo/buttons.html` for example usage
    * See `.../test/jasmine/spec/extensions/removeRowSpec.js` for tests
    */
-  Handsontable.PluginHooks.add('beforeInitWalkontable', function (walkontableConfig) {
+
+  function init() {
     var instance = this;
 
-    if (instance.getSettings().removeRowPlugin) {
+    var pluginEnabled = !!(instance.getSettings().removeRowPlugin);
 
-      var getButton = function (td) {
-        return $(td).parent('tr').find('th.htRemoveRow').eq(0).find('.btn');
-      };
+    if (pluginEnabled) {
+      bindMouseEvents();
+      instance.rootElement.addClass('htRemoveRow');
+    } else {
+      unbindMouseEvents();
+      instance.rootElement.removeClass('htRemoveRow');
+    }
 
-      instance.rootElement.on('mouseover', 'tbody th, tbody td', function () {
+    function bindMouseEvents() {
+      instance.rootElement.on('mouseover.removeRow', 'tbody th, tbody td', function () {
         getButton(this).show();
       });
-      instance.rootElement.on('mouseout', 'tbody th, tbody td', function () {
+      instance.rootElement.on('mouseout.removeRow', 'tbody th, tbody td', function () {
         getButton(this).hide();
       });
+    }
+
+    function unbindMouseEvents() {
+      instance.rootElement.off('mouseover.removeRow');
+      instance.rootElement.off('mouseout.removeRow');
+    }
+
+    function getButton(td) {
+      return $(td).parent('tr').find('th.htRemoveRow').eq(0).find('.btn');
+    }
+  }
 
-      instance.rootElement.addClass('htRemoveRow');
 
-      /**
-       * rowHeaders is a function, so to alter the actual value we need to alter the result returned by this function
-       */
-      var baseRowHeaders = walkontableConfig.rowHeaders;
-      walkontableConfig.rowHeaders = function(){
-
-        var newRowHeader = function (row, elem) {
-          var child
-            , div;
-          while (child = elem.lastChild) {
-            elem.removeChild(child);
-          }
-          elem.className = 'htNoFrame htRemoveRow';
-          if (row > -1) {
-            div = document.createElement('div');
-            div.className = 'btn';
-            div.appendChild(document.createTextNode('x'));
-            elem.appendChild(div);
-
-            $(div).on('mouseup', function () {
-              instance.alter("remove_row", row);
-            });
-          }
-        };
-
-
-
-        return Array.prototype.concat.call([], newRowHeader, baseRowHeaders());
+  Handsontable.PluginHooks.add('beforeInitWalkontable', function (walkontableConfig) {
+    var instance = this;
+
+    /**
+     * rowHeaders is a function, so to alter the actual value we need to alter the result returned by this function
+     */
+    var baseRowHeaders = walkontableConfig.rowHeaders;
+    walkontableConfig.rowHeaders = function () {
+      var pluginEnabled = Boolean(instance.getSettings().removeRowPlugin);
+
+      var newRowHeader = function (row, elem) {
+        var child
+          , div;
+        while (child = elem.lastChild) {
+          elem.removeChild(child);
+        }
+        elem.className = 'htNoFrame htRemoveRow';
+        if (row > -1) {
+          div = document.createElement('div');
+          div.className = 'btn';
+          div.appendChild(document.createTextNode('x'));
+          elem.appendChild(div);
+
+          $(div).on('mouseup', function () {
+            instance.alter("remove_row", row);
+          });
+        }
       };
 
-    }
+      return pluginEnabled ? Array.prototype.concat.call([], newRowHeader, baseRowHeaders()) : baseRowHeaders();
+    };
+  });
+
+  Handsontable.PluginHooks.add('beforeInit', function () {
+    init.call(this)
+  });
+
+  Handsontable.PluginHooks.add('afterUpdateSettings', function () {
+    init.call(this)
   });
 })(jQuery);

lib/shims/array.filter.js

@@ -15,20 +15,38 @@ if (!Array.prototype.filter) {
 
     thisp = thisp || this;
 
-    var len = this.length,
+    if (isNodeList(thisp)) {
+      thisp = convertNodeListToArray(thisp);
+    }
+
+    var len = thisp.length,
       res = [],
       i,
       val;
 
     for (i = 0; i < len; i += 1) {
-      if (this.hasOwnProperty(i)) {
-        val = this[i]; // in case fun mutates this
-        if (fun.call(thisp, val, i, this)) {
+      if (thisp.hasOwnProperty(i)) {
+        val = thisp[i]; // in case fun mutates this
+        if (fun.call(thisp, val, i, thisp)) {
           res.push(val);
         }
       }
     }
 
     return res;
+
+    function isNodeList(object) {
+      return /NodeList/i.test(object.item);
+    }
+
+    function convertNodeListToArray(nodeList) {
+      var array = [];
+
+      for (var i = 0, len = nodeList.length; i < len; i++){
+        array[i] = nodeList[i]
+      }
+
+      return array;
+    }
   };
 }