From 5a045933c69239246c8bf12295c8839007ba40c5 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 24 Aug 2016 16:03:23 -0400
Subject: [PATCH] Rename confirm -> uiconfirm and import to save.js (closes
 #3373)

---
 modules/modes/save.js   | 4 ++--
 modules/ui/confirm.js   | 2 +-
 modules/ui/index.js     | 2 +-
 test/spec/ui/confirm.js | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/modes/save.js b/modules/modes/save.js
index 3ebb34b27..214365d8a 100644
--- a/modules/modes/save.js
+++ b/modules/modes/save.js
@@ -1,6 +1,6 @@
 import { t } from '../util/locale';
 import _ from 'lodash';
-import { Commit, Conflicts, Loading, Success } from '../ui/index';
+import { Conflicts, uiconfirm, Commit, Loading, Success } from '../ui/index';
 import { DiscardTags, MergeRemoteChanges, Noop, Revert } from '../actions/index';
 import { displayName, displayType } from '../util/index';
 import { Browse } from './index';
@@ -240,7 +240,7 @@ export function Save(context) {
 
 
         function showErrors() {
-            var selection = confirm(context.container());
+            var selection = uiconfirm(context.container());
 
             history.pop();
             loading.close();
diff --git a/modules/ui/confirm.js b/modules/ui/confirm.js
index 536b0647d..0c178ffb0 100644
--- a/modules/ui/confirm.js
+++ b/modules/ui/confirm.js
@@ -1,7 +1,7 @@
 import { t } from '../util/locale';
 import { modal } from './modal';
 
-export function confirm(selection) {
+export function uiconfirm(selection) {
     var modalSelection = modal(selection);
 
     modalSelection.select('.modal')
diff --git a/modules/ui/index.js b/modules/ui/index.js
index 8caeac7ba..b7f41302d 100644
--- a/modules/ui/index.js
+++ b/modules/ui/index.js
@@ -5,7 +5,7 @@ export { Attribution } from './attribution';
 export { Background } from './background';
 export { cmd } from './cmd';
 export { Commit } from './commit';
-export { confirm } from './confirm';
+export { uiconfirm } from './confirm';
 export { Conflicts } from './conflicts';
 export { Contributors } from './contributors';
 export { Disclosure } from './disclosure';
diff --git a/test/spec/ui/confirm.js b/test/spec/ui/confirm.js
index c684a715b..d03eeff4f 100644
--- a/test/spec/ui/confirm.js
+++ b/test/spec/ui/confirm.js
@@ -5,13 +5,13 @@ describe('iD.ui.confirm', function () {
     afterEach(function() { elem.remove(); });
 
     it('can be instantiated', function () {
-        var confirm = iD.ui.confirm(elem);
+        var confirm = iD.ui.uiconfirm(elem);
         expect(confirm).to.be.ok;
         happen.keydown(document, {keyCode: 27}); // dismiss
     });
 
     it('can be dismissed', function (done) {
-        var confirm = iD.ui.confirm(elem);
+        var confirm = iD.ui.uiconfirm(elem);
         happen.click(confirm.select('button').node());
         window.setTimeout(function() {
             expect(confirm.node().parentNode).to.be.null;