Start making changes to presentation module
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@543 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
parent
79433f6d69
commit
a5ade6ce14
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<actionScriptProperties mainApplicationPath="BigBlueButton.mxml" version="3">
|
||||
<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.0" htmlPlayerVersionCheck="true" outputFolderPath="bin" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
|
||||
<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.115" htmlPlayerVersionCheck="true" outputFolderPath="bin" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
|
||||
<compilerSourcePath>
|
||||
<compilerSourcePathEntry kind="1" linkType="1" path="tests/integration"/>
|
||||
<compilerSourcePathEntry kind="1" linkType="1" path="tests/unit"/>
|
||||
@ -11,8 +11,8 @@
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" sourcepath="${PROJECT_FRAMEWORKS}/source" useDefaultLinkType="true"/>
|
||||
</modifiedEntries>
|
||||
<excludedEntries>
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
|
||||
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
|
||||
</excludedEntries>
|
||||
@ -26,8 +26,9 @@
|
||||
</compiler>
|
||||
<applications>
|
||||
<application path="src/main.mxml"/>
|
||||
<application path="BigBlueButton.mxml"/>
|
||||
<application path="PresentationUnitTest.mxml"/>
|
||||
<application path="src/TestRunners.mxml"/>
|
||||
<application path="BigBlueButton.mxml"/>
|
||||
</applications>
|
||||
<modules>
|
||||
<module application="src/BigBlueButton.mxml" destPath="org/bigbluebutton/modules/presentation/presentation_module.swf" optimize="true" sourcePath="src/org/bigbluebutton/modules/presentation/presentation_module.mxml"/>
|
||||
|
@ -1,4 +1,4 @@
|
||||
// Flash Player Version Detection - Rev 1.5
|
||||
// Flash Player Version Detection - Rev 1.6
|
||||
// Detect Client Browser type
|
||||
// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
|
||||
var isIE = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
|
||||
@ -90,12 +90,20 @@ function GetSwfVer(){
|
||||
var tempArrayMajor = descArray[2].split(".");
|
||||
var versionMajor = tempArrayMajor[0];
|
||||
var versionMinor = tempArrayMajor[1];
|
||||
if ( descArray[3] != "" ) {
|
||||
tempArrayMinor = descArray[3].split("r");
|
||||
} else {
|
||||
tempArrayMinor = descArray[4].split("r");
|
||||
var versionRevision = descArray[3];
|
||||
if (versionRevision == "") {
|
||||
versionRevision = descArray[4];
|
||||
}
|
||||
if (versionRevision[0] == "d") {
|
||||
versionRevision = versionRevision.substring(1);
|
||||
} else if (versionRevision[0] == "r") {
|
||||
versionRevision = versionRevision.substring(1);
|
||||
if (versionRevision.indexOf("d") > 0) {
|
||||
versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
|
||||
}
|
||||
} else if (versionRevision[0] == "b") {
|
||||
versionRevision = versionRevision.substring(1);
|
||||
}
|
||||
var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
|
||||
var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
|
||||
}
|
||||
}
|
||||
@ -161,9 +169,10 @@ function AC_Generateobj(objAttrs, params, embedAttrs)
|
||||
str += '<object ';
|
||||
for (var i in objAttrs)
|
||||
str += i + '="' + objAttrs[i] + '" ';
|
||||
str += '>';
|
||||
for (var i in params)
|
||||
str += '><param name="' + i + '" value="' + params[i] + '" /> ';
|
||||
str += '></object>';
|
||||
str += '<param name="' + i + '" value="' + params[i] + '" /> ';
|
||||
str += '</object>';
|
||||
} else {
|
||||
str += '<embed ';
|
||||
for (var i in embedAttrs)
|
||||
@ -242,9 +251,9 @@ function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
|
||||
case "ondeactivate":
|
||||
case "type":
|
||||
case "codebase":
|
||||
case "id":
|
||||
ret.objAttrs[args[i]] = args[i+1];
|
||||
break;
|
||||
case "id":
|
||||
case "width":
|
||||
case "height":
|
||||
case "align":
|
||||
|
@ -1,21 +0,0 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<script type='text/javascript' language='JavaScript1.2' charset='utf-8'>
|
||||
var v = new top.Vars(top.getSearch(window));
|
||||
var fv = v.toString('$_');
|
||||
</script>
|
||||
</head>
|
||||
<body >
|
||||
<script type='text/javascript' language='JavaScript1.2' charset='utf-8'>
|
||||
document.writeln('<object id=\"utility\" name=\" \" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"" + activexDownloadURL + "#version=7,0,14,0\" width=\"100\" height=\"50\">');
|
||||
document.writeln('<param name=\"movie\" value=\"history.swf\" />');
|
||||
document.writeln('<param name=\"FlashVars\" value=\"'+fv+'&$_lconid='+top.lc_id+'\"/>');
|
||||
document.writeln('<param name=\"quality\" value=\"high\" />');
|
||||
document.writeln('<param name=\"bgcolor\" value=\"#FFFFFF\" />');
|
||||
document.writeln('<param name=\"profile\" value=\"false\" />');
|
||||
document.writeln('<embed id=\"utilityEmbed\" name=\"history.swf\" src=\"history.swf\" type=\"application/x-shockwave-flash\" flashvars=\"'+fv+'&$_lconid='+top.lc_id+'\" profile=\"false\" quality=\"high\" bgcolor=\"#FFFFFF\" width=\"100\" height=\"50\" align=\"\" pluginspage=\"" + pluginDownloadURL + "\"></embed>');
|
||||
document.writeln('</object>');
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
@ -1,48 +0,0 @@
|
||||
// $Revision: 1.49 $
|
||||
// Vars
|
||||
Vars = function(qStr) {
|
||||
this.numVars = 0;
|
||||
if(qStr != null) {
|
||||
var nameValue, name;
|
||||
var pairs = qStr.split('&');
|
||||
var pairLen = pairs.length;
|
||||
for(var i = 0; i < pairLen; i++) {
|
||||
var pair = pairs[i];
|
||||
if( (pair.indexOf('=')!= -1) && (pair.length > 3) ) {
|
||||
var nameValue = pair.split('=');
|
||||
var name = nameValue[0];
|
||||
var value = nameValue[1];
|
||||
if(this[name] == null && name.length > 0 && value.length > 0) {
|
||||
this[name] = value;
|
||||
this.numVars++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Vars.prototype.toString = function(pre) {
|
||||
var result = '';
|
||||
if(pre == null) { pre = ''; }
|
||||
for(var i in this) {
|
||||
if(this[i] != null && typeof(this[i]) != 'object' && typeof(this[i]) != 'function' && i != 'numVars') {
|
||||
result += pre + i + '=' + this[i] + '&';
|
||||
}
|
||||
}
|
||||
if(result.length > 0) result = result.substr(0, result.length-1);
|
||||
return result;
|
||||
}
|
||||
function getSearch(wRef) {
|
||||
var searchStr = '';
|
||||
if(wRef.location.search.length > 1) {
|
||||
searchStr = new String(wRef.location.search);
|
||||
searchStr = searchStr.substring(1, searchStr.length);
|
||||
}
|
||||
return searchStr;
|
||||
}
|
||||
var lc_id = Math.floor(Math.random() * 100000).toString(16);
|
||||
if (this != top)
|
||||
{
|
||||
top.Vars = Vars;
|
||||
top.getSearch = getSearch;
|
||||
top.lc_id = lc_id;
|
||||
}
|
Binary file not shown.
@ -0,0 +1,6 @@
|
||||
/* This CSS stylesheet defines styles used by required elements in a flex application page that supports browser history */
|
||||
|
||||
#ie_historyFrame { width: 0px; height: 0px; display:none }
|
||||
#firefox_anchorDiv { width: 0px; height: 0px; display:none }
|
||||
#safari_formDiv { width: 0px; height: 0px; display:none }
|
||||
#safari_rememberDiv { width: 0px; height: 0px; display:none }
|
662
bigbluebutton-clientv.034/html-template/history/history.js
Normal file
662
bigbluebutton-clientv.034/html-template/history/history.js
Normal file
@ -0,0 +1,662 @@
|
||||
BrowserHistoryUtils = {
|
||||
addEvent: function(elm, evType, fn, useCapture) {
|
||||
useCapture = useCapture || false;
|
||||
if (elm.addEventListener) {
|
||||
elm.addEventListener(evType, fn, useCapture);
|
||||
return true;
|
||||
}
|
||||
else if (elm.attachEvent) {
|
||||
var r = elm.attachEvent('on' + evType, fn);
|
||||
return r;
|
||||
}
|
||||
else {
|
||||
elm['on' + evType] = fn;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BrowserHistory = (function() {
|
||||
// type of browser
|
||||
var browser = {
|
||||
ie: false,
|
||||
firefox: false,
|
||||
safari: false,
|
||||
opera: false,
|
||||
version: -1
|
||||
};
|
||||
|
||||
// if setDefaultURL has been called, our first clue
|
||||
// that the SWF is ready and listening
|
||||
//var swfReady = false;
|
||||
|
||||
// the URL we'll send to the SWF once it is ready
|
||||
//var pendingURL = '';
|
||||
|
||||
// Default app state URL to use when no fragment ID present
|
||||
var defaultHash = '';
|
||||
|
||||
// Last-known app state URL
|
||||
var currentHref = document.location.href;
|
||||
|
||||
// Initial URL (used only by IE)
|
||||
var initialHref = document.location.href;
|
||||
|
||||
// Initial URL (used only by IE)
|
||||
var initialHash = document.location.hash;
|
||||
|
||||
// History frame source URL prefix (used only by IE)
|
||||
var historyFrameSourcePrefix = 'history/historyFrame.html?';
|
||||
|
||||
// History maintenance (used only by Safari)
|
||||
var currentHistoryLength = -1;
|
||||
|
||||
var historyHash = [];
|
||||
|
||||
var initialState = createState(initialHref, initialHref + '#' + initialHash, initialHash);
|
||||
|
||||
var backStack = [];
|
||||
var forwardStack = [];
|
||||
|
||||
var currentObjectId = null;
|
||||
|
||||
//UserAgent detection
|
||||
var useragent = navigator.userAgent.toLowerCase();
|
||||
|
||||
if (useragent.indexOf("opera") != -1) {
|
||||
browser.opera = true;
|
||||
} else if (useragent.indexOf("msie") != -1) {
|
||||
browser.ie = true;
|
||||
browser.version = parseFloat(useragent.substring(useragent.indexOf('msie') + 4));
|
||||
} else if (useragent.indexOf("safari") != -1) {
|
||||
browser.safari = true;
|
||||
browser.version = parseFloat(useragent.substring(useragent.indexOf('safari') + 7));
|
||||
} else if (useragent.indexOf("gecko") != -1) {
|
||||
browser.firefox = true;
|
||||
}
|
||||
|
||||
if (browser.ie == true && browser.version == 7) {
|
||||
window["_ie_firstload"] = false;
|
||||
}
|
||||
|
||||
// Accessor functions for obtaining specific elements of the page.
|
||||
function getHistoryFrame()
|
||||
{
|
||||
return document.getElementById('ie_historyFrame');
|
||||
}
|
||||
|
||||
function getAnchorElement()
|
||||
{
|
||||
return document.getElementById('firefox_anchorDiv');
|
||||
}
|
||||
|
||||
function getFormElement()
|
||||
{
|
||||
return document.getElementById('safari_formDiv');
|
||||
}
|
||||
|
||||
function getRememberElement()
|
||||
{
|
||||
return document.getElementById("safari_remember_field");
|
||||
}
|
||||
|
||||
// Get the Flash player object for performing ExternalInterface callbacks.
|
||||
// Updated for changes to SWFObject2.
|
||||
function getPlayer(id) {
|
||||
if (id && document.getElementById(id)) {
|
||||
var r = document.getElementById(id);
|
||||
if (typeof r.SetVariable != "undefined") {
|
||||
return r;
|
||||
}
|
||||
else {
|
||||
var o = r.getElementsByTagName("object");
|
||||
var e = r.getElementsByTagName("embed");
|
||||
if (o.length > 0 && typeof o[0].SetVariable != "undefined") {
|
||||
return o[0];
|
||||
}
|
||||
else if (e.length > 0 && typeof e[0].SetVariable != "undefined") {
|
||||
return e[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
var o = document.getElementsByTagName("object");
|
||||
var e = document.getElementsByTagName("embed");
|
||||
if (e.length > 0 && typeof e[0].SetVariable != "undefined") {
|
||||
return e[0];
|
||||
}
|
||||
else if (o.length > 0 && typeof o[0].SetVariable != "undefined") {
|
||||
return o[0];
|
||||
}
|
||||
else if (o.length > 1 && typeof o[1].SetVariable != "undefined") {
|
||||
return o[1];
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function getPlayers() {
|
||||
var players = [];
|
||||
if (players.length == 0) {
|
||||
var tmp = document.getElementsByTagName('object');
|
||||
players = tmp;
|
||||
}
|
||||
|
||||
if (players.length == 0 || players[0].object == null) {
|
||||
var tmp = document.getElementsByTagName('embed');
|
||||
players = tmp;
|
||||
}
|
||||
return players;
|
||||
}
|
||||
|
||||
function getIframeHash() {
|
||||
var doc = getHistoryFrame().contentWindow.document;
|
||||
var hash = String(doc.location.search);
|
||||
if (hash.length == 1 && hash.charAt(0) == "?") {
|
||||
hash = "";
|
||||
}
|
||||
else if (hash.length >= 2 && hash.charAt(0) == "?") {
|
||||
hash = hash.substring(1);
|
||||
}
|
||||
return hash;
|
||||
}
|
||||
|
||||
/* Get the current location hash excluding the '#' symbol. */
|
||||
function getHash() {
|
||||
// It would be nice if we could use document.location.hash here,
|
||||
// but it's faulty sometimes.
|
||||
var idx = document.location.href.indexOf('#');
|
||||
return (idx >= 0) ? document.location.href.substr(idx+1) : '';
|
||||
}
|
||||
|
||||
/* Get the current location hash excluding the '#' symbol. */
|
||||
function setHash(hash) {
|
||||
// It would be nice if we could use document.location.hash here,
|
||||
// but it's faulty sometimes.
|
||||
if (hash == '') hash = '#'
|
||||
document.location.hash = hash;
|
||||
}
|
||||
|
||||
function createState(baseUrl, newUrl, flexAppUrl) {
|
||||
return { 'baseUrl': baseUrl, 'newUrl': newUrl, 'flexAppUrl': flexAppUrl, 'title': null };
|
||||
}
|
||||
|
||||
/* Add a history entry to the browser.
|
||||
* baseUrl: the portion of the location prior to the '#'
|
||||
* newUrl: the entire new URL, including '#' and following fragment
|
||||
* flexAppUrl: the portion of the location following the '#' only
|
||||
*/
|
||||
function addHistoryEntry(baseUrl, newUrl, flexAppUrl) {
|
||||
|
||||
//delete all the history entries
|
||||
forwardStack = [];
|
||||
|
||||
if (browser.ie) {
|
||||
//Check to see if we are being asked to do a navigate for the first
|
||||
//history entry, and if so ignore, because it's coming from the creation
|
||||
//of the history iframe
|
||||
if (flexAppUrl == defaultHash && document.location.href == initialHref && window['_ie_firstload']) {
|
||||
currentHref = initialHref;
|
||||
return;
|
||||
}
|
||||
if ((!flexAppUrl || flexAppUrl == defaultHash) && window['_ie_firstload']) {
|
||||
newUrl = baseUrl + '#' + defaultHash;
|
||||
flexAppUrl = defaultHash;
|
||||
} else {
|
||||
// for IE, tell the history frame to go somewhere without a '#'
|
||||
// in order to get this entry into the browser history.
|
||||
getHistoryFrame().src = historyFrameSourcePrefix + flexAppUrl;
|
||||
}
|
||||
setHash(flexAppUrl);
|
||||
} else {
|
||||
|
||||
//ADR
|
||||
if (backStack.length == 0 && initialState.flexAppUrl == flexAppUrl) {
|
||||
initialState = createState(baseUrl, newUrl, flexAppUrl);
|
||||
} else if(backStack.length > 0 && backStack[backStack.length - 1].flexAppUrl == flexAppUrl) {
|
||||
backStack[backStack.length - 1] = createState(baseUrl, newUrl, flexAppUrl);
|
||||
}
|
||||
|
||||
if (browser.safari) {
|
||||
// for Safari, submit a form whose action points to the desired URL
|
||||
if (browser.version <= 419.3) {
|
||||
var file = window.location.pathname.toString();
|
||||
file = file.substring(file.lastIndexOf("/")+1);
|
||||
getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
|
||||
//get the current elements and add them to the form
|
||||
var qs = window.location.search.substring(1);
|
||||
var qs_arr = qs.split("&");
|
||||
for (var i = 0; i < qs_arr.length; i++) {
|
||||
var tmp = qs_arr[i].split("=");
|
||||
var elem = document.createElement("input");
|
||||
elem.type = "hidden";
|
||||
elem.name = tmp[0];
|
||||
elem.value = tmp[1];
|
||||
document.forms.historyForm.appendChild(elem);
|
||||
}
|
||||
document.forms.historyForm.submit();
|
||||
} else {
|
||||
top.location.hash = flexAppUrl;
|
||||
}
|
||||
// We also have to maintain the history by hand for Safari
|
||||
historyHash[history.length] = flexAppUrl;
|
||||
_storeStates();
|
||||
} else {
|
||||
// Otherwise, write an anchor into the page and tell the browser to go there
|
||||
addAnchor(flexAppUrl);
|
||||
setHash(flexAppUrl);
|
||||
}
|
||||
}
|
||||
backStack.push(createState(baseUrl, newUrl, flexAppUrl));
|
||||
}
|
||||
|
||||
function _storeStates() {
|
||||
if (browser.safari) {
|
||||
getRememberElement().value = historyHash.join(",");
|
||||
}
|
||||
}
|
||||
|
||||
function handleBackButton() {
|
||||
//The "current" page is always at the top of the history stack.
|
||||
var current = backStack.pop();
|
||||
if (!current) { return; }
|
||||
var last = backStack[backStack.length - 1];
|
||||
if (!last && backStack.length == 0){
|
||||
last = initialState;
|
||||
}
|
||||
forwardStack.push(current);
|
||||
}
|
||||
|
||||
function handleForwardButton() {
|
||||
//summary: private method. Do not call this directly.
|
||||
|
||||
var last = forwardStack.pop();
|
||||
if (!last) { return; }
|
||||
backStack.push(last);
|
||||
}
|
||||
|
||||
function handleArbitraryUrl() {
|
||||
//delete all the history entries
|
||||
forwardStack = [];
|
||||
}
|
||||
|
||||
/* Called periodically to poll to see if we need to detect navigation that has occurred */
|
||||
function checkForUrlChange() {
|
||||
|
||||
if (browser.ie) {
|
||||
if (currentHref != document.location.href && currentHref + '#' != document.location.href) {
|
||||
//This occurs when the user has navigated to a specific URL
|
||||
//within the app, and didn't use browser back/forward
|
||||
//IE seems to have a bug where it stops updating the URL it
|
||||
//shows the end-user at this point, but programatically it
|
||||
//appears to be correct. Do a full app reload to get around
|
||||
//this issue.
|
||||
if (browser.version < 7) {
|
||||
currentHref = document.location.href;
|
||||
document.location.reload();
|
||||
} else {
|
||||
if (getHash() != getIframeHash()) {
|
||||
// this.iframe.src = this.blankURL + hash;
|
||||
var sourceToSet = historyFrameSourcePrefix + getHash();
|
||||
getHistoryFrame().src = sourceToSet;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (browser.safari) {
|
||||
// For Safari, we have to check to see if history.length changed.
|
||||
if (currentHistoryLength >= 0 && history.length != currentHistoryLength) {
|
||||
//alert("did change: " + history.length + ", " + historyHash.length + "|" + historyHash[history.length] + "|>" + historyHash.join("|"));
|
||||
// If it did change, then we have to look the old state up
|
||||
// in our hand-maintained array since document.location.hash
|
||||
// won't have changed, then call back into BrowserManager.
|
||||
currentHistoryLength = history.length;
|
||||
var flexAppUrl = historyHash[currentHistoryLength];
|
||||
if (flexAppUrl == '') {
|
||||
//flexAppUrl = defaultHash;
|
||||
}
|
||||
//ADR: to fix multiple
|
||||
if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
|
||||
var pl = getPlayers();
|
||||
for (var i = 0; i < pl.length; i++) {
|
||||
pl[i].browserURLChange(flexAppUrl);
|
||||
}
|
||||
} else {
|
||||
getPlayer().browserURLChange(flexAppUrl);
|
||||
}
|
||||
_storeStates();
|
||||
}
|
||||
}
|
||||
if (browser.firefox) {
|
||||
if (currentHref != document.location.href) {
|
||||
var bsl = backStack.length;
|
||||
|
||||
var urlActions = {
|
||||
back: false,
|
||||
forward: false,
|
||||
set: false
|
||||
}
|
||||
|
||||
if ((window.location.hash == initialHash || window.location.href == initialHref) && (bsl == 1)) {
|
||||
urlActions.back = true;
|
||||
// FIXME: could this ever be a forward button?
|
||||
// we can't clear it because we still need to check for forwards. Ugg.
|
||||
// clearInterval(this.locationTimer);
|
||||
handleBackButton();
|
||||
}
|
||||
|
||||
// first check to see if we could have gone forward. We always halt on
|
||||
// a no-hash item.
|
||||
if (forwardStack.length > 0) {
|
||||
if (forwardStack[forwardStack.length-1].flexAppUrl == getHash()) {
|
||||
urlActions.forward = true;
|
||||
handleForwardButton();
|
||||
}
|
||||
}
|
||||
|
||||
// ok, that didn't work, try someplace back in the history stack
|
||||
if ((bsl >= 2) && (backStack[bsl - 2])) {
|
||||
if (backStack[bsl - 2].flexAppUrl == getHash()) {
|
||||
urlActions.back = true;
|
||||
handleBackButton();
|
||||
}
|
||||
}
|
||||
|
||||
if (!urlActions.back && !urlActions.forward) {
|
||||
var foundInStacks = {
|
||||
back: -1,
|
||||
forward: -1
|
||||
}
|
||||
|
||||
for (var i = 0; i < backStack.length; i++) {
|
||||
if (backStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
|
||||
arbitraryUrl = true;
|
||||
foundInStacks.back = i;
|
||||
}
|
||||
}
|
||||
for (var i = 0; i < forwardStack.length; i++) {
|
||||
if (forwardStack[i].flexAppUrl == getHash() && i != (bsl - 2)) {
|
||||
arbitraryUrl = true;
|
||||
foundInStacks.forward = i;
|
||||
}
|
||||
}
|
||||
handleArbitraryUrl();
|
||||
}
|
||||
|
||||
// Firefox changed; do a callback into BrowserManager to tell it.
|
||||
currentHref = document.location.href;
|
||||
var flexAppUrl = getHash();
|
||||
if (flexAppUrl == '') {
|
||||
//flexAppUrl = defaultHash;
|
||||
}
|
||||
//ADR: to fix multiple
|
||||
if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
|
||||
var pl = getPlayers();
|
||||
for (var i = 0; i < pl.length; i++) {
|
||||
pl[i].browserURLChange(flexAppUrl);
|
||||
}
|
||||
} else {
|
||||
getPlayer().browserURLChange(flexAppUrl);
|
||||
}
|
||||
}
|
||||
}
|
||||
//setTimeout(checkForUrlChange, 50);
|
||||
}
|
||||
|
||||
/* Write an anchor into the page to legitimize it as a URL for Firefox et al. */
|
||||
function addAnchor(flexAppUrl)
|
||||
{
|
||||
if (document.getElementsByName(flexAppUrl).length == 0) {
|
||||
getAnchorElement().innerHTML += "<a name='" + flexAppUrl + "'>" + flexAppUrl + "</a>";
|
||||
}
|
||||
}
|
||||
|
||||
var _initialize = function () {
|
||||
if (browser.ie)
|
||||
{
|
||||
var scripts = document.getElementsByTagName('script');
|
||||
for (var i = 0, s; s = scripts[i]; i++) {
|
||||
if (s.src.indexOf("history.js") > -1) {
|
||||
var iframe_location = (new String(s.src)).replace("history.js", "historyFrame.html");
|
||||
}
|
||||
}
|
||||
historyFrameSourcePrefix = iframe_location + "?";
|
||||
var src = historyFrameSourcePrefix;
|
||||
|
||||
var iframe = document.createElement("iframe");
|
||||
iframe.id = 'ie_historyFrame';
|
||||
iframe.name = 'ie_historyFrame';
|
||||
//iframe.src = historyFrameSourcePrefix;
|
||||
try {
|
||||
document.body.appendChild(iframe);
|
||||
} catch(e) {
|
||||
setTimeout(function() {
|
||||
document.body.appendChild(iframe);
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (browser.safari)
|
||||
{
|
||||
var rememberDiv = document.createElement("div");
|
||||
rememberDiv.id = 'safari_rememberDiv';
|
||||
document.body.appendChild(rememberDiv);
|
||||
rememberDiv.innerHTML = '<input type="text" id="safari_remember_field" style="width: 500px;">';
|
||||
|
||||
var formDiv = document.createElement("div");
|
||||
formDiv.id = 'safari_formDiv';
|
||||
document.body.appendChild(formDiv);
|
||||
|
||||
var reloader_content = document.createElement('div');
|
||||
reloader_content.id = 'safarireloader';
|
||||
var scripts = document.getElementsByTagName('script');
|
||||
for (var i = 0, s; s = scripts[i]; i++) {
|
||||
if (s.src.indexOf("history.js") > -1) {
|
||||
html = (new String(s.src)).replace(".js", ".html");
|
||||
}
|
||||
}
|
||||
reloader_content.innerHTML = '<iframe id="safarireloader-iframe" src="about:blank" frameborder="no" scrolling="no"></iframe>';
|
||||
document.body.appendChild(reloader_content);
|
||||
reloader_content.style.position = 'absolute';
|
||||
reloader_content.style.left = reloader_content.style.top = '-9999px';
|
||||
iframe = reloader_content.getElementsByTagName('iframe')[0];
|
||||
|
||||
if (document.getElementById("safari_remember_field").value != "" ) {
|
||||
historyHash = document.getElementById("safari_remember_field").value.split(",");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (browser.firefox)
|
||||
{
|
||||
var anchorDiv = document.createElement("div");
|
||||
anchorDiv.id = 'firefox_anchorDiv';
|
||||
document.body.appendChild(anchorDiv);
|
||||
}
|
||||
|
||||
//setTimeout(checkForUrlChange, 50);
|
||||
}
|
||||
|
||||
return {
|
||||
historyHash: historyHash,
|
||||
backStack: function() { return backStack; },
|
||||
forwardStack: function() { return forwardStack },
|
||||
getPlayer: getPlayer,
|
||||
initialize: function(src) {
|
||||
_initialize(src);
|
||||
},
|
||||
setURL: function(url) {
|
||||
document.location.href = url;
|
||||
},
|
||||
getURL: function() {
|
||||
return document.location.href;
|
||||
},
|
||||
getTitle: function() {
|
||||
return document.title;
|
||||
},
|
||||
setTitle: function(title) {
|
||||
try {
|
||||
backStack[backStack.length - 1].title = title;
|
||||
} catch(e) { }
|
||||
//if on safari, set the title to be the empty string.
|
||||
if (browser.safari) {
|
||||
if (title == "") {
|
||||
try {
|
||||
var tmp = window.location.href.toString();
|
||||
title = tmp.substring((tmp.lastIndexOf("/")+1), tmp.lastIndexOf("#"));
|
||||
} catch(e) {
|
||||
title = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
document.title = title;
|
||||
},
|
||||
setDefaultURL: function(def)
|
||||
{
|
||||
defaultHash = def;
|
||||
def = getHash();
|
||||
//trailing ? is important else an extra frame gets added to the history
|
||||
//when navigating back to the first page. Alternatively could check
|
||||
//in history frame navigation to compare # and ?.
|
||||
if (browser.ie)
|
||||
{
|
||||
window['_ie_firstload'] = true;
|
||||
var sourceToSet = historyFrameSourcePrefix + def;
|
||||
var func = function() {
|
||||
getHistoryFrame().src = sourceToSet;
|
||||
window.location.replace("#" + def);
|
||||
setInterval(checkForUrlChange, 50);
|
||||
}
|
||||
try {
|
||||
func();
|
||||
} catch(e) {
|
||||
window.setTimeout(function() { func(); }, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (browser.safari)
|
||||
{
|
||||
currentHistoryLength = history.length;
|
||||
if (historyHash.length == 0) {
|
||||
historyHash[currentHistoryLength] = def;
|
||||
var newloc = "#" + def;
|
||||
window.location.replace(newloc);
|
||||
} else {
|
||||
//alert(historyHash[historyHash.length-1]);
|
||||
}
|
||||
//setHash(def);
|
||||
setInterval(checkForUrlChange, 50);
|
||||
}
|
||||
|
||||
|
||||
if (browser.firefox || browser.opera)
|
||||
{
|
||||
var reg = new RegExp("#" + def + "$");
|
||||
if (window.location.toString().match(reg)) {
|
||||
} else {
|
||||
var newloc ="#" + def;
|
||||
window.location.replace(newloc);
|
||||
}
|
||||
setInterval(checkForUrlChange, 50);
|
||||
//setHash(def);
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
/* Set the current browser URL; called from inside BrowserManager to propagate
|
||||
* the application state out to the container.
|
||||
*/
|
||||
setBrowserURL: function(flexAppUrl, objectId) {
|
||||
if (browser.ie && typeof objectId != "undefined") {
|
||||
currentObjectId = objectId;
|
||||
}
|
||||
//fromIframe = fromIframe || false;
|
||||
//fromFlex = fromFlex || false;
|
||||
//alert("setBrowserURL: " + flexAppUrl);
|
||||
//flexAppUrl = (flexAppUrl == "") ? defaultHash : flexAppUrl ;
|
||||
|
||||
var pos = document.location.href.indexOf('#');
|
||||
var baseUrl = pos != -1 ? document.location.href.substr(0, pos) : document.location.href;
|
||||
var newUrl = baseUrl + '#' + flexAppUrl;
|
||||
|
||||
if (document.location.href != newUrl && document.location.href + '#' != newUrl) {
|
||||
currentHref = newUrl;
|
||||
addHistoryEntry(baseUrl, newUrl, flexAppUrl);
|
||||
currentHistoryLength = history.length;
|
||||
}
|
||||
|
||||
return false;
|
||||
},
|
||||
|
||||
browserURLChange: function(flexAppUrl) {
|
||||
var objectId = null;
|
||||
if (browser.ie && currentObjectId != null) {
|
||||
objectId = currentObjectId;
|
||||
}
|
||||
pendingURL = '';
|
||||
|
||||
if (typeof BrowserHistory_multiple != "undefined" && BrowserHistory_multiple == true) {
|
||||
var pl = getPlayers();
|
||||
for (var i = 0; i < pl.length; i++) {
|
||||
try {
|
||||
pl[i].browserURLChange(flexAppUrl);
|
||||
} catch(e) { }
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
getPlayer(objectId).browserURLChange(flexAppUrl);
|
||||
} catch(e) { }
|
||||
}
|
||||
|
||||
currentObjectId = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
})();
|
||||
|
||||
// Initialization
|
||||
|
||||
// Automated unit testing and other diagnostics
|
||||
|
||||
function setURL(url)
|
||||
{
|
||||
document.location.href = url;
|
||||
}
|
||||
|
||||
function backButton()
|
||||
{
|
||||
history.back();
|
||||
}
|
||||
|
||||
function forwardButton()
|
||||
{
|
||||
history.forward();
|
||||
}
|
||||
|
||||
function goForwardOrBackInHistory(step)
|
||||
{
|
||||
history.go(step);
|
||||
}
|
||||
|
||||
//BrowserHistoryUtils.addEvent(window, "load", function() { BrowserHistory.initialize(); });
|
||||
(function(i) {
|
||||
var u =navigator.userAgent;var e=/*@cc_on!@*/false;
|
||||
var st = setTimeout;
|
||||
if(/webkit/i.test(u)){
|
||||
st(function(){
|
||||
var dr=document.readyState;
|
||||
if(dr=="loaded"||dr=="complete"){i()}
|
||||
else{st(arguments.callee,10);}},10);
|
||||
} else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
|
||||
document.addEventListener("DOMContentLoaded",i,false);
|
||||
} else if(e){
|
||||
(function(){
|
||||
var t=document.createElement('doc:rdy');
|
||||
try{t.doScroll('left');
|
||||
i();t=null;
|
||||
}catch(e){st(arguments.callee,0);}})();
|
||||
} else{
|
||||
window.onload=i;
|
||||
}
|
||||
})( function() {BrowserHistory.initialize();} );
|
@ -0,0 +1,29 @@
|
||||
<html>
|
||||
<head>
|
||||
<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
|
||||
<META HTTP-EQUIV="Expires" CONTENT="-1">
|
||||
</head>
|
||||
<body>
|
||||
<script>
|
||||
function processUrl()
|
||||
{
|
||||
|
||||
var pos = url.indexOf("?");
|
||||
url = pos != -1 ? url.substr(pos + 1) : "";
|
||||
if (!parent._ie_firstload) {
|
||||
parent.BrowserHistory.setBrowserURL(url);
|
||||
try {
|
||||
parent.BrowserHistory.browserURLChange(url);
|
||||
} catch(e) { }
|
||||
} else {
|
||||
parent._ie_firstload = false;
|
||||
}
|
||||
}
|
||||
|
||||
var url = document.location.href;
|
||||
processUrl();
|
||||
document.write(encodeURIComponent(url));
|
||||
</script>
|
||||
Hidden frame for Browser History support.
|
||||
</body>
|
||||
</html>
|
25
bigbluebutton-clientv.034/src/PresentationUnitTest.mxml
Normal file
25
bigbluebutton-clientv.034/src/PresentationUnitTest.mxml
Normal file
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
|
||||
creationComplete="onCreationComplete()" layout="absolute" xmlns:flexui="flexunit.flexui.*">
|
||||
|
||||
<mx:Script>
|
||||
<![CDATA[
|
||||
|
||||
import flexunit.framework.TestSuite;
|
||||
private function onCreationComplete():void{
|
||||
presentationTestRunner.test = createSuite();
|
||||
presentationTestRunner.startTest();
|
||||
}
|
||||
|
||||
private function createSuite():TestSuite{
|
||||
trace("test");
|
||||
var ts:TestSuite = new TestSuite();
|
||||
|
||||
|
||||
return ts;
|
||||
}
|
||||
]]>
|
||||
</mx:Script>
|
||||
|
||||
<flexui:TestRunnerBase id="presentationTestRunner" width="100%" height="100%" />
|
||||
</mx:Application>
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class AssignPresenterCommand extends SimpleCommand
|
||||
{
|
||||
public function AssignPresenterCommand()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class GotoPageCommand extends SimpleCommand
|
||||
{
|
||||
public function GotoPageCommand()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class Join extends SimpleCommand
|
||||
{
|
||||
public function Join()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class Leave extends SimpleCommand
|
||||
{
|
||||
public function Leave()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class ShareCommand extends SimpleCommand
|
||||
{
|
||||
public function ShareCommand()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package org.bigbluebutton.modules.presentation.controller
|
||||
{
|
||||
import org.puremvc.as3.multicore.patterns.command.SimpleCommand;
|
||||
|
||||
public class UnshareCommand extends SimpleCommand
|
||||
{
|
||||
public function UnshareCommand()
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -59,7 +59,6 @@ package org.bigbluebutton.modules.presentation.model
|
||||
private var _userid : Number;
|
||||
private var _room : String;
|
||||
private var _docServiceAddress : String = "http://localhost:8080";
|
||||
private var log : LogModuleFacade = LogModuleFacade.getInstance("LogModule");
|
||||
|
||||
/**
|
||||
* The default constructor
|
||||
@ -143,12 +142,12 @@ package org.bigbluebutton.modules.presentation.model
|
||||
*/
|
||||
public function uploadPresentation(fileToUpload : FileReference) : void
|
||||
{
|
||||
log.presentation("PresentationApplication::uploadPresentation()... " + _docServiceAddress + Constants.relativeFileUpload + "/upload");
|
||||
trace("PresentationApplication::uploadPresentation()... " + _docServiceAddress + Constants.relativeFileUpload + "/upload");
|
||||
var fullUri : String = _docServiceAddress + Constants.relativeFileUpload + "/upload";
|
||||
|
||||
var service:FileUploadService = new FileUploadService(fullUri, _room);
|
||||
facade.registerProxy(service);
|
||||
log.presentation("using flash FileUploadService...");
|
||||
trace("using flash FileUploadService...");
|
||||
service.upload(fileToUpload);
|
||||
}
|
||||
|
||||
@ -159,7 +158,7 @@ package org.bigbluebutton.modules.presentation.model
|
||||
public function loadPresentation() : void
|
||||
{
|
||||
var fullUri : String = _docServiceAddress + Constants.relativeFileUpload + "/xmlslides?room=" + _room;
|
||||
log.presentation("PresentationApplication::loadPresentation()... " + fullUri);
|
||||
trace("PresentationApplication::loadPresentation()... " + fullUri);
|
||||
model.presentationLoaded = false;
|
||||
|
||||
var service:PresentationService = new PresentationService(fullUri, this);
|
||||
|
@ -0,0 +1,44 @@
|
||||
package org.bigbluebutton.modules.presentation.model
|
||||
{
|
||||
import org.puremvc.as3.multicore.interfaces.IProxy;
|
||||
import org.puremvc.as3.multicore.patterns.proxy.Proxy;
|
||||
|
||||
public class PresentationProxy extends Proxy implements IProxy
|
||||
{
|
||||
public function PresentationProxy(proxyName:String=null, data:Object=null)
|
||||
{
|
||||
super(proxyName, data);
|
||||
}
|
||||
|
||||
public function getProxyName():String
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public function setData(data:Object):void
|
||||
{
|
||||
}
|
||||
|
||||
public function getData():Object
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public function onRegister():void
|
||||
{
|
||||
}
|
||||
|
||||
public function sendNotification(notificationName:String, body:Object=null, type:String=null):void
|
||||
{
|
||||
}
|
||||
|
||||
public function onRemove():void
|
||||
{
|
||||
}
|
||||
|
||||
public function initializeNotifier(key:String):void
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -42,7 +42,6 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
private var _connUri : String;
|
||||
private var connectionId : Number;
|
||||
private var connected : Boolean = false;
|
||||
private var log : LogModuleFacade = LogModuleFacade.getInstance("LogModule");
|
||||
|
||||
/**
|
||||
* The default constructor
|
||||
@ -75,7 +74,7 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
|
||||
try {
|
||||
_connUri = host + "/presentation/" + room;
|
||||
log.info( "Connecting to <b>" + _connUri + "</b>");
|
||||
trace( "Connecting to <b>" + _connUri + "</b>");
|
||||
netConnection.connect(_connUri );
|
||||
|
||||
} catch( e : ArgumentError ) {
|
||||
|
@ -30,7 +30,6 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
import org.bigbluebutton.modules.presentation.controller.notifiers.ProgressNotifier;
|
||||
import org.bigbluebutton.modules.presentation.controller.notifiers.ZoomNotifier;
|
||||
import org.bigbluebutton.modules.presentation.model.PresentationModel;
|
||||
import org.bigbluebutton.modules.presentation.model.vo.SlidesDeck;
|
||||
import org.puremvc.as3.multicore.interfaces.IProxy;
|
||||
import org.puremvc.as3.multicore.patterns.proxy.Proxy;
|
||||
|
||||
@ -50,6 +49,7 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
private static const PRESENTER : String = "presenter";
|
||||
private static const SHARING : String = "sharing";
|
||||
private static const UPDATE_MESSAGE : String = "updateMessage";
|
||||
private static const CURRENT_PAGE : String = "currentPage";
|
||||
|
||||
private static const UPDATE_RC : String = "UPDATE";
|
||||
private static const SUCCESS_RC : String = "SUCCESS";
|
||||
@ -126,28 +126,6 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
connDelegate.disconnect();
|
||||
}
|
||||
|
||||
/**
|
||||
* Send an event out to the server to go to a new page in the SlidesDeck
|
||||
* @param page
|
||||
*
|
||||
*/
|
||||
public function gotoPage(page : Number) : void
|
||||
{
|
||||
presentationSO.send("gotoPageCallback", page);
|
||||
}
|
||||
|
||||
/**
|
||||
* A callback method. It is called after the gotoPage method has successfully executed on the server
|
||||
* The method sets the clients view to the page number received
|
||||
* @param page
|
||||
*
|
||||
*/
|
||||
public function gotoPageCallback(page : Number) : void
|
||||
{
|
||||
presentation.decks.selected = page;
|
||||
sendNotification(PresentationFacade.UPDATE_PAGE, page);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send an event to the server to update the clients with a new slide zoom ratio
|
||||
* @param slideHeight
|
||||
@ -247,6 +225,30 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
trace("Assign presenter control to [" + name + "]");
|
||||
}
|
||||
|
||||
/**
|
||||
* Send an event out to the server to go to a new page in the SlidesDeck
|
||||
* @param page
|
||||
*
|
||||
*/
|
||||
public function gotoPage(page : Number) : void
|
||||
{
|
||||
// presentationSO.send("gotoPageCallback", page);
|
||||
trace("Going to page " + page);
|
||||
presentationSO.setProperty(CURRENT_PAGE, {number : page});
|
||||
}
|
||||
|
||||
/**
|
||||
* A callback method. It is called after the gotoPage method has successfully executed on the server
|
||||
* The method sets the clients view to the page number received
|
||||
* @param page
|
||||
*
|
||||
*/
|
||||
public function gotoPageCallback(page : Number) : void
|
||||
{
|
||||
presentation.decks.selected = page;
|
||||
sendNotification(PresentationFacade.UPDATE_PAGE, page);
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop sharing the presentation
|
||||
*
|
||||
@ -390,7 +392,15 @@ package org.bigbluebutton.modules.presentation.model.business
|
||||
}
|
||||
sendNotification(PresentationFacade.CLEAR_EVENT);
|
||||
}
|
||||
break
|
||||
break;
|
||||
|
||||
case CURRENT_PAGE :
|
||||
// if (oldValue != null) {
|
||||
presentation.decks.selected = presentationSO.data.currentPage.number;
|
||||
trace("Current page is " + presentationSO.data.currentPage.number);
|
||||
sendNotification(PresentationFacade.UPDATE_PAGE, presentationSO.data.currentPage.number);
|
||||
// }
|
||||
break;
|
||||
|
||||
default:
|
||||
trace( "default =[" + code + "," + name + "," + oldValue + "]");
|
||||
|
@ -61,25 +61,25 @@ package org.bigbluebutton.modules.presentation.model.vo
|
||||
this.title = presentation.description;
|
||||
this.selected = 0;
|
||||
|
||||
//log.debug("Presentation: name=[" + name + "] title=[" + title + "]");
|
||||
trace("Presentation: name=[" + name + "] title=[" + title + "]");
|
||||
|
||||
if (presentation.slide == null) {
|
||||
//log.debug("Presentation: slide = null");
|
||||
trace("Presentation: slide = null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (presentation.slide.length == null) {
|
||||
//log.debug("Presentation: slidesName = [" + presentation.slide.name + "]");
|
||||
//log.debug("Presentation: slidesName = [" + presentation.slide.source + "]");
|
||||
trace("Presentation: slidesName = [" + presentation.slide.name + "]");
|
||||
trace("Presentation: slidesName = [" + presentation.slide.source + "]");
|
||||
|
||||
slide = new Slide(presentation.slide);
|
||||
slides.addItem(slide);
|
||||
} else {
|
||||
//log.debug("Presentation: slides = [" + presentation.slide.length + "]");
|
||||
trace("Presentation: slides = [" + presentation.slide.length + "]");
|
||||
|
||||
for (var i:int=0; i < presentation.slide.length; i++)
|
||||
{
|
||||
//log.debug("Creating slide[" + i + "]");
|
||||
trace("Creating slide[" + i + "]");
|
||||
|
||||
slide = new Slide(presentation.slide[i]);
|
||||
slides.addItem(slide);
|
||||
|
@ -0,0 +1,71 @@
|
||||
package org.bigbluebutton.common
|
||||
{
|
||||
import flexunit.framework.TestCase;
|
||||
import flexunit.framework.TestSuite;
|
||||
|
||||
import org.bigbluebutton.common.InputPipe;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.interfaces.IPipeMessage;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.messages.Message;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.plumbing.PipeListener;
|
||||
|
||||
public class InputPipeTest extends TestCase
|
||||
{
|
||||
public function InputPipeTest(methodName:String=null)
|
||||
{
|
||||
super(methodName);
|
||||
}
|
||||
|
||||
public static function suite():TestSuite
|
||||
{
|
||||
var ts:TestSuite = new TestSuite();
|
||||
|
||||
ts.addTest( new InputPipeTest( "testSendToInputPipe" ) );
|
||||
return ts;
|
||||
}
|
||||
|
||||
public function testSendToInputPipe():void
|
||||
{
|
||||
// create a message
|
||||
var messageToSend:IPipeMessage = new Message( Message.NORMAL,
|
||||
{ SRC:'MAIN_APP' },
|
||||
new XML(<testMessage testAtt='Hello'/>),
|
||||
Message.PRIORITY_HIGH );
|
||||
|
||||
var listener:PipeListener = new PipeListener( this,callBackMethod );
|
||||
var inPipe : InputPipe = new InputPipe("PIPENAME");
|
||||
|
||||
// connect the listener to the pipe and write the message
|
||||
var connected:Boolean = inPipe.connect(listener);
|
||||
var written:Boolean = inPipe.write( messageToSend );
|
||||
assertTrue( "Connected to inputPipe", connected == true);
|
||||
assertTrue( "PipeName is PIPENAME", inPipe.name == "PIPENAME");
|
||||
assertTrue( "Expecting messageReceived.getHeader().SRC == 'MAIN_APP'",
|
||||
messageReceived.getHeader().SRC == 'MAIN_APP');
|
||||
assertTrue( "Expecting messageReceived.getBody().@testAtt == 'Hello'",
|
||||
messageReceived.getBody().@testAtt == 'Hello');
|
||||
assertTrue( "Expecting messageReceived.getPriority() == Message.PRIORITY_HIGH",
|
||||
messageReceived.getPriority() == Message.PRIORITY_HIGH);
|
||||
}
|
||||
|
||||
/**
|
||||
* Recipient of message.
|
||||
* <P>
|
||||
* Used by <code>callBackMedhod</code> as a place to store
|
||||
* the recieved message.</P>
|
||||
*/
|
||||
private var messageReceived:IPipeMessage;
|
||||
|
||||
/**
|
||||
* Callback given to <code>PipeListener</code> for incoming message.
|
||||
* <P>
|
||||
* Used by <code>testReceiveMessageViaPipeListener</code>
|
||||
* to get the output of pipe back into this test to see
|
||||
* that a message passes through the pipe.</P>
|
||||
*/
|
||||
private function callBackMethod(message:IPipeMessage):void
|
||||
{
|
||||
this.messageReceived = message;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,78 @@
|
||||
package org.bigbluebutton.common
|
||||
{
|
||||
import flexunit.framework.TestCase;
|
||||
import flexunit.framework.TestSuite;
|
||||
|
||||
import org.bigbluebutton.common.OutputPipe;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.interfaces.IPipeFitting;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.interfaces.IPipeMessage;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.messages.Message;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.plumbing.Pipe;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.plumbing.PipeListener;
|
||||
|
||||
public class OutputPipeTest extends TestCase
|
||||
{
|
||||
|
||||
public function OutputPipeTest(methodName:String=null)
|
||||
{
|
||||
super(methodName);
|
||||
}
|
||||
|
||||
public static function suite():TestSuite
|
||||
{
|
||||
var ts:TestSuite = new TestSuite();
|
||||
|
||||
ts.addTest( new OutputPipeTest( "testReceivingFromOutputPipe" ) );
|
||||
return ts;
|
||||
}
|
||||
|
||||
public function testReceivingFromOutputPipe():void
|
||||
{
|
||||
// create a message
|
||||
var messageToSend:IPipeMessage = new Message( Message.NORMAL,
|
||||
{ SRC:'MAIN_APP' },
|
||||
new XML(<testMessage testAtt='Hello'/>),
|
||||
Message.PRIORITY_HIGH );
|
||||
|
||||
// create pipe and listener
|
||||
var pipe:IPipeFitting = new Pipe();
|
||||
var listener:PipeListener = new PipeListener( this,callBackMethod );
|
||||
var outPipe : OutputPipe = new OutputPipe("PIPENAME");
|
||||
|
||||
// connect the listener to the pipe and write the message
|
||||
var connected:Boolean = pipe.connect(listener);
|
||||
|
||||
var connectedToOutput:Boolean = outPipe.connect(pipe);
|
||||
var written:Boolean = outPipe.write( messageToSend );
|
||||
assertTrue( "Connected to OutputPipe", connectedToOutput == true);
|
||||
assertTrue( "PipeName is PIPENAME", outPipe.name == "PIPENAME");
|
||||
assertTrue( "Expecting messageReceived.getHeader().SRC == 'MAIN_APP'",
|
||||
messageReceived.getHeader().SRC == 'MAIN_APP');
|
||||
assertTrue( "Expecting messageReceived.getBody().@testAtt == 'Hello'",
|
||||
messageReceived.getBody().@testAtt == 'Hello');
|
||||
assertTrue( "Expecting messageReceived.getPriority() == Message.PRIORITY_HIGH",
|
||||
messageReceived.getPriority() == Message.PRIORITY_HIGH);
|
||||
}
|
||||
|
||||
/**
|
||||
* Recipient of message.
|
||||
* <P>
|
||||
* Used by <code>callBackMedhod</code> as a place to store
|
||||
* the recieved message.</P>
|
||||
*/
|
||||
private var messageReceived:IPipeMessage;
|
||||
|
||||
/**
|
||||
* Callback given to <code>PipeListener</code> for incoming message.
|
||||
* <P>
|
||||
* Used by <code>testReceiveMessageViaPipeListener</code>
|
||||
* to get the output of pipe back into this test to see
|
||||
* that a message passes through the pipe.</P>
|
||||
*/
|
||||
private function callBackMethod(message:IPipeMessage):void
|
||||
{
|
||||
this.messageReceived = message;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,80 @@
|
||||
package org.bigbluebutton.common
|
||||
{
|
||||
import flexunit.framework.TestCase;
|
||||
import flexunit.framework.TestSuite;
|
||||
|
||||
import org.bigbluebutton.common.InputPipe;
|
||||
import org.bigbluebutton.common.OutputPipe;
|
||||
import org.bigbluebutton.common.Router;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.interfaces.IPipeMessage;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.messages.Message;
|
||||
import org.puremvc.as3.multicore.utilities.pipes.plumbing.PipeListener;
|
||||
|
||||
public class RouterTest extends TestCase
|
||||
{
|
||||
public function RouterTest(methodName:String=null)
|
||||
{
|
||||
super(methodName);
|
||||
}
|
||||
|
||||
public override function setUp():void
|
||||
{
|
||||
}
|
||||
|
||||
public static function suite():TestSuite {
|
||||
var ts:TestSuite = new TestSuite();
|
||||
|
||||
ts.addTest( new RouterTest( "testSendSuccess" ) );
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
public function testSendSuccess():void
|
||||
{
|
||||
var router : Router = new Router();
|
||||
var input : InputPipe = new InputPipe("LOGGERINPUT");
|
||||
var output : OutputPipe = new OutputPipe("MAINOUTPUT");
|
||||
router.registerInputPipe(input.name, input);
|
||||
router.registerOutputPipe(output.name, output);
|
||||
var listener:PipeListener = new PipeListener( this,callBackMethod );
|
||||
var connected : Boolean = input.connect(listener);
|
||||
|
||||
// create a message
|
||||
var messageToSend:IPipeMessage = new Message( Message.NORMAL,
|
||||
{ SRC:'MAININPUT', TO: 'LOGGERINPUT' },
|
||||
new XML(<testMessage testAtt='Hello'/>),
|
||||
Message.PRIORITY_HIGH );
|
||||
|
||||
var written:Boolean = output.write( messageToSend );
|
||||
assertTrue( "Connected to input", connected == true);
|
||||
assertTrue( "InputPipe PipeName is LOGGERINPUT", input.name == "LOGGERINPUT");
|
||||
assertTrue( "Expecting messageReceived.getHeader().SRC == 'MAININPUT'",
|
||||
messageReceived.getHeader().SRC == 'MAININPUT');
|
||||
assertTrue( "Expecting messageReceived.getBody().@testAtt == 'Hello'",
|
||||
messageReceived.getBody().@testAtt == 'Hello');
|
||||
assertTrue( "Expecting messageReceived.getPriority() == Message.PRIORITY_HIGH",
|
||||
messageReceived.getPriority() == Message.PRIORITY_HIGH);
|
||||
}
|
||||
|
||||
/**
|
||||
* Recipient of message.
|
||||
* <P>
|
||||
* Used by <code>callBackMedhod</code> as a place to store
|
||||
* the recieved message.</P>
|
||||
*/
|
||||
private var messageReceived:IPipeMessage;
|
||||
|
||||
/**
|
||||
* Callback given to <code>PipeListener</code> for incoming message.
|
||||
* <P>
|
||||
* Used by <code>testReceiveMessageViaPipeListener</code>
|
||||
* to get the output of pipe back into this test to see
|
||||
* that a message passes through the pipe.</P>
|
||||
*/
|
||||
private function callBackMethod(message:IPipeMessage):void
|
||||
{
|
||||
this.messageReceived = message;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,17 @@
|
||||
package org.bigbluebutton.modules.presentation
|
||||
{
|
||||
import flash.net.FileReference;
|
||||
import flash.net.URLRequest;
|
||||
|
||||
public class MockFileReference extends FileReference
|
||||
{
|
||||
public function MockFileReference()
|
||||
{
|
||||
}
|
||||
|
||||
override public function upload(request:URLRequest, uploadDataFieldName:String="Filedata", testUpload:Boolean=false):void{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -0,0 +1,23 @@
|
||||
package org.bigbluebutton.modules.presentation
|
||||
{
|
||||
import mx.rpc.IResponder;
|
||||
|
||||
public class MockResponder implements IResponder
|
||||
{
|
||||
public var receivedFault:Boolean = false;
|
||||
public var receivedResult:Boolean = false;
|
||||
|
||||
public function MockResponder()
|
||||
{
|
||||
}
|
||||
|
||||
public function fault(info:Object):void{
|
||||
this.receivedFault = true;
|
||||
}
|
||||
|
||||
public function result(event:Object):void{
|
||||
this.receivedResult = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user