diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala
index 599d5ee22d..7082e483ee 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala
+++ b/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(1) = new Answer(1, "True", Some("True"))
+ answers(0) = new Answer(0, "True", Some("True"))
+ answers(1) = new Answer(1, "False", Some("False"))
new Question(0, PollType.TrueFalsePollType, false, None, answers)
}
diff --git a/bigbluebutton-client/resources/prod/profiles.xml b/bigbluebutton-client/resources/prod/profiles.xml
old mode 100644
new mode 100755
index 825ed1b99d..2a5cdb765b
--- a/bigbluebutton-client/resources/prod/profiles.xml
+++ b/bigbluebutton-client/resources/prod/profiles.xml
@@ -45,4 +45,19 @@
2.1
main
+
+
+ Widescreen
+ Widescreen
+
+ 1280
+ 720
+ 5
+ 15
+ 0
+ 90
+ true
+ 2.1
+ main
+
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
old mode 100644
new mode 100755
index 1cb78f8bd6..c7cf8c42a9
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
+++ b/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;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
index 06831f4dee..5ffbe53d08 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -579,7 +579,7 @@ with BigBlueButton; if not, see .
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++) {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as
old mode 100644
new mode 100755
index 9540f13e21..fcf2f73ca2
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as
+++ b/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]) + "
";
}
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]) + "
";
+ }
+
var pollResultMessage:ChatMessageVO = new ChatMessageVO();
pollResultMessage.chatType = ChatConstants.PUBLIC_CHAT;
pollResultMessage.fromUserID = ResourceUtil.getInstance().getString("bbb.chat.chatMessage.systemMessage");
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 47640819d5..3e87851bc6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -743,7 +743,8 @@ with BigBlueButton; if not, see .
voteBtn.addEventListener(MouseEvent.CLICK, voteButtonClickHandler);
pollVoteBox.addChild(voteBtn);
}
- noticeSound.play();
+
+ var tSC:SoundChannel = noticeSound.play(0, 0, new SoundTransform(0.25));
}
}