Merge pull request angular-ui#3221 from btesser/master

fix(GridRenderContainer) Capitalization of viewport
ravishivt · Apr 7, 2015 · 7061e45 · 7061e45
2 parents 76029e7 + c2315eb
commit 7061e45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/js/core/factories/GridRenderContainer.js b/src/js/core/factories/GridRenderContainer.js
@@ -695,7 +695,7 @@ angular.module('ui.grid')
     this.columnStyles = ret;
   };
 
-  GridRenderContainer.prototype.getViewPortStyle = function () {
+  GridRenderContainer.prototype.getViewportStyle = function () {
     var self = this;
     var styles = {};
 

diff --git a/src/templates/ui-grid/uiGridViewport.html b/src/templates/ui-grid/uiGridViewport.html
@@ -1,4 +1,4 @@
-<div class="ui-grid-viewport"  ng-style="colContainer.getViewPortStyle()">
+<div class="ui-grid-viewport"  ng-style="colContainer.getViewportStyle()">
   <div class="ui-grid-canvas">
     <div ng-repeat="(rowRenderIndex, row) in rowContainer.renderedRows track by $index" class="ui-grid-row" ng-style="Viewport.rowStyle(rowRenderIndex)">
       <div ui-grid-row="row" row-render-index="rowRenderIndex"></div>

diff --git a/test/unit/core/factories/GridRenderContainer.spec.js b/test/unit/core/factories/GridRenderContainer.spec.js
@@ -36,7 +36,7 @@ describe('GridRenderContainer factory', function () {
 
   });
 
-  describe('getViewPortStyle', function () {
+  describe('getViewportStyle', function () {
     var r;
 
     beforeEach(function () {
@@ -45,54 +45,54 @@ describe('GridRenderContainer factory', function () {
 
     it('should have a vert and horiz scrollbar on body', function () {
       r.name = 'body';
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'scroll', 'overflow-y':'scroll'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'scroll', 'overflow-y':'scroll'});
     });
 
     it('should have a vert only', function () {
       r.name = 'body';
       grid.options.enableVerticalScrollbar = uiGridConstants.scrollbars.NEVER;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'scroll', 'overflow-y':'hidden'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'scroll', 'overflow-y':'hidden'});
     });
 
     it('should have a horiz only', function () {
       r.name = 'body';
       grid.options.enableHorizontalScrollbar = uiGridConstants.scrollbars.NEVER;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
     });
 
     it('left should have a no scrollbar when not rtl', function () {
       r.name = 'left';
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
     });
 
     it('right should have a vert scrollbar when not rtl', function () {
       r.name = 'right';
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
     });
 
     it('right should have no scrollbar when configured', function () {
       r.name = 'right';
       grid.options.enableVerticalScrollbar = uiGridConstants.scrollbars.NEVER;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
     });
 
     it('left should have a vert scrollbar when rtl', function () {
       r.name = 'left';
       grid.rtl = true;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'scroll'});
     });
 
     it('left should have no vert scrollbar when rtl and configured Never', function () {
       r.name = 'left';
       grid.rtl = true;
       grid.options.enableVerticalScrollbar = uiGridConstants.scrollbars.NEVER;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
     });
 
     it('right should have no scrollbars when rtl', function () {
       r.name = 'right';
       grid.rtl = true;
-      expect(r.getViewPortStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
+      expect(r.getViewportStyle()).toEqual({'overflow-x':'hidden', 'overflow-y':'hidden'});
     });
 
   });