From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 4 May 2015 12:08:39 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=0ffa7a2279c36443ce58a2b0d383e45011b7230e;hp=903884f77afb6ef2a1d842c20bb495aa76ee7a77;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	js/90-mobilenav.js
---

diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css
index 4ba8625..32c642a 100644
--- a/css/themes/cyborg.css
+++ b/css/themes/cyborg.css
@@ -1385,6 +1385,28 @@ fieldset[disabled] .btn-primary.active {
 .affix {
   position: fixed;
 }
+@-ms-viewport {
+  width: device-width;
+}
+.visible-xs-block,
+.visible-xs-inline {
+  display: none !important;
+}
+@media (max-width: 767px) {
+  .visible-xs-block {
+    display: block !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline {
+    display: inline !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-xs {
+    display: none !important;
+  }
+}
 .text-primary,
 .text-primary:hover {
   color: #2a9fd6;
diff --git a/css/themes/readable.css b/css/themes/readable.css
index 193cdfd..63f7ae5 100644
--- a/css/themes/readable.css
+++ b/css/themes/readable.css
@@ -1385,6 +1385,28 @@ fieldset[disabled] .btn-primary.active {
 .affix {
   position: fixed;
 }
+@-ms-viewport {
+  width: device-width;
+}
+.visible-xs-block,
+.visible-xs-inline {
+  display: none !important;
+}
+@media (max-width: 767px) {
+  .visible-xs-block {
+    display: block !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline {
+    display: inline !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-xs {
+    display: none !important;
+  }
+}
 .navbar {
   font-family: sans-serif;
 }
diff --git a/css/themes/slate.css b/css/themes/slate.css
index 34b535e..d20c8fe 100644
--- a/css/themes/slate.css
+++ b/css/themes/slate.css
@@ -1385,6 +1385,28 @@ fieldset[disabled] .btn-primary.active {
 .affix {
   position: fixed;
 }
+@-ms-viewport {
+  width: device-width;
+}
+.visible-xs-block,
+.visible-xs-inline {
+  display: none !important;
+}
+@media (max-width: 767px) {
+  .visible-xs-block {
+    display: block !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline {
+    display: inline !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-xs {
+    display: none !important;
+  }
+}
 .btn,
 .btn:hover {
   border-color: rgba(0, 0, 0, 0.6);
diff --git a/js/00-strict.js b/js/00-strict.js
index e08ecdb..dccfeb1 100644
--- a/js/00-strict.js
+++ b/js/00-strict.js
@@ -1,2 +1,2 @@
 'use strict';
-var $;
+let $;
diff --git a/js/05-ki.js b/js/05-ki.js
index 59104b4..c2960a0 100644
--- a/js/05-ki.js
+++ b/js/05-ki.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2014 Denis Ciccale (@tdecs)
  * Released under MIT license
  */
-!function (b, c, d, e) {
+(function (b, c, d, e) {
 
   /*
    * init function (internal use)
@@ -68,4 +68,4 @@
     // representation instead of an object
     splice: c.splice
   }
-}(document, [], 'prototype');
+})(document, [], 'prototype');
diff --git a/js/05-makedom.js b/js/05-makedom.js
index 68026a1..389fe4c 100644
--- a/js/05-makedom.js
+++ b/js/05-makedom.js
@@ -1,5 +1,5 @@
 function m(html) {
-	var div = document.createElement("div");
+	const div = document.createElement("div");
 	div.innerHTML = html;
 	return div.firstChild;
 }
diff --git a/js/10-modal.js b/js/10-modal.js
index eea85d7..3a8a214 100644
--- a/js/10-modal.js
+++ b/js/10-modal.js
@@ -13,8 +13,6 @@ function hide_modal () {
 }
 
 $(function() {
-	if(document.documentElement.clientWidth)
-		return;
 	modal = $('.modal')[0];
 	backdrop = $('.backdrop')[0];
 	$(modal).on('transitionend', el => {
@@ -23,8 +21,10 @@ $(function() {
 	});
 	$('.backdrop,.modal').each(el => document.body.appendChild(el) );
 	$('#solution').on('click', e => {
-		show_modal();
-		e.preventDefault();
+		if(window.matchMedia("(min-width: 768px)").matches){
+			show_modal();
+			e.preventDefault();
+		}
 	});
 	$('.backdrop').on('click', hide_modal);
 	window.onkeyup = event => {
diff --git a/js/80-sidebar.js b/js/80-sidebar.js
index 505dc0f..2f6ca8a 100644
--- a/js/80-sidebar.js
+++ b/js/80-sidebar.js
@@ -1,6 +1,6 @@
 $(function() {
 	if(!document.getElementById('sidebar')) {
-        let content = $('main')[0];
+        const content = $('main')[0];
 		content.innerHTML = '<div class="col-md-9">' + content.innerHTML + '</div><aside id="sidebar" class="col-md-3"></aside>';
 		content.classList.add('row');
     }
diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index ab5a5f2..da48856 100644
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -1,4 +1,4 @@
-var ext_table = {
+const ext_table = {
 	'c'   : 'C',
 
 	'cc'  : 'CPP',
@@ -30,8 +30,8 @@ var ext_table = {
 }
 
 function divine_format() {
-	var filename = $('#prog')[0].value;
-	var ext = /\.([^.]*)$/.exec(filename)[1];
+	const filename = $('#prog')[0].value;
+	const ext = /\.([^.]*)$/.exec(filename)[1];
 
 	if(ext_table[ext])
 		$('#prog_format')[0].value = ext_table[ext];
diff --git a/js/90-form.js b/js/90-form.js
index 0b76776..aa5e9ef 100644
--- a/js/90-form.js
+++ b/js/90-form.js
@@ -1,9 +1,9 @@
 $(function(){
-	let result = $('#result')[0];
+	const result = $('#result')[0];
 	$('.jsform > input[type="submit"]').on('click', e => {
-		let form_data = new FormData(this.parentElement);
-		let form = this.parentNode;
-		let xhr = new XMLHttpRequest();
+		const form_data = new FormData(this.parentElement);
+		const form = this.parentNode;
+		const xhr = new XMLHttpRequest();
 		xhr.open(form.getAttribute('method'), form.getAttribute('action'));
 		xhr.onload = () => result.innerHTML = this.responseText;
 		xhr.onerror = () => result.innerHTML = 'Error!';
diff --git a/js/90-mobilenav.js b/js/90-mobilenav.js
index 8c1e38a..9efe8fc 100644
--- a/js/90-mobilenav.js
+++ b/js/90-mobilenav.js
@@ -1,7 +1,6 @@
 $(function(){
-	if(document.documentElement.clientWidth >= 768)
-		return;
-	$('#title')[0].insertAdjacentHTML('beforebegin', '<div class="text-center">Tap title to toggle menu</div>');
-	$('nav')[0].classList.add('hidden');
-	$('#title,#logo').on('click', () => $('nav')[0].classList.toggle('hidden'));
+	const nav = $('nav')[0];
+	nav.classList.add('hidden-xs');
+	$('#title')[0].insertAdjacentHTML('beforebegin', '<div class="text-center visible-xs-block">Tap title to toggle menu</div>');
+	$('#title,#logo').on('click', () => nav.classList.toggle('hidden-xs'));
 });
diff --git a/js/90-nav.js b/js/90-nav.js
index 4412e3a..746ccd7 100644
--- a/js/90-nav.js
+++ b/js/90-nav.js
@@ -10,8 +10,8 @@ const NAVS = {
 };
 
 $(function(){
-	let path = location.pathname;
-	for (let nav in NAVS)
+	const path = location.pathname;
+	for (const nav in NAVS)
 		if(path.match(NAVS[nav]))
 			$('#nav-' + nav)[0].classList.add('active');
 });
diff --git a/js/90-themes.js b/js/90-themes.js
index 4a7067e..6a4c680 100644
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@ -15,18 +15,15 @@ function set_style(name, trans){
 }
 
 $(function() {
-	var theme_ul = '<ul class="list-inline" id="themes">' +
+	const theme_ul = '<ul class="list-inline" id="themes">' +
 		'<li><a role="button" data-theme="cyborg">Black</a>' +
 		'<li><a role="button" data-theme="slate">Grey</a>' +
 		'<li><a role="button" data-theme="readable">White</a></ul>';
-	var sidebar = $('#sidebar')[0];
+	const sidebar = $('#sidebar')[0];
 	sidebar.insertBefore(m(theme_ul), sidebar.firstChild);
 	$('#themes a').on('click', e => set_style(e.target.dataset.theme, true));
 });
 
-let theme = localStorage.getItem("theme");
-if(theme) {
-	if(theme == "cerulean" || theme == "cosmo")
-		theme = "readable";
-	set_style(theme, false);
-}
+const theme = localStorage.getItem("theme");
+if(theme)
+	set_style(theme == "cerulean" || theme == "cosmo" ? "readable" : theme, false);
diff --git a/js/90-timers.js b/js/90-timers.js
index c9b0950..8833a11 100644
--- a/js/90-timers.js
+++ b/js/90-timers.js
@@ -1,25 +1,22 @@
 let offset = 0;
 
 function update_timer(timer){
-	var start = parseInt(timer.dataset.start);
-	var stop  = parseInt(timer.dataset.stop);
-	var value = parseInt(timer.dataset.value);
-	var now   = Math.floor(Date.now() / 1000) + offset;
+	const start = parseInt(timer.dataset.start);
+	const stop  = parseInt(timer.dataset.stop);
+	const value = parseInt(timer.dataset.value);
+	const now   = Math.floor(Date.now() / 1000) + offset;
 
-	var left = stop - now;
-	var total = stop - start;
-	if(left < 0)
-		left = 0;
+	const left = Math.max(stop - now, 0);
+	const total = stop - start;
 
-	if(value) {
-		value = Math.max(value * 3 / 10, value * left / total);
-		timer.innerHTML = Math.floor(value);
-	} else {
-		var hours = Math.floor(left / 60 / 60);
+	if(value)
+		timer.innerHTML = Math.floor(Math.max(value * 3 / 10, value * left / total));
+	else {
+		let hours = Math.floor(left / 60 / 60);
 		hours = hours < 10 ? '0' + hours : hours;
-		var minutes = Math.floor(left / 60) % 60;
+		let minutes = Math.floor(left / 60) % 60;
 		minutes = minutes < 10 ? '0' + minutes : minutes;
-		var seconds = left % 60;
+		let seconds = left % 60;
 		seconds = seconds < 10 ? '0' + seconds : seconds;
 		timer.innerHTML = hours + ':' + minutes + ':' + seconds;
 	}
@@ -31,10 +28,10 @@ $(() => {
 		setInterval(() => update_timer(item), 1000);
 	});
 	if($('.timer').length > 0) {
-		let xhr = new XMLHttpRequest();
+		const xhr = new XMLHttpRequest();
 		xhr.open('HEAD', '/');
 		xhr.onload = () => {
-			let srvtime = Date.parse(xhr.getResponseHeader('Date'));
+			const srvtime = Date.parse(xhr.getResponseHeader('Date'));
 			offset = Math.ceil((srvtime - Date.now()) / 1000);
 			console.log("Offset from server: " + offset);
 		};
diff --git a/js/90-tracker.js b/js/90-tracker.js
index cf46aeb..b7f5e57 100644
--- a/js/90-tracker.js
+++ b/js/90-tracker.js
@@ -12,12 +12,12 @@ function clean_tracker(){
 let tracker;
 
 function update_tracker(){
-	let data = localStorage.getItem('tracker_data');
-	let user = localStorage.getItem('tracker_username');
-	if(!data)
+	if(!localStorage.getItem('tracker_data'))
 		return;
-	data = JSON.parse(data);
-	let contests = {}, solved = {}, attempted = {}, solvednr = 0, attemptednr = 0;
+	const data = JSON.parse(localStorage.getItem('tracker_data'));
+	const user = localStorage.getItem('tracker_username');
+	const contests = {}, solved = {}, attempted = {};
+	let solvednr = 0, attemptednr = 0;
 	data.problems.forEach(e => {
 		if(e.solved) {
 			solved[e.problem] = 1;
@@ -39,7 +39,7 @@ function update_tracker(){
 
 	if(location.pathname == '/pb/')
 		$('table .name a').each(el => {
-			let id = el.getAttribute('href').split('?', 2)[0];
+			const id = el.getAttribute('href').split('?', 2)[0];
 			if(solved[id])
 				el.insertAdjacentHTML('beforebegin', TICK);
 			else if(attempted[id])
@@ -48,17 +48,17 @@ function update_tracker(){
 
 	if(location.pathname == '/ct/')
 		$('table .name a').each(el => {
-			let id = el.getAttribute('href').substr(4);
+			const id = el.getAttribute('href').substr(4);
 			if(contests[id])
 				el.insertAdjacentHTML('beforebegin', TICK);
 		});
 
 	if(location.pathname == '/log/')
 		$('table tbody tr').each(el => {
-			let owner = el.querySelector('.owner a');
+			const owner = el.querySelector('.owner a');
 			if(!owner || owner.getAttribute('href') != '/us/' + user)
 				return;
-			var state = el.getElementsByClassName('r0').length ? TICK : XMARK;
+			const state = el.getElementsByClassName('r0').length ? TICK : XMARK;
 			el.getElementsByClassName('id')[0].innerHTML += state;
 		});
 
@@ -77,14 +77,14 @@ function start_tracking(user){
 	$('#tracker_userlink')[0].innerHTML = user;
 	tracker.classList.remove('hidden');
 	update_tracker();
-	var lastfetch = localStorage.getItem('tracker_lastfetch');
+	const lastfetch = localStorage.getItem('tracker_lastfetch');
 	if(Date.now() - lastfetch > 60 * 10 * 1000)
 		refresh_tracker();
 }
 
 function refresh_tracker(){
-	var user = localStorage.getItem('tracker_username');
-	var xhr = new XMLHttpRequest();
+	const user = localStorage.getItem('tracker_username');
+	const xhr = new XMLHttpRequest();
 	xhr.open('GET', '/us/' + user + '?format=json');
 	xhr.onload = () => {
 		localStorage.setItem('tracker_data', xhr.responseText);
@@ -104,7 +104,7 @@ function stop_tracking(){
 
 $(function(){
 	tracker = m('<div id="tracker" class="hidden">Tracking <a id="tracker_userlink"></a>.<br><a id="tracker_stop" role="button">Stop tracking</a><br><a id="tracker_log">Job log</a><dl class="dl-horizontal"><dt>Solved</dt>    <dd id="tracker_solved">?</dd><dt>Attempted</dt> <dd id="tracker_attempted">?</dd><dt>Contests</dt>  <dd id="tracker_contests">?</dd></dl></div>');
-	var sidebar = $('#sidebar')[0];
+	const sidebar = $('#sidebar')[0];
 	sidebar.insertBefore(tracker, sidebar.firstChild);
 	$('#tracker_stop').on('click', stop_tracking);
 	$('#track_user').on('click', function() { stop_tracking(); start_tracking(this.dataset.user) });
diff --git a/js/95-login.js b/js/95-login.js
index d08150a..aad77d3 100644
--- a/js/95-login.js
+++ b/js/95-login.js
@@ -1,15 +1,15 @@
 $(function(){
-	var sidebar = $('#sidebar')[0];
-	var login = document.createElement('div');
+	const sidebar = $('#sidebar')[0];
+	const login = document.createElement('div');
 	login.innerHTML = '<a role="button" id="login" class="show">Log in</a>';
 	sidebar.insertBefore(login, sidebar.firstChild);
 	$('#login').on('click', e => {
-		var xhr = new XMLHttpRequest();
+		const xhr = new XMLHttpRequest();
 		xhr.open('GET', '/login');
 		xhr.onload = () => {
 			if(xhr.status != 200)
 				return;
-			var username = xhr.responseText;
+			const username = xhr.responseText;
 			sessionStorage.setItem('login_username', username);
 			start_tracking(username);
 			login.innerHTML = 'Probably logged in as ' + username;
@@ -18,7 +18,7 @@ $(function(){
 		return false;
 	});
 
-	var username = sessionStorage.getItem('login_username');
+	const username = sessionStorage.getItem('login_username');
 	if(username)
 		login.innerHTML = 'Probably logged in as ' + username;
 });