BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the way of how we iterate through captions' collection

Browse Source
This commit is contained in:
Oleksandr Zhurbenko 2016-08-08 14:45:09 -07:00
parent d51d0ed3c5
commit 10272d5317
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-html5/imports/api/captions/server/modifiers/addCaptionsToCollection.js
View File

@ -17,7 +17,14 @@ export function addCaptionsToCollection(meetingId, locale, captionHistory) {
}
let i;
let next;
for (i = 0; i < captions.length; i++) {
if (i < captions.length - 1) {
next = i + 1;
} else {
next = undefined;
}
const entry = {
meetingId: meetingId,
locale: locale,
@ -27,6 +34,7 @@ export function addCaptionsToCollection(meetingId, locale, captionHistory) {
captions: captions[i],
index: i,
length: captions[i].length,
next: next,
},
};
Captions.insert(entry);

51
bigbluebutton-html5/imports/ui/components/closed-captions/service.js
View File

@ -11,30 +11,39 @@ let getCCData = () => {
'captionHistory.index': 1,
},
}).fetch();
let locales = [];
console.log(captionObj);
//associative array that keeps locales with arrays of string objects related to those locales
let captions = [];
captionObj.forEach(function (obj) {
if (locales.indexOf(obj.locale) > -1) {
captions[obj.locale].captions.push(
{
captions: obj.captionHistory.captions,
index: obj.captionHistory.index,
}
);
} else {
captions[obj.locale] = {
ownerId: obj.captionHistory.ownerId ? obj.captionHistory.ownerId : null,
captions: [
//to keep track of locales in the captions[]
let locales = [];
if (captionObj != null) {
let current = captionObj[0];
while (current != null) {
if (locales.indexOf(current.locale) > -1) {
captions[current.locale].captions.push(
{
captions: obj.captionHistory.captions,
index: obj.captionHistory.index,
},
],
};
locales.push(obj.locale);
captions: current.captionHistory.captions,
index: current.captionHistory.index,
}
);
} else {
captions[current.locale] = {
ownerId: current.captionHistory.ownerId ? current.captionHistory.ownerId : null,
captions: [
{
captions: current.captionHistory.captions,
index: current.captionHistory.index,
},
],
};
locales.push(current.locale);
}
current = captionObj[current.captionHistory.next];
}
});
}
return {
captions: captions,