diff --git a/index.html b/index.html index 1393633d3a..88af3241e9 100644 --- a/index.html +++ b/index.html @@ -38,18 +38,5 @@ - - diff --git a/src/app.js b/src/app.js index ab570236d7..0084266771 100644 --- a/src/app.js +++ b/src/app.js @@ -1,4 +1,4 @@ -/* global alert, confirm, Option, Worker, chrome */ +/* global confirm, prompt, Option, Worker, chrome */ 'use strict' var async = require('async') @@ -242,7 +242,7 @@ function run () { success: function (response) { if (response.data) { if (!response.data.files) { - alert('Gist load error: ' + response.data.message) + modalDialogCustom.alert('Gist load error: ' + response.data.message) return } loadFiles(response.data.files) @@ -254,7 +254,7 @@ function run () { // insert ballot contract if there are no files available if (!loadingFromGist && Object.keys(filesProviders['browser'].list()).length === 0) { if (!filesProviders['browser'].set(examples.ballot.name, examples.ballot.content)) { - alert('Failed to store example contract in browser. Remix will not work properly. Please ensure Remix has access to LocalStorage. Safari in Private mode is known not to work.') + modalDialogCustom.alert('Failed to store example contract in browser. Remix will not work properly. Please ensure Remix has access to LocalStorage. Safari in Private mode is known not to work.') } } @@ -612,9 +612,9 @@ function run () { udapp.event.register('publishContract', this, function (contract) { publishOnSwarm(contract, function (err) { if (err) { - alert('Failed to publish metadata: ' + err) + modalDialogCustom.alert('Failed to publish metadata: ' + err) } else { - alert('Metadata published successfully') + modalDialogCustom.alert('Metadata published successfully') } }) }) diff --git a/src/app/file-explorer.js b/src/app/file-explorer.js index 930ce00f46..c59e903fbb 100755 --- a/src/app/file-explorer.js +++ b/src/app/file-explorer.js @@ -3,6 +3,7 @@ var yo = require('yo-yo') var csjs = require('csjs-inject') var Treeview = require('ethereum-remix').ui.TreeView var modalDialog = require('./modaldialog') +var modalDialogCustom = require('./modal-dialog-custom') var EventManager = require('ethereum-remix').lib.EventManager @@ -133,7 +134,7 @@ function fileExplorer (appAPI, files) { var fileReader = new FileReader() fileReader.onload = function (event) { var success = files.set(name, event.target.result) - if (!success) alert('Failed to create file ' + name) + if (!success) modalDialogCustom.alert('Failed to create file ' + name) else events.trigger('focus', [name]) } fileReader.readAsText(file) @@ -219,12 +220,12 @@ function fileExplorer (appAPI, files) { newPath[newPath.length - 1] = label.innerText newPath = newPath.join('/') if (label.innerText.match(/(\/|:|\*|\?|"|<|>|\\|\||')/) !== null) { - alert('special characters are not allowsed') + modalDialogCustom.alert('special characters are not allowsed') label.innerText = textUnderEdit } else if (!files.exists(newPath)) { files.rename(label.dataset.path, newPath, isFolder) } else { - alert('File already exists.') + modalDialogCustom.alert('File already exists.') label.innerText = textUnderEdit } } else label.innerText = textUnderEdit @@ -253,7 +254,7 @@ function fileExplorer (appAPI, files) { } } if (err) { - alert(`couldn't rename - ${err}`) + modalDialogCustom.alert(`could not rename - ${err}`) label.innerText = textUnderEdit } else { textUnderEdit = label.innerText @@ -305,7 +306,7 @@ function fileExplorer (appAPI, files) { } function fileRenamedError (error) { - alert(error) + modalDialogCustom.alert(error) } function fileAdded (filepath) { diff --git a/src/app/file-panel.js b/src/app/file-panel.js index 316441d37e..2728929ecb 100644 --- a/src/app/file-panel.js +++ b/src/app/file-panel.js @@ -1,10 +1,11 @@ -/* global alert */ + var csjs = require('csjs-inject') var yo = require('yo-yo') var EventManager = require('ethereum-remix').lib.EventManager var FileExplorer = require('./file-explorer') var modalDialog = require('./modaldialog') +var modalDialogCustom = require('./modal-dialog-custom') module.exports = filepanel @@ -214,7 +215,7 @@ function filepanel (appAPI, filesProvider) { function createNewFile () { var newName = filesProvider['browser'].type + '/' + appAPI.createName('Untitled.sol') if (!filesProvider['browser'].set(newName, '')) { - alert('Failed to create file ' + newName) + modalDialogCustom.alert('Failed to create file ' + newName) } else { appAPI.switchToFile(newName) } diff --git a/src/app/modal-dialog-custom.js b/src/app/modal-dialog-custom.js index 815c3e01c2..4e2587b67f 100644 --- a/src/app/modal-dialog-custom.js +++ b/src/app/modal-dialog-custom.js @@ -2,8 +2,6 @@ var modal = require('./modaldialog.js') var yo = require('yo-yo') module.exports = { alert: function (text) { - modal('', yo`
${text}
`, null, null) - var cancel = document.getElementById('modal-footer-cancel') - cancel.style.display = 'none' + modal('', yo`
${text}
`, null, {label:null}) } } diff --git a/src/app/modaldialog.js b/src/app/modaldialog.js index 790fd59584..0bb2042915 100644 --- a/src/app/modaldialog.js +++ b/src/app/modaldialog.js @@ -97,14 +97,9 @@ module.exports = (title, content, ok, cancel) => { container.style.display = container.style.display === 'block' ? hide() : show() - function clickModalFooterListener (event) { - hide() - removeEventListener() - } - function okListener () { hide() - // if (ok && ok.fn) ok.fn() - what is ok.fn doing? + if (ok && ok.fn) ok.fn() removeEventListener() } @@ -125,12 +120,10 @@ module.exports = (title, content, ok, cancel) => { function removeEventListener () { okDiv.removeEventListener('click', okListener) cancelDiv.removeEventListener('click', cancelListener) - modal.removeEventListener('click', clickModalFooterListener) } okDiv.addEventListener('click', okListener) cancelDiv.addEventListener('click', cancelListener) - modalFooter.addEventListener('click', clickModalFooterListener) } function html () {