From ac46fefaa3b9315fd6b28e6c2e1baf3fef724086 Mon Sep 17 00:00:00 2001
From: harukin <harukin0731@gmail.com>
Date: Fri, 16 Nov 2018 20:43:55 +0900
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=83=9C=E3=82=BF=E3=83=B3?=
 =?UTF-8?q?=E3=81=AE=E5=8B=95=E4=BD=9C=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/theme/plusfuture/js/plusfuture.js | 69 ++++++++++++++++----------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js
index 7fa32a0..63d765e 100644
--- a/view/theme/plusfuture/js/plusfuture.js
+++ b/view/theme/plusfuture/js/plusfuture.js
@@ -2,22 +2,22 @@
  * plusfuture theme specific JavaScript
  */
 
-$(document).ready(function() {
+$(document).ready(function () {
 
 	// CSS3 calc() fallback (for unsupported browsers)
 	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
-	if( $('#css3-calc').width() == 10) {
-		$(window).resize(function() {
-			if($(window).width() < 992) {
-				$('main').css('width', $(window).width() + $('aside').outerWidth() );
+	if ($('#css3-calc').width() == 10) {
+		$(window).resize(function () {
+			if ($(window).width() < 992) {
+				$('main').css('width', $(window).width() + $('aside').outerWidth());
 			} else {
-				$('main').css('width', '100%' );
+				$('main').css('width', '100%');
 			}
 		});
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-	if($(window).width() >= 992) {
+	if ($(window).width() >= 992) {
 		$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
 			parent: 'main',
@@ -27,16 +27,16 @@ $(document).ready(function() {
 
 	$('#expand-aside').on('click', toggleAside);
 
-	$('section').on('click', function() {
-		if($('main').hasClass('region_1-on')){
+	$('section').on('click', function () {
+		if ($('main').hasClass('region_1-on')) {
 			toggleAside();
 		}
 	});
 
 	var left_aside_height = $('#left_aside_wrapper').height();
 
-	$('#left_aside_wrapper').on('click', function() {
-		if(left_aside_height != $('#left_aside_wrapper').height()) {
+	$('#left_aside_wrapper').on('click', function () {
+		if (left_aside_height != $('#left_aside_wrapper').height()) {
 			$(document.body).trigger("sticky_kit:recalc");
 			left_aside_height = $('#left_aside_wrapper').height();
 		}
@@ -45,29 +45,29 @@ $(document).ready(function() {
 
 	var right_aside_height = $('#right_aside_wrapper').height();
 
-	$('#right_aside_wrapper').on('click', function() {
-		if(right_aside_height != $('#right_aside_wrapper').height()) {
+	$('#right_aside_wrapper').on('click', function () {
+		if (right_aside_height != $('#right_aside_wrapper').height()) {
 			$(document.body).trigger("sticky_kit:recalc");
 			right_aside_height = $('#right_aside_wrapper').height();
 		}
 	});
 
-	$('.usermenu').click(function() {
-		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
+	$('.usermenu').click(function () {
+		if ($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')) {
 			$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
 		}
 	});
 
-	$('#menu-btn').click(function() {
-		if($('#navbar-collapse-1').hasClass('show')){
+	$('#menu-btn').click(function () {
+		if ($('#navbar-collapse-1').hasClass('show')) {
 			$('#navbar-collapse-1').removeClass('show');
 		}
 	});
 
-	$('.notifications-btn').click(function(e) {
+	$('.notifications-btn').click(function (e) {
 		e.preventDefault();
 		e.stopPropagation();
-		if($('#navbar-collapse-2').hasClass('show')){
+		if ($('#navbar-collapse-2').hasClass('show')) {
 			$('#navbar-collapse-2').removeClass('show');
 		}
 	});
@@ -76,7 +76,7 @@ $(document).ready(function() {
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
 
-	$('a.disabled').click(function(e) {
+	$('a.disabled').click(function (e) {
 		e.preventDefault();
 		e.stopPropagation();
 	});
@@ -84,20 +84,20 @@ $(document).ready(function() {
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');
-		if(notifyUpdateElem !== null) { 
-			if(notifyUpdateElem.innerHTML !== "")
+		if (notifyUpdateElem !== null) {
+			if (notifyUpdateElem.innerHTML !== "")
 				document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
 			else
 				document.title = doctitle;
 		}
 	}
-	setInterval(function () {checkNotify();}, 10 * 1000);
+	setInterval(function () { checkNotify(); }, 10 * 1000);
 });
 
 function makeFullScreen(full) {
-	if(typeof full=='undefined' || full == true) {
+	if (typeof full == 'undefined' || full == true) {
 		$('main').addClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');
+		$('header, nav, aside, #fullscreen-btn').attr('style', 'display:none !important');
 		$('#inline-btn').show();
 	}
 	else {
@@ -110,7 +110,7 @@ function makeFullScreen(full) {
 
 function toggleAside() {
 	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-	if($('main').hasClass('region_1-on')){
+	if ($('main').hasClass('region_1-on')) {
 		$('html, body').css('overflow-x', '');
 		$('main').removeClass('region_1-on')
 		$('#overlay').remove();
@@ -126,4 +126,21 @@ function toggleAside() {
 			spacer: '#left_aside_spacer'
 		});
 	}
+	$('#notifications-btn-1');
+	if ($('main').hasClass('region_3-on')) {
+		$('html, body').css('overflow-x', '');
+		$('main').removeClass('region_3-on')
+		$('#overlay').remove();
+		$('#right_aside_wrapper').trigger("sticky_kit:detach");
+	}
+	else {
+		$('html, body').css('overflow-x', 'hidden');
+		$('main').addClass('region_3-on')
+		$('<div id="overlay"></div>').appendTo('section');
+		$('#left_aside_wrapper').stick_in_parent({
+			offset_top: $('nav').outerHeight(true) + 10,
+			parent: '#region_3',
+			spacer: '#right_aside_spacer'
+		});
+	}
 }