still fixing merge issues!

ineedfat · Dec 4, 2012 · 1a2afcf · 1a2afcf
1 parent 218a47d
commit 1a2afcf
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,7 +41,8 @@ local.properties
 *.user
 *.sln.docstates
 *.sln
-*.
+*.nupkg
+*.nuspec
 *.*roj
 workbench/jquery*
 workbench/bootstrap*

diff --git a/build/KoGrid.debug.js b/build/KoGrid.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/ericmbarnard/koGrid/blob/master/README.md
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 12/04/2012 09:30:01
+* Compiled At: 12/04/2012 10:47:46
 ***********************************************/
 
 (function(window, undefined){
@@ -1604,7 +1604,7 @@ kg.SelectionService = function (grid) {
     // @return - boolean indicating if all items are selected or not
     // @val - boolean indicating whether to select all/de-select all
     self.toggleSelectAll = function (checkAll) {
-        var selectedlength = self.selectedItems.length;
+        var selectedlength = self.selectedItems().length;
         if (selectedlength > 0) {
             self.selectedItems.splice(0, selectedlength);
         }

diff --git a/koGrid-2.0.0.debug.js b/koGrid-2.0.0.debug.js
@@ -2,7 +2,7 @@
 * ng-grid JavaScript Library
 * Authors: https://github.com/ericmbarnard/koGrid/blob/master/README.md
 * License: MIT (http://www.opensource.org/licenses/mit-license.php)
-* Compiled At: 12/04/2012 09:30:01
+* Compiled At: 12/04/2012 10:47:46
 ***********************************************/
 
 (function(window, undefined){
@@ -1604,7 +1604,7 @@ kg.SelectionService = function (grid) {
     // @return - boolean indicating if all items are selected or not
     // @val - boolean indicating whether to select all/de-select all
     self.toggleSelectAll = function (checkAll) {
-        var selectedlength = self.selectedItems.length;
+        var selectedlength = self.selectedItems().length;
         if (selectedlength > 0) {
             self.selectedItems.splice(0, selectedlength);
         }

diff --git a/koGrid-2.0.0.js b/koGrid-2.0.0.js
diff --git a/src/classes/selectionService.js b/src/classes/selectionService.js
@@ -62,7 +62,7 @@ kg.SelectionService = function (grid) {
     // @return - boolean indicating if all items are selected or not
     // @val - boolean indicating whether to select all/de-select all
     self.toggleSelectAll = function (checkAll) {
-        var selectedlength = self.selectedItems.length;
+        var selectedlength = self.selectedItems().length;
         if (selectedlength > 0) {
             self.selectedItems.splice(0, selectedlength);
         }