Merge branch 'master' into mct588comm

2016-09-14 19:50:19 +03:00
parent 0be84a4e51 f73238787d
commit d8dc3c8445
24 changed files with 667 additions and 206 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",