Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-01 23:32:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add SSL support

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick
2013-05-01 05:50:21 -07:00
parent 1802cdca7c
commit c1fb7639db
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/client.js
View File

@@ -234,6 +234,8 @@
initializeConnection: function() {
var origindomain = 'play.pokemonshowdown.com';
if (document.location.hostname === origindomain) {
// TODO: BEFORE DEPLOYING THIS, add in code to check for use
// of http://play.pokemonshowdown.com here.
this.user.loadTeams();
this.trigger('init:loadteams');
Config.server = Config.defaultserver;
@@ -247,12 +249,17 @@
// crossdomain.php on play.pokemonshowdown.com.
var self = this;
$(window).on('message', (function() {
var origin = document.location.protocol + '//' + origindomain;
var origin;
var callbacks = {};
var callbackIdx = 0;
return function($e) {
var e = $e.originalEvent;
if (e.origin !== origin) return;
if ((e.origin === 'http://' + origindomain) ||
(e.origin === 'https://' + origindomain)) {
origin = e.origin;
} else {
return; // unauthorised source origin
}
var data = $.parseJSON(e.data);
if (data.server) {
var postCrossDomainMessage = function(data) {
@@ -333,7 +340,8 @@
connect: function() {
var self = this;
var constructSocket = function() {
return new SockJS('http://' + Config.server.host + ':' +
var protocol = (Config.server.port === 443) ? 'https' : 'http';
return new SockJS(protocol + '://' + Config.server.host + ':' +
Config.server.port + Config.sockjsprefix);
};
this.socket = constructSocket();