Browse Source

Fix Close current tab
Added tab loaded css

causefx 8 years ago
parent
commit
47c109d2b7
3 changed files with 12 additions and 3 deletions
  1. 0 0
      css/dark.css
  2. 4 0
      css/organizr.css
  3. 8 3
      js/functions.js

File diff suppressed because it is too large
+ 0 - 0
css/dark.css


+ 4 - 0
css/organizr.css

@@ -162,3 +162,7 @@ object-fit: contain;
   -webkit-transition: all .4s ease-in-out;
   -webkit-transition: all .4s ease-in-out;
   transition: all .4s ease-in-out;
   transition: all .4s ease-in-out;
 }
 }
+.tabLoaded {
+  -webkit-filter: drop-shadow(0px 0px 5px #2cabe4);
+  filter: drop-shadow(0px 0px 5px #2cabe4);
+}

+ 8 - 3
js/functions.js

@@ -255,6 +255,7 @@ function switchTab(tab, type){
 			}else{
 			}else{
 				$("#preloader").fadeIn();
 				$("#preloader").fadeIn();
 				console.log('Tab Function: Loading new tab for: '+tab);
 				console.log('Tab Function: Loading new tab for: '+tab);
+				$('#menu-'+tab+' a').children().addClass('tabLoaded');
 				newTab.addClass("show loaded").removeClass('hidden');
 				newTab.addClass("show loaded").removeClass('hidden');
 				loadInternal(tabURL,cleanClass(tab));
 				loadInternal(tabURL,cleanClass(tab));
 				$("#preloader").fadeOut();
 				$("#preloader").fadeOut();
@@ -273,6 +274,7 @@ function switchTab(tab, type){
 			}else{
 			}else{
 				$("#preloader").fadeIn();
 				$("#preloader").fadeIn();
 				console.log('Tab Function: Loading new tab for: '+tab);
 				console.log('Tab Function: Loading new tab for: '+tab);
+				$('#menu-'+tab+' a').children().addClass('tabLoaded');
 				newTab.addClass("show loaded").removeClass('hidden');
 				newTab.addClass("show loaded").removeClass('hidden');
 				$(buildFrame(tab,tabURL)).appendTo(newTab);
 				$(buildFrame(tab,tabURL)).appendTo(newTab);
 				$("#preloader").fadeOut();
 				$("#preloader").fadeOut();
@@ -385,9 +387,9 @@ function reloadCurrentTab(){
 	$("#preloader").fadeOut();
 	$("#preloader").fadeOut();
 }
 }
 function loadNextTab(){
 function loadNextTab(){
-	var next = $('.iFrame-listing').find('.loaded').attr('data-name');
+	var next = $('#page-wrapper').find('.loaded').attr('data-name');
 	if (typeof next !== 'undefined') {
 	if (typeof next !== 'undefined') {
-		var type = $('.iFrame-listing').find('.loaded').attr('data-type');
+		var type = $('#page-wrapper').find('.loaded').attr('data-type');
 		switchTab(next,type);
 		switchTab(next,type);
 	}else{
 	}else{
 		console.log("Tab Function: No Available Tab to open");
 		console.log("Tab Function: No Available Tab to open");
@@ -410,6 +412,8 @@ function closeCurrentTab(){
 			var tab = $('.internal-listing').find('.show').attr('data-name');
 			var tab = $('.internal-listing').find('.show').attr('data-name');
 			console.log('Tab Function: Closing tab: '+tab);
 			console.log('Tab Function: Closing tab: '+tab);
 			$('#internal-'+cleanClass(tab)).html('');
 			$('#internal-'+cleanClass(tab)).html('');
+			$('#menu-'+cleanClass(tab)+' a').removeClass("active");
+			$('#menu-'+tab+' a').children().removeClass('tabLoaded');
 			$('#internal-'+cleanClass(tab)).removeClass("loaded show");
 			$('#internal-'+cleanClass(tab)).removeClass("loaded show");
 			$('#menu-'+cleanClass(tab)).removeClass("active");
 			$('#menu-'+cleanClass(tab)).removeClass("active");
 			loadNextTab();
 			loadNextTab();
@@ -419,7 +423,8 @@ function closeCurrentTab(){
 		case 'iframe':
 		case 'iframe':
 			var tab = $('.iFrame-listing').find('.show').children('iframe').attr('data-name');
 			var tab = $('.iFrame-listing').find('.show').children('iframe').attr('data-name');
 			console.log('Tab Function: Closing tab: '+tab);
 			console.log('Tab Function: Closing tab: '+tab);
-			$('#menu-'+cleanClass(tab)).removeClass("active");
+			$('#menu-'+cleanClass(tab)+' a').removeClass("active");
+			$('#menu-'+tab+' a').children().removeClass('tabLoaded');
 			$('#container-'+cleanClass(tab)).removeClass("loaded show");
 			$('#container-'+cleanClass(tab)).removeClass("loaded show");
 			$('#frame-'+cleanClass(tab)).remove();
 			$('#frame-'+cleanClass(tab)).remove();
 			loadNextTab();
 			loadNextTab();

Some files were not shown because too many files changed in this diff