From d6f1c379c0a2ccfd9032041b01a73b13911dbd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 23 Sep 2014 22:30:01 +0200
Subject: [PATCH] fixed text editor & scope issue

---
 src/app/directives/panelMenu.js |  2 +-
 src/app/services/panelSrv.js    | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/app/directives/panelMenu.js b/src/app/directives/panelMenu.js
index 6f8411c7965..d0ee044c571 100644
--- a/src/app/directives/panelMenu.js
+++ b/src/app/directives/panelMenu.js
@@ -53,7 +53,6 @@ function (angular, $, _) {
         link: function($scope, elem) {
           var $link = $(linkTemplate);
           var $panelContainer = elem.parents(".panel-container");
-          var menuTemplate = createMenuTemplate($scope);
           var menuWidth = 246;
           var menuScope = null;
           var timeout = null;
@@ -106,6 +105,7 @@ function (angular, $, _) {
               menuLeftPos = 0;
             }
 
+            var menuTemplate = createMenuTemplate($scope);
             $menu = $(menuTemplate);
             $menu.css('left', menuLeftPos);
             $menu.mouseleave(function() {
diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js
index fed5073e38f..e526b937336 100644
--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
@@ -20,13 +20,8 @@ function (angular, _) {
         },
         {
           text: 'edit',
-          editorLink: "app/partials/paneleditor.html",
-          condition: !$scope.panelMeta.fullscreenEdit
-        },
-        {
-          text: 'edit',
-          click: "toggleFullscreen(true)",
-          condition: $scope.panelMeta.fullscreenEdit
+          click: 'editPanel()',
+          condition: true,
         },
         {
           text: 'duplicate',
@@ -66,6 +61,15 @@ function (angular, _) {
       $scope.inspector = {};
       $scope.panelMeta.menu = _.where(menu, { condition: true });
 
+      $scope.editPanel = function() {
+        if ($scope.panelMeta.fullscreenEdit) {
+          $scope.toggleFullscreen(true);
+        }
+        else {
+          $scope.emitAppEvent('show-dash-editor', { src: 'app/partials/paneleditor.html', scope: $scope });
+        }
+      };
+
       $scope.editPanelJson = function() {
         $scope.emitAppEvent('show-json-editor', { object: $scope.panel, updateHandler: $scope.replacePanel });
       };