From 26d0e463674dc51267e48f545ccde78d3e7c9e79 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Fri, 3 Jan 2020 14:00:58 +0100 Subject: [PATCH] Convert angular SafeWebview to typescript Change-type: patch --- lib/gui/app/app.js | 2 +- .../safe-webview/{index.js => index.ts} | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) rename lib/gui/app/components/safe-webview/{index.js => index.ts} (66%) diff --git a/lib/gui/app/app.js b/lib/gui/app/app.js index c5e710dd..35dd597c 100644 --- a/lib/gui/app/app.js +++ b/lib/gui/app/app.js @@ -83,7 +83,7 @@ const app = angular.module('Etcher', [ require('angular-ui-router'), // Components - require('./components/safe-webview'), + require('./components/safe-webview').MODULE_NAME, // Pages require('./pages/main/main.ts').MODULE_NAME, diff --git a/lib/gui/app/components/safe-webview/index.js b/lib/gui/app/components/safe-webview/index.ts similarity index 66% rename from lib/gui/app/components/safe-webview/index.js rename to lib/gui/app/components/safe-webview/index.ts index fc7531f4..c405c044 100644 --- a/lib/gui/app/components/safe-webview/index.js +++ b/lib/gui/app/components/safe-webview/index.ts @@ -14,21 +14,15 @@ * limitations under the License. */ -'use strict' - /** * @module Etcher.Components.SafeWebview */ -const angular = require('angular') -const { react2angular } = require('react2angular') +import * as angular from 'angular'; +import { react2angular } from 'react2angular'; +import * as SafeWebview from './safe-webview'; -const MODULE_NAME = 'Etcher.Components.SafeWebview' -const SafeWebview = angular.module(MODULE_NAME, []) +export const MODULE_NAME = 'Etcher.Components.SafeWebview'; +const AngularSafeWebview = angular.module(MODULE_NAME, []); -SafeWebview.component( - 'safeWebview', - react2angular(require('./safe-webview.jsx')) -) - -module.exports = MODULE_NAME +AngularSafeWebview.component('safeWebview', react2angular(SafeWebview));