CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-31 01:09:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename confirm -> uiconfirm and import to save.js

Browse Source 
(closes #3373)
This commit is contained in:
Bryan Housel
2016-08-24 16:03:23 -04:00
parent 36a90b4f86
commit 5a045933c6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/modes/save.js
View File

@@ -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();

2
modules/ui/confirm.js
View File

@@ -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')

2
modules/ui/index.js
View File

@@ -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';

4
test/spec/ui/confirm.js
View File

@@ -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;