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

Merge pull request #750 from ritzalam/fix-presentation-sync

Browse Source 
- presentation sync broke on svg conversion changes
This commit is contained in:
Richard Alam 2015-08-10 10:30:46 -04:00
commit cbe948a0d6
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bigbluebutton-client/src/org/bigbluebutton/modules/present/model/Page.as
View File

@ -11,7 +11,7 @@ package org.bigbluebutton.modules.present.model
private var _num: int;
private var _swfUri: String;
private var _txtUri: String;
private var _pngUri: String;
private var _svgUri: String;
private var _thumbUri: String;
public var current: Boolean;
@ -30,7 +30,7 @@ package org.bigbluebutton.modules.present.model
public function Page(id: String, num: int, current: Boolean,
swfUri: String, thumbUri: String, txtUri: String,
pngUri: String, x: Number, y: Number,
svgUri: String, x: Number, y: Number,
width: Number, height: Number) {
_id = id;
_num = num;
@ -38,7 +38,7 @@ package org.bigbluebutton.modules.present.model
_swfUri = swfUri;
_thumbUri = thumbUri;
_txtUri = txtUri;
_pngUri = pngUri;
_svgUri = svgUri;
this.xOffset = x;
this.yOffset = y;
this.widthRatio = width;

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/services/PresentationService.as Normal file → Executable file
View File

@ -76,7 +76,7 @@ package org.bigbluebutton.modules.present.services
private function copyPageVOToPage(p: PageVO):Page {
var page:Page = new Page(p.id, p.num, p.current,
p.swfUri, p.thumbUri, p.txtUri,
p.pngUri, p.xOffset, p.yOffset,
p.svgUri, p.xOffset, p.yOffset,
p.widthRatio, p.heightRatio);
return page;
}

2
bigbluebutton-client/src/org/bigbluebutton/modules/present/services/messages/PageVO.as
View File

@ -7,7 +7,7 @@ package org.bigbluebutton.modules.present.services.messages
public var current: Boolean;
public var swfUri: String;
public var txtUri: String;
public var pngUri: String;
public var svgUri: String;
public var thumbUri: String;
public var xOffset: Number;
public var yOffset: Number;

6
bigbluebutton-client/src/org/bigbluebutton/modules/present/services/messaging/MessageReceiver.as Normal file → Executable file
View File

@ -125,7 +125,7 @@ package org.bigbluebutton.modules.present.services.messaging
if (! map.hasOwnProperty("current")) missing.push("Missing [current] param.");
if (! map.hasOwnProperty("swfUri")) missing.push("Missing [swfUri] param.");
if (! map.hasOwnProperty("txtUri")) missing.push("Missing [txtUri] param.");
if (! map.hasOwnProperty("pngUri")) missing.push("Missing [pngUri] param.");
if (! map.hasOwnProperty("svgUri")) missing.push("Missing [svgUri] param.");
if (! map.hasOwnProperty("thumbUri")) missing.push("Missing [thumbUri] param.");
if (! map.hasOwnProperty("xOffset")) missing.push("Missing [xOffset] param.");
if (! map.hasOwnProperty("yOffset")) missing.push("Missing [yOffset] param.");
@ -139,7 +139,7 @@ package org.bigbluebutton.modules.present.services.messaging
// }
if (map.hasOwnProperty("id") && map.hasOwnProperty("num") && map.hasOwnProperty("current") &&
map.hasOwnProperty("swfUri") && map.hasOwnProperty("txtUri") && map.hasOwnProperty("pngUri") &&
map.hasOwnProperty("swfUri") && map.hasOwnProperty("txtUri") && map.hasOwnProperty("svgUri") &&
map.hasOwnProperty("thumbUri") && map.hasOwnProperty("xOffset") && map.hasOwnProperty("yOffset") &&
map.hasOwnProperty("widthRatio") && map.hasOwnProperty("heightRatio")) {
return true;
@ -158,7 +158,7 @@ package org.bigbluebutton.modules.present.services.messaging
page.current = map.current;
page.swfUri = map.swfUri;
page.txtUri = map.txtUri;
page.pngUri = map.pngUri;
page.svgUri = map.svgUri;
page.thumbUri = map.thumbUri;
page.xOffset = map.xOffset;
page.yOffset = map.yOffset;