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

Removed callingLocation from BBB.getCurrentSlide

Browse Source
This commit is contained in:
Oleksandr Zhurbenko 2016-01-18 11:48:36 -08:00
parent f08f38f6d3
commit 7c56af1f16
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-html5/app/client/globals.js
View File

@ -80,7 +80,7 @@ Handlebars.registerHelper("getCurrentMeeting", () => {
Handlebars.registerHelper("getCurrentSlide", () => {
let result;
result = BBB.getCurrentSlide("helper getCurrentSlide");
result = BBB.getCurrentSlide();
// console.log "result=#{JSON.stringify result}"
return result;
});
@ -96,7 +96,7 @@ Handlebars.registerHelper("getMeetingName", () => {
Handlebars.registerHelper("getShapesForSlide", () => {
let currentSlide, ref;
currentSlide = BBB.getCurrentSlide("helper getShapesForSlide");
currentSlide = BBB.getCurrentSlide();
// try to reuse the lines above
return Meteor.Shapes.find({

3
bigbluebutton-html5/app/client/lib/bbb_api_bridge.js
View File

@ -152,7 +152,7 @@ this.BBB = (function() {
return lockedMicForRoom && BBB.amILocked();
};
BBB.getCurrentSlide = function(callingLocaton) {
BBB.getCurrentSlide = function() {
let currentPresentation, currentSlide, presentationId, ref;
currentPresentation = Meteor.Presentations.findOne({
"presentation.current": true
@ -162,7 +162,6 @@ this.BBB = (function() {
"presentationId": presentationId,
"slide.current": true
});
// console.log "trigger:#{callingLocaton} currentSlideId=#{currentSlide?._id}"
return currentSlide;
};
BBB.getMeetingName = function() {

6
bigbluebutton-html5/app/client/views/whiteboard/slide.js
View File

@ -5,7 +5,7 @@ Template.slide.rendered = function() {
this.reactOnSlideChange = (_this => {
return function() {
let currentSlide, pic, ref;
currentSlide = BBB.getCurrentSlide("slide.rendered");
currentSlide = BBB.getCurrentSlide();
pic = new Image();
pic.onload = function() {
let ref;
@ -38,7 +38,7 @@ this.createWhiteboardPaper = (_this => {
this.displaySlide = function(wpm) {
let adjustedDimensions, currentSlide, ref;
currentSlide = BBB.getCurrentSlide("displaySlide");
currentSlide = BBB.getCurrentSlide();
wpm.create();
adjustedDimensions = scaleSlide(getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight'));
wpm._displayPage(
@ -57,7 +57,7 @@ this.manuallyDisplayShapes = function() {
}) != null) {
return;
}
currentSlide = BBB.getCurrentSlide("manuallyDisplayShapes");
currentSlide = BBB.getCurrentSlide();
wpm = this.whiteboardPaperModel;
shapes = Meteor.Shapes.find({
whiteboardId: currentSlide != null ? (ref = currentSlide.slide) != null ? ref.id : void 0 : void 0

2
bigbluebutton-html5/app/client/whiteboard_models/utils.js
View File

@ -43,7 +43,7 @@ this.formatThickness = function(thickness) {
// applies zooming to the stroke thickness
this.zoomStroke = function(thickness) {
let currentSlide, ratio;
currentSlide = BBB.getCurrentSlide("zoomStroke");
currentSlide = BBB.getCurrentSlide();
ratio = ((currentSlide != null ? currentSlide.slide.width_ratio : void 0) + (currentSlide != null ? currentSlide.slide.height_ratio : void 0)) / 2;
return thickness * 100 / ratio;
};

4
bigbluebutton-html5/app/client/whiteboard_models/whiteboard_paper.js
View File

@ -287,7 +287,7 @@ Meteor.WhiteboardPaperModel = (function() {
_updateZoomRatios() {
let currentSlideDoc;
currentSlideDoc = BBB.getCurrentSlide("_updateZoomRatios");
currentSlideDoc = BBB.getCurrentSlide();
this.widthRatio = currentSlideDoc != null ? currentSlideDoc.slide.width_ratio : void 0;
return this.heightRatio = currentSlideDoc != null ? currentSlideDoc.slide.height_ratio : void 0;
}
@ -390,7 +390,7 @@ Meteor.WhiteboardPaperModel = (function() {
this._updateContainerDimensions();
boardWidth = this.containerWidth;
boardHeight = this.containerHeight;
currentSlide = BBB.getCurrentSlide("_displayPage");
currentSlide = BBB.getCurrentSlide();
currentPresentation = Meteor.Presentations.findOne({
"presentation.current": true
});