From 98f387b605108d589a7b68ebac2632f1791302f9 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Thu, 22 Sep 2016 17:34:53 -0700
Subject: [PATCH] [Edit Mode] Renamed function from EditAction.cancel() to
 EditAction.finish()

---
 platform/commonUI/browse/src/navigation/NavigateAction.js   | 2 +-
 .../commonUI/browse/test/navigation/NavigateActionSpec.js   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/commonUI/browse/src/navigation/NavigateAction.js b/platform/commonUI/browse/src/navigation/NavigateAction.js
index 431ad8dadc..6121213a51 100644
--- a/platform/commonUI/browse/src/navigation/NavigateAction.js
+++ b/platform/commonUI/browse/src/navigation/NavigateAction.js
@@ -64,7 +64,7 @@ define(
                 var editing = currentObject.hasCapability('editor') &&
                     currentObject.getCapability('editor').isEditContextRoot();
 
-                return self.$q.when(editing && currentObject.getCapability("editor").cancel());
+                return self.$q.when(editing && currentObject.getCapability("editor").finish());
             }
 
             function navigate() {
diff --git a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
index 509e7aef3d..f9b756eeaa 100644
--- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
+++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js
@@ -61,7 +61,7 @@ define(
 
                 capabilities.editor = jasmine.createSpyObj("editorCapability", [
                     "isEditContextRoot",
-                    "cancel"
+                    "finish"
                 ]);
 
                 mockNavigatedObject.getCapability.andCallFake(function (capability) {
@@ -148,9 +148,9 @@ define(
                     capabilities.editor.isEditContextRoot.andReturn(true);
                 });
 
-                it("cancels editing if in edit mode", function () {
+                it("finishes editing if in edit mode", function () {
                     action.perform();
-                    expect(capabilities.editor.cancel)
+                    expect(capabilities.editor.finish)
                         .toHaveBeenCalled();
                 });
             });