avoid a bunch of exceptions with the new ng-grid and jmx

hawtio · Apr 30, 2013 · f6bcf85 · f6bcf85
1 parent 6b5b075
commit f6bcf85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/hawtio-web/src/main/webapp/app/camel/html/attributeToolBarContext.html b/hawtio-web/src/main/webapp/app/camel/html/attributeToolBarContext.html
@@ -28,7 +28,7 @@
   </div>
   <div class="span6">
     <div class="control-group">
-      <input class="span12 search-query" type="text" ng-model="$parent.searchText" placeholder="search">
+      <input class="span12 search-query" type="text" ng-model="$parent.gridOptions.filterOptions.filterText" placeholder="search">
     </div>
   </div>
 </div>
diff --git a/hawtio-web/src/main/webapp/app/camel/html/attributeToolBarRoutes.html b/hawtio-web/src/main/webapp/app/camel/html/attributeToolBarRoutes.html
@@ -9,7 +9,7 @@
   </div>
   <div class="span6">
     <div class="control-group">
-      <input type="text" class="span12 search-query" ng-model="$parent.searchText" placeholder="search">
+      <input type="text" class="span12 search-query" ng-model="$parent.gridOptions.filterOptions.filterText" placeholder="search">
     </div>
   </div>
 </div>
diff --git a/hawtio-web/src/main/webapp/app/jmx/js/attributes.ts b/hawtio-web/src/main/webapp/app/jmx/js/attributes.ts
@@ -16,6 +16,7 @@ module Jmx {
     $scope.selectedItems = [];
     $scope.selectCheckBox = true;
 
+/*
     var SelectToggle = function(scope) {
       var self = this;
       self.scope = scope;
@@ -37,12 +38,12 @@ module Jmx {
         }
       }
     };
-
     $scope.selectToggle = new SelectToggle($scope);
+*/
 
     $scope.gridOptions = {
       selectedItems: $scope.selectedItems,
-      plugins: [$scope.selectToggle],
+      //plugins: [$scope.selectToggle],
       showFilter: false,
       //showColumnMenu: false,
       canSelectRows: false,
@@ -84,11 +85,13 @@ module Jmx {
 
       // TODO - maybe there's a better way to determine when to enable selections
 
+/*
       if (answer.startsWith("app/camel") && workspace.selection.children.length > 0) {
         $scope.selectToggle.setSelect(true);
       } else {
         $scope.selectToggle.setSelect(false);
       }
+*/
       return answer;
     };