#233: Fixed karaf plugin may have undefined values for old and new va…

…lues causing errors in the console.
hawtio · Apr 8, 2013 · 25e77b4 · 25e77b4
1 parent a28f009
commit 25e77b4
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/hawtio-web/src/main/webapp/app/karaf/js/features.ts b/hawtio-web/src/main/webapp/app/karaf/js/features.ts
@@ -25,11 +25,19 @@ module Karaf {
             self.location = location;
 
             self.callback = function (newValue, oldValue) {
-                if (newValue === oldValue) {
-                    return;
+                if (angular.isUndefined(oldValue) && angular.isUndefined(newValue)) {
+                  // if for some reason we do not have a values
+                  return
                 }
-                if (newValue.id === oldValue.id) {
-                    return;
+
+                // if we have an old value to quick compare against
+                if (angular.isDefined(oldValue)) {
+                  if (newValue === oldValue) {
+                      return;
+                  }
+                  if (newValue.id === oldValue.id) {
+                      return;
+                  }
                 }
                 self.scope.features = featuresOfRepo(self.scope.repository.id, self.scope.features);
                 self.scope.feature = setSelect(self.scope.repository, self.scope.repositories);
@@ -50,10 +58,12 @@ module Karaf {
 
             self.evalFilter = function () {
                 var byRepo = self.grid.sortedData;
-                if (self.scope.repository.id !== "") {
-                    byRepo = self.grid.sortedData.findAll(function (item) {
-                        return item.Repository === self.scope.repository.id
-                    });
+                if (angular.isDefined(self.scope.repository)) {
+                  if (self.scope.repository.id !== "") {
+                      byRepo = self.grid.sortedData.findAll(function (item) {
+                          return item.Repository === self.scope.repository.id
+                      });
+                  }
                 }
                 self.grid.filteredData = byRepo;
                 self.grid.rowFactory.filteredDataChanged();