Shows/hides feedback button when the filmstrip is shown/hidden.

This commit is contained in:
yanas 2016-03-31 17:35:10 -05:00
parent ea9b909775
commit 67e8118d74
5 changed files with 27 additions and 17 deletions

View File

@ -142,15 +142,6 @@ a.bottomToolbarButton:hover {
color: #636363; color: #636363;
} }
.header_button_separator {
display: inline-block;
position:relative;
top: 5px;
width: 1px;
height: 20px;
background: #373737;
}
.bottom_button_separator { .bottom_button_separator {
display: inline-block; display: inline-block;
position: relative; position: relative;
@ -235,7 +226,7 @@ form {
color: rgba(255,255,255,.50); color: rgba(255,255,255,.50);
} }
div.feedbackButton { #feedbackButtonDiv {
display: none; display: none;
position: absolute; position: absolute;
background-color: rgba(0,0,0,.50); background-color: rgba(0,0,0,.50);
@ -246,7 +237,11 @@ div.feedbackButton {
left: -50px; left: -50px;
z-index: 100; z-index: 100;
overflow: hidden; overflow: hidden;
transition: all .2s ease-in-out; transition: all 2s ease-in-out;
}
#feedbackButtonDiv.hidden {
bottom: -246px;
} }
div.feedbackButton:hover { div.feedbackButton:hover {

View File

@ -506,7 +506,7 @@
background: rgba(0,0,0,.5); background: rgba(0,0,0,.5);
color: #FFF; color: #FFF;
z-index: 10000; z-index: 10000;
border-radius: 4px; border-radius: 2px;
-webkit-transition: all 2s 2s linear; -webkit-transition: all 2s 2s linear;
transition: all 2s 2s linear; transition: all 2s 2s linear;
} }

View File

@ -253,7 +253,7 @@
</div> </div>
<a id="downloadlog" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[data-content]downloadlogs" ><i class="fa fa-cloud-download"></i></a> <a id="downloadlog" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[data-content]downloadlogs" ><i class="fa fa-cloud-download"></i></a>
</div> </div>
<div class="feedbackButton"> <div id="feedbackButtonDiv">
<a id="feedbackButton" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[data-content]feedback"><i class="fa fa-heart"></i></a> <a id="feedbackButton" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[data-content]feedback"><i class="fa fa-heart"></i></a>
</div> </div>
</div> </div>

View File

@ -1,4 +1,5 @@
/* global $, APP, config, interfaceConfig */ /* global $, APP, config, interfaceConfig */
import UIEvents from "../../service/UI/UIEvents";
/* /*
* Created by Yana Stamcheva on 2/10/15. * Created by Yana Stamcheva on 2/10/15.
@ -60,6 +61,14 @@ var constructDetailedFeedbackHtml = function() {
*/ */
var feedbackWindowCallback = null; var feedbackWindowCallback = null;
/**
* Shows / hides the feedback button.
* @private
*/
function _toggleFeedbackIcon() {
$('#feedbackButtonDiv').toggleClass("hidden");
}
/** /**
* Defines all methods in connection to the Feedback window. * Defines all methods in connection to the Feedback window.
* *
@ -73,17 +82,23 @@ var Feedback = {
feedbackScore: -1, feedbackScore: -1,
/** /**
* Initialise the Feedback functionality. * Initialise the Feedback functionality.
* @param emitter the EventEmitter to associate with the Feedback.
*/ */
init: function () { init: function (emitter) {
// CallStats is the way we send feedback, so we don't have to initialise // CallStats is the way we send feedback, so we don't have to initialise
// if callstats isn't enabled. // if callstats isn't enabled.
if (!APP.conference.isCallstatsEnabled()) if (!APP.conference.isCallstatsEnabled())
return; return;
$("#feedbackButtonDiv").css("display", "block");
$("div.feedbackButton").css("display", "block");
$("#feedbackButton").click(function (event) { $("#feedbackButton").click(function (event) {
Feedback.openFeedbackWindow(); Feedback.openFeedbackWindow();
}); });
// Show / hide the feedback button whenever the film strip is
// shown / hidden.
emitter.addListener(UIEvents.TOGGLE_FILM_STRIP, function () {
_toggleFeedbackIcon();
});
}, },
/** /**
* Indicates if the feedback functionality is enabled. * Indicates if the feedback functionality is enabled.

View File

@ -252,7 +252,7 @@ UI.initConference = function () {
Toolbar.checkAutoEnableDesktopSharing(); Toolbar.checkAutoEnableDesktopSharing();
if(!interfaceConfig.filmStripOnly) { if(!interfaceConfig.filmStripOnly) {
Feedback.init(); Feedback.init(eventEmitter);
} }
// FollowMe attempts to copy certain aspects of the moderator's UI into the // FollowMe attempts to copy certain aspects of the moderator's UI into the