rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

let in for loop, dismiss menu on note change

Browse Source
This commit is contained in:
Mo Bitar
2017-01-21 15:41:29 -06:00
parent 6f0eb66c33
commit c23b7747bf
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app/frontend/controllers/editor.js
View File

@@ -75,6 +75,8 @@ angular.module('app.frontend')
this.setNote = function(note, oldNote) { this.setNote = function(note, oldNote) {
this.editorMode = 'edit'; this.editorMode = 'edit';
this.showExtensions = false;
this.showMenu = false;
if(note.safeText().length == 0 && note.dummy) { if(note.safeText().length == 0 && note.dummy) {
this.focusTitle(100); this.focusTitle(100);

4
app/assets/javascripts/app/services/directives/contextualExtensionsMenu.js
View File

@@ -14,8 +14,8 @@ class ContextualExtensionsMenu {
$scope.extensions = _.map(extensionManager.extensionsInContextOfItem($scope.item), function(ext){ $scope.extensions = _.map(extensionManager.extensionsInContextOfItem($scope.item), function(ext){
return _.cloneDeep(ext); return _.cloneDeep(ext);
}); });
for(var ext of $scope.extensions) { for(let ext of $scope.extensions) {
ext.loading = true; ext.loading = true;
extensionManager.loadExtensionInContextOfItem(ext, $scope.item, function(scopedExtension) { extensionManager.loadExtensionInContextOfItem(ext, $scope.item, function(scopedExtension) {
ext.loading = false; ext.loading = false;

3
app/assets/javascripts/app/services/extensionManager.js
View File

@@ -78,11 +78,10 @@ class ExtensionManager {
loadExtensionInContextOfItem(extension, item, callback) { loadExtensionInContextOfItem(extension, item, callback) {
this.Restangular.oneUrl(extension.url, extension.url).customGET("", {content_type: item.content_type, item_uuid: item.uuid}).then(function(response){ 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()); var scopedExtension = new Extension(response.plain());
scopedExtension.url = extension.url;
callback(scopedExtension); callback(scopedExtension);
}.bind(this)) }.bind(this))
.catch(function(response){ .catch(function(response){
console.log("Error reloading extension", response); console.log("Error loading extension", response);
callback(null); callback(null);
}) })
} }

2
app/assets/templates/frontend/header.html.haml
View File

@@ -139,7 +139,7 @@
Last run {{action.lastExecuted | appDateTime}} Last run {{action.lastExecuted | appDateTime}}
.error{"ng-if" => "action.error"} .error{"ng-if" => "action.error"}
Error performing action. 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 .extension-link
%a{"ng-click" => "ctrl.toggleExtensionForm()"} Add new extension %a{"ng-click" => "ctrl.toggleExtensionForm()"} Add new extension