From 30bba3f9fc5d873b68cbf7e9abe6b41cb5bacf45 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Sat, 19 Sep 2015 15:00:51 -0400 Subject: [PATCH] Move Config defaults back to top of config.js --- js/client.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/js/client.js b/js/client.js index 8937dc9da..73af43374 100644 --- a/js/client.js +++ b/js/client.js @@ -1,5 +1,21 @@ (function ($) { + Config.version = '0.10.1'; + + Config.origindomain = 'play.pokemonshowdown.com'; + // `defaultserver` specifies the server to use when the domain name in the + // address bar is `Config.origindomain`. + Config.defaultserver = { + id: 'showdown', + host: 'sim.smogon.com', + port: 443, + httpport: 8000, + altport: 80, + registered: true + }; + Config.sockjsprefix = '/showdown'; + Config.root = '/'; + if (window.nodewebkit) { window.gui = require('nw.gui'); window.nwWindow = gui.Window.get(); @@ -133,22 +149,6 @@ }); } - Config.version = '0.10.1'; - Config.origindomain = 'play.pokemonshowdown.com'; - - // `defaultserver` specifies the server to use when the domain name in the - // address bar is `Config.origindomain`. - Config.defaultserver = { - id: 'showdown', - host: 'sim.smogon.com', - port: 443, - httpport: 8000, - altport: 80, - registered: true - }; - Config.sockjsprefix = '/showdown'; - Config.root = '/'; - // sanitize a room ID // shouldn't actually do anything except against a malicious server var toRoomid = this.toRoomid = function (roomid) {