From 769a7e8df0d59fef942bc313d25c117a228273ac Mon Sep 17 00:00:00 2001
From: Aris-t2 <aris-addons@gmx.net>
Date: Wed, 19 Oct 2016 02:12:55 +0200
Subject: 1.5.8.1beta3

<b>[fix(es)]</b>
- Firefox button menu & 'Web Developer' menuitem: timings
---
 xpi/content/overlay.css |  6 +-----
 xpi/content/overlay.js  | 37 ++++++++++++++++++-------------------
 xpi/install.rdf         |  2 +-
 3 files changed, 20 insertions(+), 25 deletions(-)

(limited to 'xpi')

diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
index 41eb83a..95d00d9 100644
--- a/xpi/content/overlay.css
+++ b/xpi/content/overlay.css
@@ -654,8 +654,4 @@
 	  box-shadow: unset !important;
 	  padding: unset !important;
 	  margin: unset !important;
-	}
-	
-	/*#appmenu_webDeveloper {
-	  display: none;
-	}*/
\ No newline at end of file
+	}
\ No newline at end of file
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index 8fa7964..7a26c30 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -2825,11 +2825,11 @@ classicthemerestorerjs.ctr = {
 			app_popup.addEventListener("popupshown", function onCtrTitleAppmenuPopupShown(event){
 			  if (event.target == classicthemerestorerjs.ctr.ctrGetId("appmenu-popup")) {
 			    classicthemerestorerjs.ctr.ctrGetId('ctraddon_appbutton2').setAttribute("open", "true");
+				setTimeout(function(){
 				  try {
-					setTimeout(function(){
-					  document.getElementById("appmenu_webDeveloper").appendChild(document.getElementById("menuWebDeveloperPopup"));
-					},200);
+					document.getElementById("appmenu_webDeveloper").appendChild(document.getElementById("menuWebDeveloperPopup"));
 				  } catch(e){}
+				},200);
 			  }
 			}, false);
 			
@@ -2837,11 +2837,11 @@ classicthemerestorerjs.ctr = {
 			app_popup.addEventListener("popuphidden", function onCtrTitleAppmenuPopupHidden(event){
 			  if (event.target == classicthemerestorerjs.ctr.ctrGetId("appmenu-popup")) {
 			    classicthemerestorerjs.ctr.ctrGetId('ctraddon_appbutton2').removeAttribute("open");
-				try {
-				  setTimeout(function(){
+				setTimeout(function(){
+				  try {
 					document.getElementById("webDeveloperMenu").appendChild(document.getElementById("menuWebDeveloperPopup"));
-				  },200);
-				} catch(e){}
+				  } catch(e){}
+				},200);
 			  }
 			}, false);
 
@@ -3597,8 +3597,7 @@ classicthemerestorerjs.ctr = {
   // move 'Tools' menus dev tools into application buttons popup 
   moveDevtoolsmenu: function(){
 	
-	window.addEventListener("DOMContentLoaded", function _moveDevtoolsmenu(){
-	  setTimeout(function(){
+	setTimeout(function(){
 		
 		document.getElementById("ctraddon_appbutton").addEventListener("mousedown", function() {
 
@@ -3607,29 +3606,29 @@ classicthemerestorerjs.ctr = {
 			//add attribute 'open'
 			app_popup.addEventListener("popupshown", function onCtrTitleAppmenuPopupShown(event){
 			  if (event.target == classicthemerestorerjs.ctr.ctrGetId("appmenu-popup")) {
-				try {
-				  setTimeout(function(){
+				setTimeout(function(){
+				  try {
 					document.getElementById("appmenu_webDeveloper").appendChild(document.getElementById("menuWebDeveloperPopup"));
-				  },200);
-				} catch(e){}
+				  } catch(e){}
+				},200);
 			  }
 			}, false);
 			
 			// remove attribute 'open'
 			app_popup.addEventListener("popuphidden", function onCtrTitleAppmenuPopupHidden(event){
 			  if (event.target == classicthemerestorerjs.ctr.ctrGetId("appmenu-popup")) {
-				try {
-				  setTimeout(function(){
+				setTimeout(function(){
+				  try {
 					document.getElementById("webDeveloperMenu").appendChild(document.getElementById("menuWebDeveloperPopup"));
-				  },200);
-				} catch(e){}
+				  } catch(e){}
+				},200);
 			  }
 			}, false);
 
 		}, false);
 
-	  },500);
-	},false);
+	},500);
+
   },
   
   // prevent browser from disablning CTRs reload button for no reason
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 3ac3f2e..d0f3f31 100644
--- a/xpi/install.rdf
+++ b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.5.8.1beta2</em:version>
+		<em:version>1.5.8.1beta3</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
-- 
cgit v1.2.3