Merge remote-tracking branch 'upstream/develop' into account-menu-react

This commit is contained in:
VardanHakobyan
2021-06-09 11:06:42 +04:00
27 changed files with 1039 additions and 375 deletions

View File

@@ -64,6 +64,7 @@ import { MultipleSelectedNotesDirective } from './components/MultipleSelectedNot
import { NotesContextMenuDirective } from './components/NotesContextMenu';
import { NotesOptionsPanelDirective } from './components/NotesOptionsPanel';
import { IconDirective } from './components/Icon';
import { NoteTagsContainerDirective } from './components/NoteTagsContainer';
function reloadHiddenFirefoxTab(): boolean {
/**
@@ -159,7 +160,8 @@ const startApplication: StartApplication = async function startApplication(
.directive('multipleSelectedNotesPanel', MultipleSelectedNotesDirective)
.directive('notesContextMenu', NotesContextMenuDirective)
.directive('notesOptionsPanel', NotesOptionsPanelDirective)
.directive('icon', IconDirective);
.directive('icon', IconDirective)
.directive('noteTagsContainer', NoteTagsContainerDirective);
// Filters
angular.module('app').filter('trusted', ['$sce', trusted]);