diff --git a/README.md b/README.md index 7b480822..9510d0e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Etcher ====== -> A better way to burn OS images to SD cards +> A better way to flash OS images to SD cards [](https://david-dm.org/resin-io/etcher.svg) [](https://travis-ci.org/resin-io/etcher) diff --git a/assets/images/burn.svg b/assets/images/flash.svg similarity index 100% rename from assets/images/burn.svg rename to assets/images/flash.svg diff --git a/lib/browser/app.js b/lib/browser/app.js index 5fcf2945..bae59348 100644 --- a/lib/browser/app.js +++ b/lib/browser/app.js @@ -107,9 +107,9 @@ app.controller('AppController', function( this.success = true; // This catches the case where the user enters - // the settings screen when a burn finished + // the settings screen when a flash finished // and goes back to the main screen with the back button. - if (!this.writer.isBurning()) { + if (!this.writer.isFlashing()) { this.selection.clear({ @@ -198,7 +198,7 @@ app.controller('AppController', function( }; this.reselectImage = function() { - if (self.writer.isBurning()) { + if (self.writer.isFlashing()) { return; } @@ -212,7 +212,7 @@ app.controller('AppController', function( }; this.reselectDrive = function() { - if (self.writer.isBurning()) { + if (self.writer.isFlashing()) { return; } @@ -230,30 +230,30 @@ app.controller('AppController', function( AnalyticsService.logEvent('Restart after failure'); }; - this.burn = function(image, drive) { + this.flash = function(image, drive) { - // Stop scanning drives when burning + // Stop scanning drives when flashing // otherwise Windows throws EPERM self.scanner.stop(); - AnalyticsService.logEvent('Burn', { + AnalyticsService.logEvent('Flash', { image: image, device: drive.device }); - return self.writer.burn(image, drive).then(function(success) { + return self.writer.flash(image, drive).then(function(success) { - // TODO: Find a better way to manage burn/check + // TODO: Find a better way to manage flash/check // success/error state than a global boolean flag. self.success = success; if (self.success) { - NotificationService.send('Success!', 'You burn is complete'); + NotificationService.send('Success!', 'Your flash is complete'); AnalyticsService.logEvent('Done'); $state.go('success'); } else { - NotificationService.send('Oops!', 'Looks like your burn has failed'); - AnalyticsService.logEvent('Burn error'); + NotificationService.send('Oops!', 'Looks like your flash has failed'); + AnalyticsService.logEvent('Flash error'); } }) .catch(dialog.showError) diff --git a/lib/browser/modules/image-writer.js b/lib/browser/modules/image-writer.js index 21719e1d..2e8319a9 100644 --- a/lib/browser/modules/image-writer.js +++ b/lib/browser/modules/image-writer.js @@ -38,10 +38,10 @@ const imageWriter = angular.module('Etcher.image-writer', [ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, NotifierService) { let self = this; - let burning = false; + let flashing = false; /** - * @summary Reset burn state + * @summary Reset flash state * @function * @public * @@ -56,7 +56,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, }; /** - * @summary Burn progress state + * @summary Flash progress state * @type Object * @public */ @@ -64,36 +64,36 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, this.resetState(); /** - * @summary Check if currently burning + * @summary Check if currently flashing * @function * @private * - * @returns {Boolean} whether is burning or not + * @returns {Boolean} whether is flashing or not * * @example - * if (ImageWriterService.isBurning()) { - * console.log('We\'re currently burning'); + * if (ImageWriterService.isFlashing()) { + * console.log('We\'re currently flashing'); * } */ - this.isBurning = function() { - return burning; + this.isFlashing = function() { + return flashing; }; /** - * @summary Set the burning status + * @summary Set the flashing status * @function * @private * * @description * This function is extracted for testing purposes. * - * @param {Boolean} status - burning status + * @param {Boolean} status - flashing status * * @example - * ImageWriterService.setBurning(true); + * ImageWriterService.setFlashing(true); */ - this.setBurning = function(status) { - burning = Boolean(status); + this.setFlashing = function(status) { + flashing = Boolean(status); }; /** @@ -122,7 +122,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, }; /** - * @summary Burn an image to a drive + * @summary Flash an image to a drive * @function * @public * @@ -135,18 +135,18 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, * @returns {Promise} * * @example - * ImageWriterService.burn('foo.img', { + * ImageWriterService.flash('foo.img', { * device: '/dev/disk2' * }).then(function() { * console.log('Write completed!'); * }); */ - this.burn = function(image, drive) { - if (self.isBurning()) { - return $q.reject(new Error('There is already a burn in progress')); + this.flash = function(image, drive) { + if (self.isFlashing()) { + return $q.reject(new Error('There is already a flash in progress')); } - self.setBurning(true); + self.setFlashing(true); return self.performWrite(image, drive, function(state) { @@ -165,7 +165,7 @@ imageWriter.service('ImageWriterService', function($q, $timeout, SettingsModel, }); }).finally(function() { - self.setBurning(false); + self.setFlashing(false); }); }; diff --git a/lib/browser/pages/finish/controllers/finish.js b/lib/browser/pages/finish/controllers/finish.js index d9bd0778..822f43bb 100644 --- a/lib/browser/pages/finish/controllers/finish.js +++ b/lib/browser/pages/finish/controllers/finish.js @@ -26,7 +26,7 @@ module.exports = function($state, SelectionStateModel, ImageWriterService, Analy this.settings = SettingsModel.data; /** - * @summary Restart the burning process + * @summary Restart the flashing process * @function * @public * diff --git a/lib/browser/pages/finish/finish.js b/lib/browser/pages/finish/finish.js index 8f4e75c6..bd9f28c4 100644 --- a/lib/browser/pages/finish/finish.js +++ b/lib/browser/pages/finish/finish.js @@ -20,7 +20,7 @@ * @module Etcher.Pages.Finish * * The finish page represents the application state where - * the the burn/validation has completed. + * the the flash/validation has completed. * * Its purpose is to display success or failure information, * as well as the "next steps". diff --git a/lib/browser/pages/finish/templates/success.tpl.html b/lib/browser/pages/finish/templates/success.tpl.html index 4e9f1965..d5a29e56 100644 --- a/lib/browser/pages/finish/templates/success.tpl.html +++ b/lib/browser/pages/finish/templates/success.tpl.html @@ -1,13 +1,13 @@
Safely ejected and ready for use