Merge branch 'master' into master

Author: Nilanno

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://api.travis-ci.org/angular-ui/ui-grid.png?branch=3.0)](https://travis-ci.org/angular-ui/ui-grid) [![Coverage Status](https://coveralls.io/repos/angular-ui/ui-grid/badge.png?branch=master)](https://coveralls.io/r/angular-ui/ui-grid?branch=master)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-grid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![npm](https://img.shields.io/npm/dm/angular-ui-grid.svg)](https://www.npmjs.com/package/angular-ui-grid)
+[![npm](https://img.shields.io/npm/dt/angular-ui-grid.svg)](https://www.npmjs.com/package/angular-ui-grid)
 
 [![Selenium Test Status](https://saucelabs.com/browser-matrix/nggrid.svg)](https://saucelabs.com/u/nggrid)
 
@@ -163,7 +165,7 @@ With the 3.0 release, the repository has been renamed from "ng-grid" to "ui-grid
 
 All network traffic to GitHub should redirect automatically but they say you should update your git remote url:
 
-  git remote set-url origin https://github.com/angular-ui/ui-grid.git
+    git remote set-url origin https://github.com/angular-ui/ui-grid.git
 
 # Thanks
 

misc/tutorial/205_row_editable.ngdoc

@@ -31,7 +31,7 @@ The basic method of operation is that whenever a cell is edited (identified usin
 event) an `isDirty` flag is set on the row, and a `saveTimer` is set.  If another cell in the same row commences
 editing within 2 seconds (or other configurable time), then the timer will be destroyed again.  Otherwise
 upon the timer completing the row will be set to a status of `isSaving` and greyed out, and the `saveRow`
-event will be called.  The function called by this event must return a promise, and the rowedit feature
+event will be called.  The function called by this event must call `rowEdit.setSavePromise`, and the rowedit feature
 will wait on that promise.
 
 If the cellNav feature is also enabled, then a setFocus on a cell within the row is sufficient to delay

src/features/cellnav/js/cellnav.js

@@ -681,8 +681,10 @@
                 if (grid.cellNav.lastRowCol === null || rowColSelectIndex === -1) {
                   var newRowCol = new GridRowColumn(row, col);
 
-                  grid.api.cellNav.raise.navigate(newRowCol, grid.cellNav.lastRowCol);
-                  grid.cellNav.lastRowCol = newRowCol;
+                  if (grid.cellNav.lastRowCol === null || grid.cellNav.lastRowCol.row !== newRowCol.row || grid.cellNav.lastRowCol.col !== newRowCol.col){
+                    grid.api.cellNav.raise.navigate(newRowCol, grid.cellNav.lastRowCol);
+                    grid.cellNav.lastRowCol = newRowCol;  
+                  }
                   if (uiGridCtrl.grid.options.modifierKeysToMultiSelectCells && modifierDown) {
                     grid.cellNav.focusedCells.push(rowCol);
                   } else {

src/features/exporter/js/exporter.js

@@ -13,7 +13,7 @@
    *
    * <div class="alert alert-success" role="alert"><strong>Stable</strong> This feature is stable. There should no longer be breaking api changes without a deprecation warning.</div>
    *
-   * This module provides the ability to exporter data from the grid.
+   * This module provides the ability to export data from the grid.
    *
    * Data can be exported in a range of formats, and all data, visible
    * data, or selected rows can be exported, with all columns or visible

src/features/move-columns/js/column-movable.js

@@ -168,6 +168,9 @@
         });
       },
       redrawColumnAtPosition: function (grid, originalPosition, newPosition) {
+        if (originalPosition === newPosition) {
+          return;
+        }
 
         var columns = grid.columns;
 
@@ -436,16 +439,7 @@
                   //Left of cloned element should be aligned to original header cell.
                   movingElm.addClass('movingColumn');
                   var movingElementStyles = {};
-                  var elmLeft;
-                  if (gridUtil.detectBrowser() === 'safari') {
-                    //Correction for Safari getBoundingClientRect,
-                    //which does not correctly compute when there is an horizontal scroll
-                    elmLeft = $elm[0].offsetLeft + $elm[0].offsetWidth - $elm[0].getBoundingClientRect().width;
-                  }
-                  else {
-                    elmLeft = $elm[0].getBoundingClientRect().left;
-                  }
-                  movingElementStyles.left = (elmLeft - gridLeft) + 'px';
+                  movingElementStyles.left = $elm[0].offsetLeft + 'px';
                   var gridRight = $scope.grid.element[0].getBoundingClientRect().right;
                   var elmRight = $elm[0].getBoundingClientRect().right;
                   if (elmRight > gridRight) {
@@ -475,7 +469,8 @@
 
                   //Update css of moving column to adjust to new left value or fire scroll in case column has reached edge of grid
                   if ((currentElmLeft >= gridLeft || changeValue > 0) && (currentElmRight <= rightMoveLimit || changeValue < 0)) {
-                    movingElm.css({visibility: 'visible', 'left': newElementLeft + 'px'});
+                    movingElm.css({visibility: 'visible', 'left': (movingElm[0].offsetLeft + 
+                      (newElementLeft < rightMoveLimit ? changeValue : (rightMoveLimit - currentElmLeft))) + 'px'});
                   }
                   else if (totalColumnWidth > Math.ceil(uiGridCtrl.grid.gridWidth)) {
                     changeValue *= 8;

src/features/tree-base/js/tree-base.js

@@ -237,7 +237,7 @@
          *  all transient information on the tree (children, childCount) and recalculate it
          *
          */
-        grid.treeBase.tree = {};
+        grid.treeBase.tree = [];
 
         service.defaultGridOptions(grid.options);
 

src/features/tree-view/less/tree-view.less

@@ -3,6 +3,6 @@
 .ui-grid-tree-header-row {
   font-weight: bold !important;
 }
-.ui-grid-tree-header-row .ui-grid-row-header-cell.ui-grid-disable-selection.ui-grid-cell {
+.ui-grid-tree-header-row .ui-grid-cell.ui-grid-disable-selection.ui-grid-row-header-cell {
   pointer-events: all;
 }

src/js/core/directives/ui-grid.js

@@ -78,6 +78,8 @@
         }
       }
 
+      var mostRecentData;
+
       function dataWatchFunction(newData) {
         // gridUtil.logDebug('dataWatch fired');
         var promises = [];
@@ -90,6 +92,8 @@
           }
         }
 
+        mostRecentData = newData;
+
         if (newData) {
           // columns length is greater than the number of row header columns, which don't count because they're created automatically
           var hasColumns = self.grid.columns.length > (self.grid.rowHeaderColumns ? self.grid.rowHeaderColumns.length : 0);
@@ -118,7 +122,8 @@
           }
 
           $q.all(promises).then(function() {
-            self.grid.modifyRows(newData)
+            // use most recent data, rather than the potentially outdated data passed into watcher handler
+            self.grid.modifyRows(mostRecentData)
               .then(function () {
                 // if (self.viewport) {
                   self.grid.redrawInPlace(true);

src/js/core/services/rowSorter.js

@@ -206,7 +206,7 @@ module.service('rowSorter', ['$parse', 'uiGridConstants', function ($parse, uiGr
       var strA = a.toString().toLowerCase(),
           strB = b.toString().toLowerCase();
 
-      return strA === strB ? 0 : (strA < strB ? -1 : 1);
+      return strA === strB ? 0 : strA.localeCompare(strB);
     }
   };
 

src/less/icons.less

@@ -14,7 +14,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'ui-grid';
-    src: url('../font/ui-grid.svg?12312827#ui-grid') format('svg');
+    src: url('@{font-path}ui-grid.svg?12312827#ui-grid') format('svg');
   }
 }
 */