From cb43ec19ddc232e111abe21175c4a07bb67e8174 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Thu, 10 Mar 2016 15:44:33 -0400 Subject: [PATCH] Move NavigationController to a separate file --- lib/browser/app.js | 10 ++--- lib/browser/controllers/navigation.js | 61 +++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 lib/browser/controllers/navigation.js diff --git a/lib/browser/app.js b/lib/browser/app.js index cb6c0f79..c24ba8a7 100644 --- a/lib/browser/app.js +++ b/lib/browser/app.js @@ -23,7 +23,6 @@ var angular = require('angular'); const _ = require('lodash'); const electron = require('electron'); -const shell = electron.remote.require('shell'); const dialog = electron.remote.require('./src/dialog'); const BrowserWindow = electron.remote.BrowserWindow; const currentWindow = BrowserWindow.fromId(1); @@ -38,6 +37,7 @@ require('./browser/modules/path'); require('./browser/modules/notifier'); require('./browser/modules/analytics'); require('./browser/controllers/finish'); +require('./browser/controllers/navigation'); const app = angular.module('Etcher', [ 'ui.router', @@ -53,7 +53,8 @@ const app = angular.module('Etcher', [ 'Etcher.analytics', // Controllers - 'Etcher.controllers.finish' + 'Etcher.controllers.finish', + 'Etcher.controllers.navigation' ]); app.config(function($stateProvider, $urlRouterProvider) { @@ -202,8 +203,3 @@ app.controller('AppController', function( }); }; }); - -app.controller('NavigationController', function($state) { - this.isState = $state.is; - this.open = shell.openExternal; -}); diff --git a/lib/browser/controllers/navigation.js b/lib/browser/controllers/navigation.js new file mode 100644 index 00000000..f31789d2 --- /dev/null +++ b/lib/browser/controllers/navigation.js @@ -0,0 +1,61 @@ +/* + * 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.navigation + */ + +const electron = require('electron'); +const shell = electron.remote.require('shell'); +const angular = require('angular'); + +require('angular-ui-router'); +const navigation = angular.module('Etcher.controllers.navigation', [ + 'ui.router' +]); + +navigation.controller('NavigationController', function($state) { + + /** + * @summary Check the current state + * @function + * @public + * + * @param {String} state - state + * @returns {Boolean} whether the state matches + * + * @example + * if(NavigationController.isState('state')) { + * console.log('We are in this state'). + * } + */ + this.isState = $state.is; + + /** + * @summary Open external resource + * @function + * @public + * + * @param {String} resource - resource + * + * @example + * NavigationController.open('https://google.com'); + */ + this.open = shell.openExternal; + +});