From 457eb6f04349be6a68d404f7f92fc42868e52d58 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Fri, 26 Jan 2018 12:35:03 -0600
Subject: [PATCH] Submodules

---
 .../app/directives/views/componentView.js          |  2 +-
 .../javascripts/app/directives/views/editorMenu.js | 14 ++++++++++++++
 .../templates/directives/editor-menu.html.haml     |  6 ++++--
 public/extensions/extensions-manager               |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js
index df6686720..ecfa5ba14 100644
--- a/app/assets/javascripts/app/directives/views/componentView.js
+++ b/app/assets/javascripts/app/directives/views/componentView.js
@@ -89,7 +89,7 @@ class ComponentView {
 
     $scope.getUrl = function() {
       var url = componentManager.urlForComponent($scope.component);
-      $scope.component.runningLocally = url !== ($scope.component.url || $scope.component.hosted_url);
+      $scope.component.runningLocally = (url !== $scope.component.url) && url !== ($scope.component.hosted_url);
       return url;
     }
 
diff --git a/app/assets/javascripts/app/directives/views/editorMenu.js b/app/assets/javascripts/app/directives/views/editorMenu.js
index 21fdb6f89..16ae8f6dc 100644
--- a/app/assets/javascripts/app/directives/views/editorMenu.js
+++ b/app/assets/javascripts/app/directives/views/editorMenu.js
@@ -66,6 +66,20 @@ class EditorMenu {
       $scope.defaultEditor = null;
     }
 
+    $scope.shouldDisplayRunningLocallyLabel = function(component) {
+      if(!component.runningLocally) {
+        return false;
+      }
+
+      if(component == $scope.selectedEditor) {
+        return true;
+      } else if(component.area == "editor-stack") {
+        return $scope.stackComponentEnabled(component);
+      } else {
+        return false;
+      }
+    }
+
     $scope.stackComponentEnabled = function(component) {
       return component.active && !component.isExplicitlyDisabledForItem($scope.currentItem);
     }
diff --git a/app/assets/templates/directives/editor-menu.html.haml b/app/assets/templates/directives/editor-menu.html.haml
index 5325256c9..6787ab986 100644
--- a/app/assets/templates/directives/editor-menu.html.haml
+++ b/app/assets/templates/directives/editor-menu.html.haml
@@ -9,8 +9,9 @@
       "circle" => "selectedEditor === editor && 'success'",
        "has-button" => "selectedEditor == editor || defaultEditor == editor", "button-text" => "defaultEditor == editor ? 'Undefault' : 'Set Default'",
        "button-action" => "toggleDefaultForEditor(editor)", "button-class" => "defaultEditor == editor ? 'warning' : 'info'"}
-        .column{"ng-if" => "component.conflict_of"}
+        .column{"ng-if" => "component.conflict_of || shouldDisplayRunningLocallyLabel(editor)"}
           %strong.red.medium{"ng-if" => "editor.conflict_of"} Conflicted copy
+          .sublabel{"ng-if" => "shouldDisplayRunningLocallyLabel(editor)"} Running Locally
 
       %a.no-decoration{"ng-if" => "editors.length == 0", "href" => "https://standardnotes.org/extensions", "target" => "blank"}
         %menu-row{"title" => "'Download More Editors'"}
@@ -20,5 +21,6 @@
         %h4.title Editor Stack
       %menu-row{"ng-repeat" => "component in stack", "ng-click" => "selectComponent($event, component)", "title" => "component.name",
       "circle" => "stackComponentEnabled(component) ? 'success' : 'danger'"}
-        .column{"ng-if" => "component.conflict_of"}
+        .column{"ng-if" => "component.conflict_of || shouldDisplayRunningLocallyLabel(component)"}
           %strong.red.medium{"ng-if" => "component.conflict_of"} Conflicted copy
+          .sublabel{"ng-if" => "shouldDisplayRunningLocallyLabel(component)"} Running Locally
diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager
index 87b260800..d0f467cf4 160000
--- a/public/extensions/extensions-manager
+++ b/public/extensions/extensions-manager
@@ -1 +1 @@
-Subproject commit 87b26080032d4df427015e49396895f506501bc9
+Subproject commit d0f467cf4424f11d4c5972284fe6af66a862e012