# HG changeset patch # User Andrew Azores # Date 1508166597 14400 # Node ID 17c7c78c596f017d8386445251e6dccfce9c810b # Parent 70b4d54655aff2506e77e1745a1181357666d30c Move gateway-url-helper logic into TS Reviewed-by: jkang Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025398.html diff -r 70b4d54655af -r 17c7c78c596f package.json --- a/package.json Mon Oct 16 11:09:35 2017 -0400 +++ b/package.json Mon Oct 16 11:09:57 2017 -0400 @@ -16,6 +16,7 @@ "@types/angular": "^1.6.32", "@types/big.js": "^3.2.0", "@types/core-js": "^0.9.43", + "@types/jquery": "^3.2.13", "@types/mocha": "^2.2.43", "@types/should": "^11.2.0", "@types/sinon": "^2.3.5", diff -r 70b4d54655af -r 17c7c78c596f src/gateway-url-helper.js --- a/src/gateway-url-helper.js Mon Oct 16 11:09:35 2017 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/** - * Copyright 2012-2017 Red Hat, Inc. - * - * Thermostat is distributed under the GNU General Public License, - * version 2 or any later version (with a special exception described - * below, commonly known as the "Classpath Exception"). - * - * A copy of GNU General Public License (GPL) is included in this - * distribution, in the file COPYING. - * - * Linking Thermostat code with other modules is making a combined work - * based on Thermostat. Thus, the terms and conditions of the GPL - * cover the whole combination. - * - * As a special exception, the copyright holders of Thermostat give you - * permission to link this code with independent modules to produce an - * executable, regardless of the license terms of these independent - * modules, and to copy and distribute the resulting executable under - * terms of your choice, provided that you also meet, for each linked - * independent module, the terms and conditions of the license of that - * module. An independent module is a module which is not derived from - * or based on Thermostat code. If you modify Thermostat, you may - * extend this exception to your version of the software, but you are - * not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -export function DetermineGatewayUrl () { - return new Promise(resolve => { - $.get('/gatewayurl') - .done(res => { - window.tmsGatewayUrl = res.gatewayUrl; - }) - .fail(() => { - let url = require('url'); - let parsed = url.parse(window.location.href); - let gateway = { - protocol: parsed.protocol, - host: parsed.host - }; - window.tmsGatewayUrl = url.format(gateway); - }) - .always(() => resolve()); - }); -} diff -r 70b4d54655af -r 17c7c78c596f src/gateway-url-helper.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gateway-url-helper.ts Mon Oct 16 11:09:57 2017 -0400 @@ -0,0 +1,47 @@ +/** + * Copyright 2012-2017 Red Hat, Inc. + * + * Thermostat is distributed under the GNU General Public License, + * version 2 or any later version (with a special exception described + * below, commonly known as the "Classpath Exception"). + * + * A copy of GNU General Public License (GPL) is included in this + * distribution, in the file COPYING. + * + * Linking Thermostat code with other modules is making a combined work + * based on Thermostat. Thus, the terms and conditions of the GPL + * cover the whole combination. + * + * As a special exception, the copyright holders of Thermostat give you + * permission to link this code with independent modules to produce an + * executable, regardless of the license terms of these independent + * modules, and to copy and distribute the resulting executable under + * terms of your choice, provided that you also meet, for each linked + * independent module, the terms and conditions of the license of that + * module. An independent module is a module which is not derived from + * or based on Thermostat code. If you modify Thermostat, you may + * extend this exception to your version of the software, but you are + * not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + */ + +import * as $ from "jquery"; + +export function DetermineGatewayUrl(): Promise { + return new Promise(resolve => { + $.get("/gatewayurl") + .done((res: any) => { + (window).tmsGatewayUrl = res.gatewayUrl; + }) + .fail(() => { + let url = require("url"); + let parsed = url.parse(window.location.href); + let gateway = { + protocol: parsed.protocol, + host: parsed.host + }; + (window).tmsGatewayUrl = url.format(gateway); + }) + .always(() => resolve()); + }); +} diff -r 70b4d54655af -r 17c7c78c596f src/main.ts --- a/src/main.ts Mon Oct 16 11:09:35 2017 -0400 +++ b/src/main.ts Mon Oct 16 11:09:57 2017 -0400 @@ -25,15 +25,15 @@ * exception statement from your version. */ -import './rx-subject.stub.ts'; -import 'zone.js'; -import 'reflect-metadata'; +import "./rx-subject.stub.ts"; +import "zone.js"; +import "reflect-metadata"; -import { UpgradeModule } from '@angular/upgrade/static'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppModule } from './app/app.module'; +import { UpgradeModule } from "@angular/upgrade/static"; +import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; +import { AppModule } from "./app/app.module"; -import { DetermineGatewayUrl } from './gateway-url-helper.js'; +import { DetermineGatewayUrl } from "./gateway-url-helper"; DetermineGatewayUrl().then(() => { platformBrowserDynamic().bootstrapModule(AppModule);