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

Fix tags area component active

Browse Source
This commit is contained in:
Mo Bitar
2018-01-26 13:05:03 -06:00
parent 457eb6f043
commit 04060a3dc3
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/app/controllers/tags.js
View File

@@ -62,7 +62,6 @@ angular.module('app')
componentManager.registerHandler({identifier: "tags", areas: ["tags-list"], activationHandler: function(component){ componentManager.registerHandler({identifier: "tags", areas: ["tags-list"], activationHandler: function(component){
this.component = component; this.component = component;
}.bind(this), contextRequestHandler: function(component){ }.bind(this), contextRequestHandler: function(component){
return null; return null;
}.bind(this), actionHandler: function(component, action, data){ }.bind(this), actionHandler: function(component, action, data){

2
app/assets/javascripts/app/services/componentManager.js
View File

@@ -376,7 +376,7 @@ class ComponentManager {
for(let handler of this.handlersForArea(component.area)) { for(let handler of this.handlersForArea(component.area)) {
if(handler.contextRequestHandler) { if(handler.contextRequestHandler) {
var itemInContext = handler.contextRequestHandler(component); var itemInContext = handler.contextRequestHandler(component);
if(itemInContext.uuid == item.uuid) { if(itemInContext && itemInContext.uuid == item.uuid) {
return true; return true;
} }
} }

2
app/assets/templates/tags.html.haml
View File

@@ -1,5 +1,5 @@
.section.tags#tags-column .section.tags#tags-column
.component-view-container{"ng-if" => "ctrl.component"} .component-view-container{"ng-if" => "ctrl.component.active"}
%component-view.component-view{"component" => "ctrl.component"} %component-view.component-view{"component" => "ctrl.component"}
#tags-content.content{"ng-if" => "!(ctrl.component && ctrl.component.active)"} #tags-content.content{"ng-if" => "!(ctrl.component && ctrl.component.active)"}
#tags-title-bar.section-title-bar #tags-title-bar.section-title-bar