From 3149f5af6d01016a5f290b02b7d6fb27ba419ddb Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 10 Mar 2016 14:52:08 -0400 Subject: [PATCH] Move FinishController to a separate file --- lib/browser/app.js | 23 +++------- lib/browser/controllers/finish.js | 71 +++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 18 deletions(-) create mode 100644 lib/browser/controllers/finish.js diff --git a/lib/browser/app.js b/lib/browser/app.js index c8283ef2..24ba3e63 100644 --- a/lib/browser/app.js +++ b/lib/browser/app.js @@ -37,6 +37,7 @@ require('./browser/modules/image-writer'); require('./browser/modules/path'); require('./browser/modules/notifier'); require('./browser/modules/analytics'); +require('./browser/controllers/finish'); const app = angular.module('Etcher', [ 'ui.router', @@ -49,7 +50,10 @@ const app = angular.module('Etcher', [ 'Etcher.drive-scanner', 'Etcher.image-writer', 'Etcher.notifier', - 'Etcher.analytics' + 'Etcher.analytics', + + // Controllers + 'Etcher.controllers.finish' ]); app.config(function($stateProvider, $urlRouterProvider) { @@ -207,20 +211,3 @@ app.controller('NavigationController', function($state) { this.isState = $state.is; this.open = shell.openExternal; }); - -app.controller('FinishController', function( - $state, - SelectionStateService, - SettingsService, - ImageWriterService, - AnalyticsService -) { - this.settings = SettingsService.data; - - this.restart = function(options) { - SelectionStateService.clear(options); - ImageWriterService.resetState(); - AnalyticsService.logEvent('Restart', options); - $state.go('main'); - }; -}); diff --git a/lib/browser/controllers/finish.js b/lib/browser/controllers/finish.js new file mode 100644 index 00000000..297e28be --- /dev/null +++ b/lib/browser/controllers/finish.js @@ -0,0 +1,71 @@ +/* + * Copyright 2016 Resin.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +/** + * @module Etcher.controllers.finish + */ + +const angular = require('angular'); + +require('angular-ui-router'); +require('../modules/selection-state'); +require('../modules/settings'); +require('../modules/image-writer'); +require('../modules/analytics'); +const finish = angular.module('Etcher.controllers.finish', [ + 'ui.router', + 'Etcher.selection-state', + 'Etcher.settings', + 'Etcher.image-writer', + 'Etcher.analytics' +]); + +finish.controller('FinishController', function( + $state, + SelectionStateService, + SettingsService, + ImageWriterService, + AnalyticsService +) { + + /** + * @summary Saved settings + * @type Object + * @public + */ + this.settings = SettingsService.data; + + /** + * @summary Restart the burning process + * @function + * @public + * + * @param {Object} [options] - options + * @param {Boolean} [options.preserveImage=false] - preserve image + * + * @example + * FinishController.restart({ preserveImage: true }); + */ + this.restart = function(options) { + SelectionStateService.clear(options); + ImageWriterService.resetState(); + AnalyticsService.logEvent('Restart', options); + $state.go('main'); + }; + +});