From dd494e648a5c05dc0eba2e8a82f9f81bf43e5188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 26 May 2016 07:45:53 +0200
Subject: [PATCH] fix(rendering): fixed issue with phantomjs panel rendering

---
 public/app/features/panel/partials/soloPanel.html | 12 ++++--------
 vendor/phantomjs/render.js                        |  4 +++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/app/features/panel/partials/soloPanel.html b/public/app/features/panel/partials/soloPanel.html
index e76ad724343..131d99d4389 100644
--- a/public/app/features/panel/partials/soloPanel.html
+++ b/public/app/features/panel/partials/soloPanel.html
@@ -1,9 +1,5 @@
-<div class="main">
-	<div class="row-fluid">
-		<div class="span12">
-			<div class="panel nospace" ng-if="panel" style="width: 100%">
-				<plugin-component type="panel">
-				</plugin-component>
-			</div>
-		</div>
+<div class="panel nospace" ng-if="panel" style="width: 100%">
+	<plugin-component type="panel">
+	</plugin-component>
 </div>
+<div class="clearfix"></div>
diff --git a/vendor/phantomjs/render.js b/vendor/phantomjs/render.js
index 0de97273c5c..f40a42380ad 100644
--- a/vendor/phantomjs/render.js
+++ b/vendor/phantomjs/render.js
@@ -39,7 +39,8 @@
       var canvas = page.evaluate(function() {
         if (!window.angular) { return false; }
         var body = window.angular.element(document.body);
-        if (!body.scope) { return false; }
+        if (!body.injector) { return false; }
+        if (!body.injector()) { return false; }
 
         var rootScope = body.injector().get('$rootScope');
         if (!rootScope) {return false;}
@@ -59,6 +60,7 @@
           width:  bb.width,
           height: bb.height
         };
+
         page.render(params.png);
         phantom.exit();
       }