Permalink
Browse files

still fixing merge issues!

  • Loading branch information...
1 parent 218a47d commit 1a2afcfd93e5660dc171718782467db2f41ec904 @timothyswt timothyswt committed Dec 4, 2012
Showing with 9 additions and 8 deletions.
  1. +2 −1 .gitignore
  2. +2 −2 build/KoGrid.debug.js
  3. +2 −2 koGrid-2.0.0.debug.js
  4. +2 −2 koGrid-2.0.0.js
  5. +1 −1 src/classes/selectionService.js
View
@@ -41,7 +41,8 @@ local.properties
*.user
*.sln.docstates
*.sln
-*.
+*.nupkg
+*.nuspec
*.*roj
workbench/jquery*
workbench/bootstrap*
View
@@ -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);
}
View
@@ -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);
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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);
}

0 comments on commit 1a2afcf

Please sign in to comment.