Merge pull request #8 from nasa/open1149

[Addressability] Use/populate URL
2015-06-19 16:05:10 -07:00
parent 149ac44e8c ee69eb3a01
commit 6b0a77d131
8 changed files with 374 additions and 42 deletions
--- a/platform/commonUI/general/src/controllers/ViewSwitcherController.js
+++ b/platform/commonUI/general/src/controllers/ViewSwitcherController.js
@@ -53,12 +53,14 @@ define(

            // Get list of views, read from capability
            function updateOptions(views) {
-                $timeout(function () {
-                    $scope.ngModel.selected = findMatchingOption(
-                        views || [],
-                        ($scope.ngModel || {}).selected
-                    );
-                }, 0);
+                if (Array.isArray(views)) {
+                    $timeout(function () {
+                        $scope.ngModel.selected = findMatchingOption(
+                            views,
+                            ($scope.ngModel || {}).selected
+                        );
+                    }, 0);
+                }
            }

            // Update view options when the in-scope results of using the
@@ -68,4 +70,4 @@ define(

        return ViewSwitcherController;
    }
-);
+);