# HG changeset patch # User durandn # Date 1441886895 -7200 # Node ID 41a0e97a3a4ccc1149941ab35f77903d807d1db4 # Parent 42529ea40c4a60894a9bfd2262f0d0ce1f1c3fb7 Fixed "selected" not disappearing when clicking another segment on CurrentSegmentInfobox + added a selected state to AnnotationsController buttons to reflect AnnotationsList/CreateAnnotation shown/hidden state diff -r 42529ea40c4a -r 41a0e97a3a4c server/src/remie/static/remie/metadataplayer/AnnotationsController.js --- a/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Wed Sep 09 18:10:04 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Thu Sep 10 14:08:15 2015 +0200 @@ -46,13 +46,23 @@ this.writeButton_$ = this.$.find(".Ldt-AnnotationsController-ShowCreateAnnotationButton"); this.writeButton_$.click(function(){ - _this.player.trigger("CreateAnnotation.toggle"); + if (!_this.writeButton_$.hasClass("selected")){ + _this.player.trigger("CreateAnnotation.show") + } + else { + _this.player.trigger("CreateAnnotation.hide") + } if (_this.display_or_write){ _this.player.trigger("AnnotationsList.hide"); } }); this.displayButton_$.click(function(){ - _this.player.trigger("AnnotationsList.toggle"); + if (!_this.displayButton_$.hasClass("selected")){ + _this.player.trigger("AnnotationsList.show") + } + else { + _this.player.trigger("AnnotationsList.hide") + } if (_this.display_or_write){ _this.player.trigger("CreateAnnotation.hide"); } @@ -69,6 +79,19 @@ this.currentSegment = false } + this.onMdpEvent("CreateAnnotation.hide", function(){ + _this.writeButton_$.toggleClass("selected", false); + }) + this.onMdpEvent("CreateAnnotation.show", function(){ + _this.writeButton_$.toggleClass("selected", true); + }) + this.onMdpEvent("AnnotationsList.hide", function(){ + _this.displayButton_$.toggleClass("selected", false); + }) + this.onMdpEvent("AnnotationsList.show", function(){ + _this.displayButton_$.toggleClass("selected", true); + }) + if (this.starts_hidden) { this.visible = true this.hide(); @@ -118,6 +141,8 @@ if (!currentSegment && _currentSegments.length == 0){ if (this.visible){ this.hide(); + this.writeButton_$.toggleClass("selected", false); + this.displayButton_$.toggleClass("selected", false); this.player.trigger("CreateAnnotation.hide"); this.player.trigger("AnnotationsList.hide"); } @@ -125,6 +150,8 @@ else { if (!this.visible){ this.show(); + this.writeButton_$.toggleClass("selected", false); + this.displayButton_$.toggleClass("selected", false); this.player.trigger("CreateAnnotation.hide"); this.player.trigger("AnnotationsList.hide"); } diff -r 42529ea40c4a -r 41a0e97a3a4c server/src/remie/static/remie/metadataplayer/CurrentSegmentInfobox.js --- a/server/src/remie/static/remie/metadataplayer/CurrentSegmentInfobox.js Wed Sep 09 18:10:04 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/CurrentSegmentInfobox.js Thu Sep 10 14:08:15 2015 +0200 @@ -96,6 +96,7 @@ return _segment.begin.milliseconds == _segmentBegin.milliseconds && _segment.end.milliseconds == _segmentEnd.milliseconds }); if (_list.length >0){ + _this.$.toggleClass("editing", false); if (_this.currentSegment.id != _list[0].id){ _this.currentSegment = _list[0]; _data = {