From befb4bc1c102a62eaad9b4980e54cd4067078c2a Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 14 Feb 2015 17:13:21 +0100
Subject: Fixed a few errors in the browser special meta tags objects

---
 cmd/mist/assets/qml/views/browser.qml | 58 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

(limited to 'cmd/mist')

diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml
index 3cbabf0b6..ac160e2b1 100644
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@@ -334,16 +334,16 @@ Rectangle {
 			}
 			z: 10
 
-   Timer {
-       interval: 500; running: true; repeat: true
-       onTriggered: {
-           webview.runJavaScript("document.querySelector('meta[name=badge]').getAttribute('content')", function(badge) {
-               if (badge) {
-                   menuItem.secondaryTitle = badge;
-               }
-           });
-        }
-   }
+			Timer {
+				interval: 500; running: true; repeat: true
+				onTriggered: {
+					webview.runJavaScript("try{document.querySelector('meta[name=badge]').getAttribute('content')}catch(e){}", function(badge) {
+						if (badge) {
+							menuItem.secondaryTitle = badge;
+						}
+					});
+				}
+			}
 			
 			onLoadingChanged: {
 				if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
@@ -351,31 +351,27 @@ Rectangle {
 						menuItem.title = pageTitle;	
 					});
 
+					webView.runJavaScript("try{document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")}catch(e){}", function(topBarStyle){
+						if (!topBarStyle) return;
 
-					//var topBarStyle
-					webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
 						if (topBarStyle=="transparent") {
-
 							// Adjust for a transparent sidebar Dapp
-                            navBarBackground.visible = false;
-                            back.visible = false;
-                            appInfoPane.anchors.leftMargin = -16;
-                            appInfoPaneShadow.anchors.leftMargin = -16;
-                            webview.anchors.topMargin = -74;
+							navBarBackground.visible = false;
+							back.visible = false;
+							appInfoPane.anchors.leftMargin = -16;
+							appInfoPaneShadow.anchors.leftMargin = -16;
+							webview.anchors.topMargin = -74;
 							webview.runJavaScript("document.querySelector('body').classList.add('ethereum-dapp-url-bar-style-transparent')")
 
 						} else {
-                            navBarBackground.visible = true;
-                            back.visible = true;
-                            appInfoPane.anchors.leftMargin = 0;
-                            appInfoPaneShadow.anchors.leftMargin = 0;
-                            webview.anchors.topMargin = 0;
-
-                        };	
+							navBarBackground.visible = true;
+							back.visible = true;
+							appInfoPane.anchors.leftMargin = 0;
+							appInfoPaneShadow.anchors.leftMargin = 0;
+							webview.anchors.topMargin = 0;
+						};	
 					});
 
-					
-
 					webview.runJavaScript(eth.readFile("bignumber.min.js"));
 					webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
 
@@ -383,10 +379,12 @@ Rectangle {
 					var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
 					var domain = matches && matches[1];
 
-			    	appDomain.text = domain //webview.url.replace("a", "z")
-			    	appTitle.text = webview.title
+					if (domain)
+						appDomain.text = domain //webview.url.replace("a", "z")
+					if (webview.title)
+						appTitle.text = webview.title
 
-			    	showFullUrlBar(false);
+					showFullUrlBar(false);
 				}
 			}
 			onJavaScriptConsoleMessage: {
-- 
cgit v1.2.3