diff options
| -rw-r--r-- | web-ui/app/index.html | 10 | ||||
| -rw-r--r-- | web-ui/app/js/tags/ui/tag_list.js | 3 | ||||
| -rw-r--r-- | web-ui/test/spec/tags/ui/tag_list.spec.js | 16 |
3 files changed, 0 insertions, 29 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 84d70a2a..a60fbb61 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -40,16 +40,6 @@ <a class="left-off-canvas-toggle" href="#"> <i class=" toggle fa fa-navicon"></i> </a> - <ul id="tags-shortcuts" class="shortcuts"> - </ul> - <ul id="custom-tags-shortcuts" class="shortcuts"> - <li> - <a class="left-off-canvas-toggle" href="#"><i class="fa fa-tags"></i><div class="shortcut-label">Tags</div></a> - </li> - </ul> - <ul id="logout-shortcut" class="shortcuts"> - </ul> - <a class="exit-off-canvas"></a> </div> <article id='middle-pane-container' class="small-5 medium-5 large-5 columns no-padding"> diff --git a/web-ui/app/js/tags/ui/tag_list.js b/web-ui/app/js/tags/ui/tag_list.js index 0c483abb..c9a66722 100644 --- a/web-ui/app/js/tags/ui/tag_list.js +++ b/web-ui/app/js/tags/ui/tag_list.js @@ -63,9 +63,6 @@ define( var list = tag.default ? defaultList : customList; var tagComponent = Tag.appendedTo(list, {tag: tag, currentTag: this.getCurrentTag()}); - if (_.contains(_.keys(ORDER), tag.name)) { - tagComponent.attr.shortcut = this.renderShortcut(tag, tagComponent); - } } function resetTagList(lists) { diff --git a/web-ui/test/spec/tags/ui/tag_list.spec.js b/web-ui/test/spec/tags/ui/tag_list.spec.js index 9391a30a..f92f72af 100644 --- a/web-ui/test/spec/tags/ui/tag_list.spec.js +++ b/web-ui/test/spec/tags/ui/tag_list.spec.js @@ -80,30 +80,14 @@ describeComponent('tags/ui/tag_list', function () { expect(defaultTags).toEqual(['tag-2']); }); - it('resets the tag shortcuts when loading tags', function () { - var tagList = [tag('inbox', 1, true)]; - $(document).trigger(Pixelated.events.tags.received, {tags: tagList}); - - tagList = [tag('sent', 1, true)]; - $(document).trigger(Pixelated.events.tags.received, {tags: tagList}); - - var shortcuts = _.map($('#tags-shortcuts').find('li'), function (el) { - return $(el).text().trim(); - }); - - expect(shortcuts).toEqual(['sent']); - }); - it('sends teardown events when loading new tags', function () { var tagsTeardownCustom = spyOnEvent(this.component.select('customTagList'), Pixelated.events.tags.teardown); var tagsTeardownDefault = spyOnEvent(this.component.select('defaultTagList'), Pixelated.events.tags.teardown); - var tagsShortcutsTeardown = spyOnEvent(document, Pixelated.events.tags.shortcuts.teardown); $(document).trigger(Pixelated.events.tags.received, {tags: []}); expect(tagsTeardownCustom).toHaveBeenTriggeredOn(this.component.select('customTagList')); expect(tagsTeardownDefault).toHaveBeenTriggeredOn(this.component.select('defaultTagList')); - expect(tagsShortcutsTeardown).toHaveBeenTriggeredOn(document); }); }); }); |