Skip to content
This repository was archived by the owner on Nov 23, 2019. It is now read-only.

fix: fix https loading and api loading scripts #7

Open
medicalwei wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: fix https loading and api loading scripts #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144e1bb
fix: change script loading url
medicalwei Aug 27, 2018
4110e4e
fix: load fonts from https
medicalwei Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions assets/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jQuery(function ($) {
if ($('#nav.empty').length) {
// Fetch site nav from remove JSON api
$.getJSON(
'http://coscup.org/2011/api/menu/?callback=?',
'/2011/api/menu.json',
function (data) {
var $nav = $('#nav').removeClass('empty');
$nav.html(data[lang].replace(/href="(\/[^\/])/g, 'href="http://coscup.org$1'));
Expand Down Expand Up @@ -192,7 +192,7 @@ jQuery(function ($) {
if ($('#sidebar > .sponsors.empty').length) {
// Fetch sponsors from remove JSON api
$.getJSON(
'http://coscup.org/2011/api/sponsors/?callback=?',
'/2011/api/sponsors.json',
function (data) {
var $sponsors = $('#sidebar > .sponsors').removeClass('empty');
var titles = (
Expand Down Expand Up @@ -410,6 +410,7 @@ jQuery(function ($) {
}
}

/*
if ($('#sidebar2 > .socialbuzz').length) {
var plurks, twits;
$.getJSON(
Expand All @@ -427,7 +428,9 @@ jQuery(function ($) {
}
);
}
*/

/*
if ($('#ipv6block').length) {
if (window.location.hostname === 'ipv6.coscup.org') {
if (window._gaq) _gaq.push(['_trackEvent', 'IPv6 2011', 'connected']);
Expand All @@ -438,7 +441,7 @@ jQuery(function ($) {
} else {
$.getJSON(
// See http://ipv6-test.com/api/
'http://v6.ipv6-test.com/api/myip.php?json&callback=?',
'https://v6.ipv6-test.com/api/myip.php?json&callback=?',
function (data) {
if (window._gaq) _gaq.push(['_trackEvent', 'IPv6 2011', 'ready but not connected']);
$('#ipv6block').addClass('show').append(
Expand All @@ -449,6 +452,7 @@ jQuery(function ($) {
);
}
}
*/

if ($('#countdown-time').length) {
ctTimer = setInterval(
Expand Down Expand Up @@ -975,7 +979,7 @@ jQuery(function ($) {
!/((blog|sponsor|register)\.)?coscup\.org\.?/.test(window.location.domain)
) {
$.getJSON(
'http://coscup.org/2011/api/program/?callback=?',
'/2011/api/program.json',
function (data) {
programs = data;
insertProgramInfo();
Expand Down
Loading