From c23b7747bf0ebba2fd136179c82ba0d0ed6821f7 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Sat, 21 Jan 2017 15:41:29 -0600
Subject: [PATCH] let in for loop, dismiss menu on note change

---
 app/assets/javascripts/app/frontend/controllers/editor.js     | 2 ++
 .../app/services/directives/contextualExtensionsMenu.js       | 4 ++--
 app/assets/javascripts/app/services/extensionManager.js       | 3 +--
 app/assets/templates/frontend/header.html.haml                | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js
index 358a24aa5..ceeee3872 100644
--- a/app/assets/javascripts/app/frontend/controllers/editor.js
+++ b/app/assets/javascripts/app/frontend/controllers/editor.js
@@ -75,6 +75,8 @@ angular.module('app.frontend')
 
     this.setNote = function(note, oldNote) {
       this.editorMode = 'edit';
+      this.showExtensions = false;
+      this.showMenu = false;
 
       if(note.safeText().length == 0 && note.dummy) {
         this.focusTitle(100);
diff --git a/app/assets/javascripts/app/services/directives/contextualExtensionsMenu.js b/app/assets/javascripts/app/services/directives/contextualExtensionsMenu.js
index ae8c49e21..a0ed0e97d 100644
--- a/app/assets/javascripts/app/services/directives/contextualExtensionsMenu.js
+++ b/app/assets/javascripts/app/services/directives/contextualExtensionsMenu.js
@@ -14,8 +14,8 @@ class ContextualExtensionsMenu {
     $scope.extensions = _.map(extensionManager.extensionsInContextOfItem($scope.item), function(ext){
       return _.cloneDeep(ext);
     });
-    
-    for(var ext of $scope.extensions) {
+
+    for(let ext of $scope.extensions) {
       ext.loading = true;
       extensionManager.loadExtensionInContextOfItem(ext, $scope.item, function(scopedExtension) {
         ext.loading = false;
diff --git a/app/assets/javascripts/app/services/extensionManager.js b/app/assets/javascripts/app/services/extensionManager.js
index a4a79dc1a..4be4ecff0 100644
--- a/app/assets/javascripts/app/services/extensionManager.js
+++ b/app/assets/javascripts/app/services/extensionManager.js
@@ -78,11 +78,10 @@ class ExtensionManager {
   loadExtensionInContextOfItem(extension, item, callback) {
     this.Restangular.oneUrl(extension.url, extension.url).customGET("", {content_type: item.content_type, item_uuid: item.uuid}).then(function(response){
       var scopedExtension = new Extension(response.plain());
-      scopedExtension.url = extension.url;
       callback(scopedExtension);
     }.bind(this))
     .catch(function(response){
-      console.log("Error reloading extension", response);
+      console.log("Error loading extension", response);
       callback(null);
     })
   }
diff --git a/app/assets/templates/frontend/header.html.haml b/app/assets/templates/frontend/header.html.haml
index 31ba30548..5bdc562cb 100644
--- a/app/assets/templates/frontend/header.html.haml
+++ b/app/assets/templates/frontend/header.html.haml
@@ -139,7 +139,7 @@
                         Last run {{action.lastExecuted | appDateTime}}
                       .error{"ng-if" => "action.error"}
                         Error performing action.
-                  %a{"ng-click" => "ctrl.deleteExtension(extension)", "style" => "margin-top: 22px; display: block;"} Remove extension
+                  %a{"ng-click" => "ctrl.deleteExtension(extension)", "style" => "margin-top: 22px; display: block; text-align: center;"} Remove extension
 
               .extension-link
                 %a{"ng-click" => "ctrl.toggleExtensionForm()"} Add new extension