diff --git a/src/styles/components/helptour.scss b/src/styles/components/helptour.scss index a4f72f9d..b71fc900 100644 --- a/src/styles/components/helptour.scss +++ b/src/styles/components/helptour.scss @@ -66,4 +66,41 @@ top: 20%; } } + .mediaAccessPane { + top: 10px; + left: initial; + right: 10px; + } +} + +.arrow+.secondArrow { + border-width: 11px; + &:after { + border-width: 10px; + content: ""; + } +} +.arrow+.secondArrow, +.arrow+.secondArrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: rgba(0, 0, 0, 0); + border-style: solid; +} +.secondArrow.right { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); + &:after { + content: " "; + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #FFF; + } } diff --git a/static/js/directives/helptour.js b/static/js/directives/helptour.js index d1ad9d07..899cb00a 100644 --- a/static/js/directives/helptour.js +++ b/static/js/directives/helptour.js @@ -24,7 +24,7 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he //helptour return [function() { - var controller = ['$scope', '$timeout', '$modal', '$rootScope', function($scope, $timeout, $modal, $rootScope) { + var controller = ['$scope', '$timeout', '$modal', '$rootScope', 'mediaStream', function($scope, $timeout, $modal, $rootScope, mediaStream) { var displayTime = 2000; var shown = localStorage.getItem('mediastream-helptour'); var timeoutAutoStepsIn = []; @@ -41,6 +41,12 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he screenshare: false, settings: false }; + var trigger = false; + menus.triggerMediaAccess = function() { + if (trigger) { + mediaStream.webrtc.testMediaAccess(function() {}); + } + }; menus.toggleRoom = function() { var scope = angular.element('#roombar .roombar').scope(); if (scope) { @@ -56,6 +62,9 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he var toggleTargetMenu = function() { var menu = $($scope.steps[$scope.currentIndex]).data('menu'); if (menu) { + if (menu.search('trigger') > -1) { + trigger = !trigger; + } menus[menu](); } }; diff --git a/static/partials/helpoverlay.html b/static/partials/helpoverlay.html index a0082897..fcaf785e 100644 --- a/static/partials/helpoverlay.html +++ b/static/partials/helpoverlay.html @@ -1,25 +1,36 @@