gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7597 from FreeCodeCamp/fix/ssl-wiki

Browse Source 
Fix wiki's SSL issue
This commit is contained in:
Mrugesh Mohapatra
2016-03-18 00:45:51 +05:30
parent f88a80c6cb a65742ad45
commit 38e647aad6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/main.js
View File

@ -389,7 +389,7 @@ $(document).ready(function() {
if (!main.isWikiAsideLoad) { if (!main.isWikiAsideLoad) {
var lang = window.location.toString().match(/\/\w{2}\//); var lang = window.location.toString().match(/\/\w{2}\//);
lang = (lang) ? lang[0] : '/en/'; lang = (lang) ? lang[0] : '/en/';
var wikiURL = 'http://freecodecamp.github.io/wiki' + lang; var wikiURL = '//freecodecamp.github.io/wiki' + lang;
var wikiAside = $('<iframe>'); var wikiAside = $('<iframe>');
wikiAside.attr({ wikiAside.attr({
src: wikiURL, src: wikiURL,

2
server/views/wiki/show.jade
View File

@ -4,4 +4,4 @@ block content
script. script.
var lang = window.location.toString().match(/\/\w{2}\//); var lang = window.location.toString().match(/\/\w{2}\//);
lang = (lang) ? lang[0] : '/en/'; lang = (lang) ? lang[0] : '/en/';
$('#wikiFrame').attr('src','http://freecodecamp.github.io/wiki' + lang); $('#wikiFrame').attr('src','//freecodecamp.github.io/wiki' + lang);