Merge pull request #2766 from capilkey/misc-client-changes-100

Misc client changes 100

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala

@@ -18,8 +18,9 @@ object PollFactory {
 
   private def processYesNoPollType(qType: String): Question = {
     val answers = new Array[Answer](2)
-    answers(0) = new Answer(0, "No", Some("No"))
+
-    answers(1) = new Answer(1, "Yes", Some("Yes"))
+    answers(0) = new Answer(0, "Yes", Some("Yes"))
+    answers(1) = new Answer(1, "No", Some("No"))
 
     new Question(0, PollType.YesNoPollType, false, None, answers)
   }
@@ -27,8 +28,8 @@ object PollFactory {
   private def processTrueFalsePollType(qType: String): Question = {
     val answers = new Array[Answer](2)
 
-    answers(0) = new Answer(0, "False", Some("False"))
+    answers(0) = new Answer(0, "True", Some("True"))
-    answers(1) = new Answer(1, "True", Some("True"))
+    answers(1) = new Answer(1, "False", Some("False"))
 
     new Question(0, PollType.TrueFalsePollType, false, None, answers)
   }

bigbluebutton-client/resources/prod/profiles.xml

@@ -45,4 +45,19 @@
         <h264Level>2.1</h264Level>
         <h264Profile>main</h264Profile>
     </profile>
+    <profile id="wide">
+        <locale>
+            <en_US>Widescreen</en_US>
+            <pt_BR>Widescreen</pt_BR>
+        </locale>
+        <width>1280</width>
+        <height>720</height>
+        <keyFrameInterval>5</keyFrameInterval>
+        <modeFps>15</modeFps>
+        <qualityBandwidth>0</qualityBandwidth>
+        <qualityPicture>90</qualityPicture>
+        <enableH264>true</enableH264>
+        <h264Level>2.1</h264Level>
+        <h264Profile>main</h264Profile>
+    </profile>
 </profiles>

bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as

@@ -149,7 +149,7 @@ package org.bigbluebutton.main.model.users
 		}
 		
 		public function get hasEmojiStatus():Boolean {
-			return _emojiStatus != "none" && _emojiStatus != "null";
+			return _emojiStatus != null && _emojiStatus != "none" && _emojiStatus != "null";
 		}
 		
 		private var _role:String = Role.VIEWER;

bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml

@@ -579,7 +579,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		var pollRegex:RegExp = /^@poll\s+?(.+)\s*?$/;
 		var matchedArray:Array = message.match(pollRegex);
 		
-		if (pollRegex.test(message)) {
+		if (UsersUtil.amIPresenter() && pollRegex.test(message)) {
 			var tmpAnswers: Array = matchedArray[1].split(",");
 			var answers:Array = new Array();
 			for (var i:int = 0; i < tmpAnswers.length; i++) {

bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as

@@ -79,7 +79,6 @@ package org.bigbluebutton.modules.polling.service
           for (var j:int = 0; j < answers.length; j++) {
             var a:Object = answers[j];
             ans.push(new SimpleAnswerResult(a.id as Number, a.key, a.num_votes as Number));
-            accessibleAnswers += ResourceUtil.getInstance().getString("bbb.polling.results.accessible.answer", [ResourceUtil.getInstance().getString("bbb.polling.answer."+a.key), a.num_votes]) + "<br />";
           }
           
 		  var numRespondents:Number = poll.num_respondents;
@@ -88,6 +87,15 @@ package org.bigbluebutton.modules.polling.service
           dispatcher.dispatchEvent(new PollShowResultEvent(new SimplePollResult(pollId, ans, numRespondents, numResponders)));
           
           if (Accessibility.active) {
+            for (var k:int = 0; k < answers.length; k++) {
+              var localizedKey: String = ResourceUtil.getInstance().getString('bbb.polling.answer.'+answers[k].key);
+              
+              if (localizedKey == null || localizedKey == "" || localizedKey == "undefined") {
+                localizedKey = answers[k].key;
+              } 
+              accessibleAnswers += ResourceUtil.getInstance().getString("bbb.polling.results.accessible.answer", [localizedKey, a.num_votes]) + "<br />";
+            }
+            
             var pollResultMessage:ChatMessageVO = new ChatMessageVO();
             pollResultMessage.chatType = ChatConstants.PUBLIC_CHAT;
             pollResultMessage.fromUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage");

bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml

@@ -743,7 +743,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 							voteBtn.addEventListener(MouseEvent.CLICK, voteButtonClickHandler);
 							pollVoteBox.addChild(voteBtn);
 					}
-					noticeSound.play();
+					
+					var tSC:SoundChannel = noticeSound.play(0, 0, new SoundTransform(0.25));
 				}
 			}