Fixed cancel and drop-initiated edit

platform/commonUI/browse/src/BrowseController.js

@@ -76,6 +76,9 @@ define(
                 if (domainObject !== $scope.navigatedObject && isDirty() && !confirm(CONFIRM_MSG)) {
                         $scope.treeModel.selectedObject = $scope.navigatedObject;
                 } else {
+                    if (domainObject !== $scope.navigatedObject && $scope.navigatedObject.hasCapability('editor')){
+                        $scope.navigatedObject.getCapability('action').perform('cancel');
+                    }
                     setNavigation(domainObject);
                 }
             }
@@ -163,15 +166,6 @@ define(
                 return hasChanges;
             }
 
-            function beforeNavigateWarning (){
-                if (isDirty()) {
-                    return false;
-                }
-                else {
-                    return true;
-                }
-            }
-
             $scope.beforeUnloadWarning = function() {
                 return isDirty() ?
                     "Unsaved changes will be lost if you leave this page." :