Merge branch 'master' of https://github.com/nasa/openmct

2016-09-16 17:16:35 -04:00
parent 0ec27350e0 156ba832f2
commit f9597fe799
27 changed files with 672 additions and 220 deletions
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -387,7 +387,7 @@ define([
            "constants": [
                {
                    "key": "editModeBlacklist",
-                    "value": ["copy", "follow", "window", "link", "locate"]
+                    "value": ["copy", "follow", "link", "locate"]
                },
                {
                    "key": "nonEditContextBlacklist",