Merge branch 'master' of github.com:simplon-sofianeD/animustransismus

merge
yacineblr · Sep 27, 2016 · 438e6c8 · 438e6c8
2 parents 6167cf3 + 62bc702
commit 438e6c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/readme.php b/readme.php
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-Liste des prochains exercices :
-- popup
-- sidebar
-- transition
-- animation
-- transition avec un pseudo element (before, after)
-- transition simultanée entre plusieurs div 
-- chacune des divs comprenant une image photoshop
-=======
-Créer un nouveau dossier et créer un fichier index.php suivi du code ci-dessous:
 Liste des prochains exercices :
 Yacine :
 - popup

diff --git a/script.js b/script.js
@@ -57,13 +57,15 @@ var toggleButton = {
 }
 };
 document.querySelector("#active_menu").addEventListener("click", toggleButton.clickButton.bind(toggleButton));
-function changePage(param_url, param_load=null){
-	var urlInSearchBar = window.location.pathname.replace('/', '');
+function changePage(param_url, param_load){
+	var urlInSearchBar = window.location.pathname.split('/');
+		urlInSearchBar = urlInSearchBar[urlInSearchBar.length - 1];
 	var $frame = $('#frame');
-	//console.log('param_url : ', param_url);
 	var url = param_url.replace('/', '')
-	//console.log('url : ', url)
-	if ( urlInSearchBar === url && param_load === null) { console.log('Equivalent : ', urlInSearchBar + ' = ' + url); return false}
+	if ( urlInSearchBar === url && param_load == undefined) { 
+		//console.log('Equivalent : ', urlInSearchBar + ' = ' + url); 
+		return false
+	}
 	switch(url){
 
 		case'#':