Author: solomax
Date: Wed Dec 21 10:01:17 2016
New Revision: 1775382
URL: http://svn.apache.org/viewvc?rev=1775382&view=rev
Log:
[OPENMEETINGS-1376] refresh icon is added
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/functions.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx
Wed Dec 21 10:01:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/omMiniIcon.lzx
Wed Dec 21 10:01:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/externalJavaScript.lzx
Wed Dec 21 10:01:17 2016
@@ -35,41 +35,48 @@
if ($debug) Debug.write("showAvSettings ", isInterview);
canvas.commonVideoViewContent.createEditRecordStream(isInterview);
});
-
+ ExternalInterface.addCallback("refreshAv", function(uid) {
+ if ($debug) Debug.write("refreshAv ", uid);
+ var vid =
canvas.commonVideoViewContent.getVideoObjectByPublicSID(uid);
+ if (!!vid) {
+ vid.resync();
+ }
+ });
+
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
var browserInfoReturnObject = null;
var browserLangReturnObject = null;
-
+
function redirectToUrl(url, returnObject) {
redirectToUrlReturnObject = returnObject;
ExternalInterface.call("redirectToUrl", url);
}
-
+
function redirectToUrlCallback(returnValue) {
if ($debug) Debug.write("redirectToUrlCallback ",returnValue);
if (redirectToUrlReturnObject != null) {
redirectToUrlReturnObject.callback(returnValue);
}
}
-
+
function getBrowserInfo(returnObject) {
browserInfoReturnObject = returnObject;
ExternalInterface.call("getBrowserInfo");
}
-
+
function getBrowserInfoCallback(returnValue) {
if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
if (browserInfoReturnObject != null) {
browserInfoReturnObject.callback(returnValue);
}
}
-
+
function getBrowserLang(returnObject) {
browserLangReturnObject = returnObject;
ExternalInterface.call("getBrowserLang");
}
-
+
function getBrowserLangCallback(returnValue) {
if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
if (browserLangReturnObject != null) {
@@ -78,5 +85,4 @@
}
]]>
</script>
-
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/functions.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/functions.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/functions.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/functions.lzx
Wed Dec 21 10:01:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,29 +24,28 @@
<![CDATA[
var labelObj;
-
+
var tempActionForNavi = null;
// Load Labels from List
var labels = new Object();
String.prototype.startsWith = function(prefix) {
- return (this.indexOf(prefix) === 0);
-};
+ return (this.indexOf(prefix) === 0);
+};
var _labelObject = new Array();
-
var RegExpTooltiplist = null;
function disablesTooltips(obj){
- if(RegExpTooltiplist!=null){
- RegExpTooltiplist.destroy();
- RegExpTooltiplist=null;
- }
- RegExpTooltiplist = obj;
+ if (RegExpTooltiplist != null){
+ RegExpTooltiplist.destroy();
+ RegExpTooltiplist = null;
+ }
+ RegExpTooltiplist = obj;
}
-function setLabelObject(lableObj){
+function setLabelObject(lableObj) {
_labelObject = lableObj;
}
@@ -65,216 +64,212 @@ function getLabelNameGlob(labelid){
}
}
}
-
+
var currentMouseWheelObject = null;
-
+
function setCurrentMouseWheelObject(obj) {
- currentMouseWheelObject=obj;
-}
+ currentMouseWheelObject = obj;
+}
function getCurrentMouseWheelObject(obj) {
- return currentMouseWheelObject;
-}
+ return currentMouseWheelObject;
+}
function disableCurrentMouseWheelObject() {
- currentMouseWheelObject=null;
-}
-
+ currentMouseWheelObject = null;
+}
function setLabelObjectByHundred(no, obj){
- for (var i = 0; i < obj.length; ++i) {
- labels["id" + obj[i].id] = obj[i].value;
- }
+ for (var i = 0; i < obj.length; ++i) {
+ labels["id" + obj[i].id] = obj[i].value;
+ }
}
-
function getLabelTag(labelid){
var l = labels["id" + labelid];
if (l == undefined) {
l = "Error Missing [" + labelid + "]";
}
- return l;
+ return l;
}
-
function setLabelObject(labelObjRef){
- // if($debug) Debug.write("FUNC/setLabelObject",labelObjRef);
- labelObj = labelObjRef;
+ // if($debug) Debug.write("FUNC/setLabelObject",labelObjRef);
+ labelObj = labelObjRef;
}
function getLabelNameXMLCRM(labelid){
- // if($debug) Debug.write("FUNC/getLabelNameXMLCRM",labelid);
- for (var i=0;i<labelObj.length;i++){
- if (labelid==labelObj[i].fieldvalues_id){
- return labelObj[i].value;
- }
- }
-
+ // if($debug) Debug.write("FUNC/getLabelNameXMLCRM",labelid);
+ for (var i=0;i<labelObj.length;i++){
+ if (labelid==labelObj[i].fieldvalues_id){
+ return labelObj[i].value;
+ }
+ }
}
function getStringTime(){
- var dateObj = new Date();
- var hours = dateObj.getHours();
- if (hours<10) hours="0"+hours;
- var minutes = dateObj.getMinutes();
- if (minutes<10) minutes="0"+minutes;
- return ''+hours+':'+minutes;
+ var dateObj = new Date();
+ var hours = dateObj.getHours();
+ if (hours<10) hours="0"+hours;
+ var minutes = dateObj.getMinutes();
+ if (minutes<10) minutes="0"+minutes;
+ return ''+hours+':'+minutes;
}
function getStringTimeWithSeconds(){
- var dateObj = new Date();
- var hours = dateObj.getHours();
- if (hours<10) hours="0"+hours;
- var minutes = dateObj.getMinutes();
- if (minutes<10) minutes="0"+minutes;
- var seconds = dateObj.getSeconds();
- if (seconds<10) seconds="0"+seconds;
- return ''+hours+':'+minutes+':'+seconds;
+ var dateObj = new Date();
+ var hours = dateObj.getHours();
+ if (hours<10) hours="0"+hours;
+ var minutes = dateObj.getMinutes();
+ if (minutes<10) minutes="0"+minutes;
+ var seconds = dateObj.getSeconds();
+ if (seconds<10) seconds="0"+seconds;
+ return ''+hours+':'+minutes+':'+seconds;
}
function parseDateToString(dateObj){
- // if($debug) Debug.write("FUNC/parseDateToString",dateObj);
- if (dateObj==null) return "";
- var d = dateObj.getDate();
- if (d<10) d = "0"+d;
- var m = dateObj.getMonth()+1;
- if (m<10) m = "0"+m;
- var y = dateObj.getFullYear();
- if (y<10) y = "0"+y;
- return d+'.'+m+'.'+y;
+ // if($debug) Debug.write("FUNC/parseDateToString",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var m = dateObj.getMonth()+1;
+ if (m<10) m = "0"+m;
+ var y = dateObj.getFullYear();
+ if (y<10) y = "0"+y;
+ return d+'.'+m+'.'+y;
}
function parseDateToStringTimeOnly(dateObj){
- // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
- if (dateObj==null) return "";
- var d = dateObj.getDate();
- if (d<10) d = "0"+d;
- var mo = dateObj.getMonth()+1;
- if (mo<10) mo = "0"+mo;
- var y = dateObj.getFullYear();
- if (y<10) y = "0"+y;
- var h = dateObj.getHours();
- if (h<10) h = "0"+h;
- var m = dateObj.getMinutes();
- if (m<10) m = "0"+m;
- return h+':'+m;
+ // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var mo = dateObj.getMonth()+1;
+ if (mo<10) mo = "0"+mo;
+ var y = dateObj.getFullYear();
+ if (y<10) y = "0"+y;
+ var h = dateObj.getHours();
+ if (h<10) h = "0"+h;
+ var m = dateObj.getMinutes();
+ if (m<10) m = "0"+m;
+ return h+':'+m;
}
function parseTimeStringToDate(t){
- // if($debug) Debug.write("FUNC/parseStringToTime",t);
- if (t.length==5){
- var d = 1;
- var m = 1;
- var y = 1970;
- var std = Number(t.substring(0, 2));
- var min = Number(t.substring(3, 5));
- if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
- if ($debug) Debug.write("parseTimeStringToDate: ",new Date(y, m-1,
d, std, min))
- return new Date(y, m-1, d, std, min);
- } else {
- return new Date();
- }
- } else {
- return new Date();
- }
+ // if($debug) Debug.write("FUNC/parseStringToTime",t);
+ if (t.length==5){
+ var d = 1;
+ var m = 1;
+ var y = 1970;
+ var std = Number(t.substring(0, 2));
+ var min = Number(t.substring(3, 5));
+ if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
+ if ($debug) Debug.write("parseTimeStringToDate: ",new
Date(y, m-1, d, std, min))
+ return new Date(y, m-1, d, std, min);
+ } else {
+ return new Date();
+ }
+ } else {
+ return new Date();
+ }
}
function parseDateToStringTime(dateObj){
- // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
- if (dateObj==null) return "";
- var d = dateObj.getDate();
- if (d<10) d = "0"+d;
- var mo = dateObj.getMonth()+1;
- if (mo<10) mo = "0"+mo;
- var y = dateObj.getFullYear();
- if (y<10) y = "0"+y;
- var h = dateObj.getHours();
- if (h<10) h = "0"+h;
- var m = dateObj.getMinutes();
- if (m<10) m = "0"+m;
- return d+'.'+mo+'.'+y+' '+h+':'+m;
+ // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var mo = dateObj.getMonth()+1;
+ if (mo<10) mo = "0"+mo;
+ var y = dateObj.getFullYear();
+ if (y<10) y = "0"+y;
+ var h = dateObj.getHours();
+ if (h<10) h = "0"+h;
+ var m = dateObj.getMinutes();
+ if (m<10) m = "0"+m;
+ return d+'.'+mo+'.'+y+' '+h+':'+m;
}
function parseDateToStringTimeSeconds(dateObj){
- // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
- if (dateObj==null) return "";
- var d = dateObj.getDate();
- if (d<10) d = "0"+d;
- var mo = dateObj.getMonth()+1;
- if (mo<10) mo = "0"+mo;
- var y = dateObj.getFullYear();
- if (y<10) y = "0"+y;
- var h = dateObj.getHours();
- if (h<10) h = "0"+h;
- var m = dateObj.getMinutes();
- if (m<10) m = "0"+m;
- var s = dateObj.getSeconds();
- if (s<10) s = "0"+s;
- return d+'.'+mo+'.'+y+' '+h+':'+m+':'+s;
+ // if($debug) Debug.write("FUNC/parseDateToStringTime",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var mo = dateObj.getMonth()+1;
+ if (mo<10) mo = "0"+mo;
+ var y = dateObj.getFullYear();
+ if (y<10) y = "0"+y;
+ var h = dateObj.getHours();
+ if (h<10) h = "0"+h;
+ var m = dateObj.getMinutes();
+ if (m<10) m = "0"+m;
+ var s = dateObj.getSeconds();
+ if (s<10) s = "0"+s;
+ return d+'.'+mo+'.'+y+' '+h+':'+m+':'+s;
}
function parseStringToDate(t){
- // if($debug) Debug.write("FUNC/parseStringToDate",t);
- if (t.length==10){
- var d = Number(t.substring(0, 2));
- var m = Number(t.substring(3, 5));
- var y = Number(t.substring(6, 10));
- if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
- return new Date(y, m-1, d);
- } else {
- return new Date();
- }
- } else {
- return new Date();
- }
+ // if($debug) Debug.write("FUNC/parseStringToDate",t);
+ if (t.length==10){
+ var d = Number(t.substring(0, 2));
+ var m = Number(t.substring(3, 5));
+ var y = Number(t.substring(6, 10));
+ if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
+ return new Date(y, m-1, d);
+ } else {
+ return new Date();
+ }
+ } else {
+ return new Date();
+ }
}
function parseStringToDateTime(t){
- // if($debug) Debug.write("FUNC/parseStringToDate",t);
- if (t.length==15){
- var d = Number(t.substring(0, 2));
- var m = Number(t.substring(3, 5));
- var y = Number(t.substring(6, 10));
- var h = Number(t.substring(10, 12));
- var min = Number(t.substring(13, 15));
- if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
- if ($debug) Debug.write("parseStringToDateTime+: ",new Date(y,
m-1, d, h, min))
- return new Date(y, m-1, d, h, min);
- } else {
- return new Date();
- }
- } else {
- return new Date();
- }
+ // if($debug) Debug.write("FUNC/parseStringToDate",t);
+ if (t.length==15){
+ var d = Number(t.substring(0, 2));
+ var m = Number(t.substring(3, 5));
+ var y = Number(t.substring(6, 10));
+ var h = Number(t.substring(10, 12));
+ var min = Number(t.substring(13, 15));
+ if (!isNaN(d) && !isNaN(m) && !isNaN(y)){
+ if ($debug) Debug.write("parseStringToDateTime+: ",new
Date(y, m-1, d, h, min))
+ return new Date(y, m-1, d, h, min);
+ } else {
+ return new Date();
+ }
+ } else {
+ return new Date();
+ }
}
function getStringDateFileSave(){
- // if($debug) Debug.write("FUNC/getStringDateFileSave");
- var dateObj = new Date();
- var hours = dateObj.getHours();
- if (hours<10) hours="0"+hours;
- var minutes = dateObj.getMinutes();
- if (minutes<10) minutes="0"+minutes;
- var date = dateObj.getDate();
- if (date<10) date="0"+date;
- var month = dateObj.getMonth()+1;
- if (month<10) month="0"+month;
- return date+'_'+month+'_'+dateObj.getFullYear()+'_at_'+hours+'_'+minutes;
+ // if($debug) Debug.write("FUNC/getStringDateFileSave");
+ var dateObj = new Date();
+ var hours = dateObj.getHours();
+ if (hours<10) hours="0"+hours;
+ var minutes = dateObj.getMinutes();
+ if (minutes<10) minutes="0"+minutes;
+ var date = dateObj.getDate();
+ if (date<10) date="0"+date;
+ var month = dateObj.getMonth()+1;
+ if (month<10) month="0"+month;
+ return
date+'_'+month+'_'+dateObj.getFullYear()+'_at_'+hours+'_'+minutes;
}
function getStringTimeByTimeStamp(tStamp){
- if ($debug) Debug.write("getStringTimeByTimeStamp "+tStamp);
- var dateObj = new Date(tStamp);
- var hours = dateObj.getHours();
- if (hours<10) hours="0"+hours;
- var minutes = dateObj.getMinutes();
- if (minutes<10) minutes="0"+minutes;
- var seconds = dateObj.getSeconds();
- if (seconds<10) seconds="0"+seconds;
- return ''+hours+':'+minutes+':'+seconds;
-}
+ if ($debug) Debug.write("getStringTimeByTimeStamp "+tStamp);
+ var dateObj = new Date(tStamp);
+ var hours = dateObj.getHours();
+ if (hours<10) hours="0"+hours;
+ var minutes = dateObj.getMinutes();
+ if (minutes<10) minutes="0"+minutes;
+ var seconds = dateObj.getSeconds();
+ if (seconds<10) seconds="0"+seconds;
+ return ''+hours+':'+minutes+':'+seconds;
+}
function strtrim(str)
{
- for(var i = 0; str.charCodeAt(i) < 33; i++);
- for(var j = str.length-1; str.charCodeAt(j) < 33; j--);
- return str.substring(i, j+1);
+ for(var i = 0; str.charCodeAt(i) < 33; i++);
+ for(var j = str.length-1; str.charCodeAt(j) < 33; j--);
+ return str.substring(i, j+1);
}
function parseDateTimeStringFromXmlString(str) {
@@ -289,7 +284,7 @@ function parseDateTimeStringFromXmlStrin
return ""+tDay+"."+tMonth+"."+tYear+" "+tHour+":"+tMin;
}
-function parseDateStringFromXmlString(str) {
+function parseDateStringFromXmlString(str) {
//0123456789012345678901234567890
//2012-03-08T06:30:00.000+01:00
//2012-03-11T15:00:00.713Z
@@ -299,7 +294,7 @@ function parseDateStringFromXmlString(st
return ""+tDay+"."+tMonth+"."+tYear;
}
-function parseTimeStringFromXmlString(str) {
+function parseTimeStringFromXmlString(str) {
//0123456789012345678901234567890
//2012-03-08T06:30:00.000+01:00
//2012-03-11T15:00:00.713Z
@@ -314,14 +309,13 @@ function parseTimeStringFromXmlString(st
* sample strings:
* 2012-03-05
*/
-function parseDateOnlyFromXmlString(str) {
+function parseDateOnlyFromXmlString(str) {
var tYear = str.substr(0,4);
var tMonth = str.substr(5,2);
var tDay = str.substr(8,2);
return new Date(tYear,Number(tMonth)-1,tDay);
}
-
/*
* parse date from string
* sample strings:
@@ -344,24 +338,22 @@ function parseDateTimeFromXmlString(str)
*
*/
function parseDateToRestDateCalendar(dateObj){
- if($debug) Debug.write("FUNC/parseDateToStringTime 1",dateObj);
- if (dateObj==null) return "";
- var d = dateObj.getDate();
- if (d<10) d = "0"+d;
- var mo = dateObj.getMonth()+1;
- if (mo<10) mo = "0"+mo;
- var y = dateObj.getFullYear();
- var h = dateObj.getHours();
- if (h<10) h = "0"+h;
- var m = dateObj.getMinutes();
- if (m<10) m = "0"+m;
- var s = dateObj.getSeconds();
- if (s<10) s = "0"+s;
- if($debug) Debug.write("FUNC/parseDateToStringTime
2",""+y+"-"+mo+"-"+d+"T"+h+":"+m+":"+s);
- return ""+y+"-"+mo+"-"+d+"T"+h+":"+m+":"+s;
+ if($debug) Debug.write("FUNC/parseDateToStringTime 1",dateObj);
+ if (dateObj==null) return "";
+ var d = dateObj.getDate();
+ if (d<10) d = "0"+d;
+ var mo = dateObj.getMonth()+1;
+ if (mo<10) mo = "0"+mo;
+ var y = dateObj.getFullYear();
+ var h = dateObj.getHours();
+ if (h<10) h = "0"+h;
+ var m = dateObj.getMinutes();
+ if (m<10) m = "0"+m;
+ var s = dateObj.getSeconds();
+ if (s<10) s = "0"+s;
+ if($debug) Debug.write("FUNC/parseDateToStringTime
2",""+y+"-"+mo+"-"+d+"T"+h+":"+m+":"+s);
+ return ""+y+"-"+mo+"-"+d+"T"+h+":"+m+":"+s;
}
-
]]>
</script>
-
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Wed Dec 21 10:01:17 2016
@@ -733,12 +733,22 @@
return val != null ? val : def;
</method>
+ <method name="getAVmode" args="g">
+ var settings = canvas.currentClient.avsettings;
+ if (!settings) {
+ settings = getAvSetting('avstored', g, 'av'); //stored
av settings are overriden by HTML5 (need to be merged)
+ if (!settings) {
+ settings = 'n';
+ }
+ }
+ return settings;
+ </method>
+
<method name="_startAvBroadcast" args="restart=false">
var g = canvas.commonVideoViewContent.loadAVsettings();
- var settings = getAvSetting('avstored', g, 'av');
var vWidth = canvas.isInterview ? 320 : getAvSetting('width',
g, 120);
var vHeight = canvas.isInterview ? 260 : getAvSetting('height',
g, 90);
- setUserAVSettings.avsetting = settings;
+ setUserAVSettings.avsetting = getAVmode(g);
setUserAVSettings.vWidth = vWidth;
setUserAVSettings.vHeight = vHeight;
setUserAVSettings.vHeight = vHeight;
@@ -768,8 +778,9 @@
<![CDATA[
var g = canvas.commonVideoViewContent.loadAVsettings();
var myvideocontainer = createVideoObject(canvas.publicSID,
true, canvas.currentClient.interviewPodId, canvas.currentClient);
- if ($debug) Debug.write("doStartConference::doninitalize");
- var settings = getAvSetting('avstored', g, 'av');
+ if ($debug) Debug.write("startAvBroadcast::doninitalize");
+ var settings = getAVmode(g);
+ if ($debug) Debug.write("startAvBroadcast::mode, ", settings,
canvas.currentClient.avsettings);
var vWidth = canvas.isInterview ? 320 : getAvSetting('width',
g, 120);
var vHeight = canvas.isInterview ? 260 : getAvSetting('height',
g, 90);
if (!canvas.isInterview) {
@@ -788,28 +799,22 @@
case "av":
videoview.broadcast(canvas.currentClient.broadCastID, _camera, _micro);
myvideocontainer.setAttribute("visible", true);
- if(!canvas.isInterview) {
- if (myvideocontainer.minimized) {
- myvideocontainer.reminimize();
- }
+ if(!canvas.isInterview &&
myvideocontainer.minimized) {
+ myvideocontainer.reminimize();
}
break;
case "a":
videoview.broadcast(canvas.currentClient.broadCastID, null, _micro);
myvideocontainer.setAttribute("visible", true);
- if(!canvas.isInterview) {
- if (!myvideocontainer.minimized) {
- myvideocontainer.minimize();
- }
+ if(!canvas.isInterview &&
!myvideocontainer.minimized) {
+ myvideocontainer.minimize();
}
break;
case "v":
videoview.broadcast(canvas.currentClient.broadCastID, _camera, null);
myvideocontainer.setAttribute("visible", true);
- if(!canvas.isInterview) {
- if (myvideocontainer.minimized) {
- myvideocontainer.reminimize();
- }
+ if(!canvas.isInterview &&
myvideocontainer.minimized) {
+ myvideocontainer.reminimize();
}
break;
case "n":
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
Wed Dec 21 10:01:17 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -58,18 +58,18 @@
<attribute name="typeOfObject" value="swf" type="string" />
<!-- holds the reference_id to the SyncProcess -->
- <attribute name="uniqueObjectSyncName" value="" type="string" />
+ <attribute name="uniqueObjectSyncName" value="" type="string" />
<attribute name="swfUrl" value="" type="string" />
<omMiniIcon name="_swfView" play="false" imgUrl="${ parent.swfUrl }">
- <switch>
- <when property="$as3">
- <passthrough>
- import flash.display.*;
- </passthrough>
- </when>
- </switch>
- <!-- Do not send update events in case
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.display.*;
+ </passthrough>
+ </when>
+ </switch>
+ <!-- Do not send update events in case
this is sync event broadcasted by another user -->
<attribute name="doSendChangeValue" value="false"
type="boolean" />
<attribute name="mc"/>
@@ -187,7 +187,7 @@
this.parent.currentzoomFactor =
this.parent.currentzoom;
}
- this.parent.refObj.layers.push(this.parent);
+ this.parent.refObj.layers.push(this.parent);
this.doSendChangeValue = true;
]]>
@@ -199,7 +199,7 @@
this.parent.initwidth = this.width;
this.parent.initheight = this.height;
-
+
//only send syncCommand if alterModus is true (meaning
that this is the Moderator)
//otherwise just send a notification to moderator that
this iamge has been loaded
if (this.parent.recorderModus) {
@@ -209,7 +209,7 @@
} else {
this.parent.refObj.sendLoadNotificationSWF(this.parent);
}
- this.parent.refObj.layers.push(this.parent);
+ this.parent.refObj.layers.push(this.parent);
this.oninit.sendEvent();
]]>
@@ -221,7 +221,7 @@
this.parent.initwidth = this.width;
this.parent.initheight = this.height;
-
+
//only send syncCommand if alterModus is true (meaning
that this is the Moderator)
//otherwise just send a notification to moderator that
this iamge has been loaded
if (this.parent.recorderModus) {
@@ -231,7 +231,7 @@
} else {
this.parent.refObj.sendLoadNotificationSWF(this.parent);
}
- this.parent.refObj.layers.push(this.parent);
+ this.parent.refObj.layers.push(this.parent);
this.oninit.sendEvent();
]]>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
Wed Dec 21 10:01:17 2016
@@ -91,22 +91,17 @@
<simplelayout axis="x" spacing="2" />
<mainToolsPanelItem name="plain" modi="plainConfirm" labelid="69"
resourceItem="plain" setSelectionToItem="false" />
<mainToolsPanelItem name="plainSlide" modi="plainSlide" labelid="1005"
resourceItem="plainSlides" setSelectionToItem="false" />
- <!--
- <mainToolsPanelItem name="drag" modi="drag" labelid="1113"
resourceItem="arrow_draw_panel_tool_cursor" />
- -->
<mainToolsPanelItem name="saveobj" modi="saveobj" labelid="197"
resourceItem="saveobj" setSelectionToItem="false" />
<mainToolsVPanelSeperator>
- <attribute name="modi" value="" type="string"/>
- </mainToolsVPanelSeperator>
+ <attribute name="modi" value="" type="string"/>
+ </mainToolsVPanelSeperator>
<redoUndoToolsPanelItem name="revert" doredo="false" labelid="70"
resourceItem="revert" />
<mainToolsVPanelSeperator>
- <attribute name="modi" value="" type="string"/>
- </mainToolsVPanelSeperator>
- <mainToolsPanelItem name="hand" modi="hand" labelid="72"
_isselected="true"
- resourceItem="menupointer_rsc"
/>
- <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard"
- labelid="557"
resourceItem="pointer_whiteboard_menu_rsc" />
+ <attribute name="modi" value="" type="string"/>
+ </mainToolsVPanelSeperator>
+ <mainToolsPanelItem name="hand" modi="hand" labelid="72"
_isselected="true" resourceItem="menupointer_rsc" />
+ <mainToolsPanelItem name="pointerWhiteboard" modi="pointerWhiteboard"
labelid="557" resourceItem="pointer_whiteboard_menu_rsc" />
<mainToolsPanelItem name="letter" modi="letter" labelid="73"
resourceItem="letter" />
<mainToolsPanelItem name="paint" modi="paint" labelid="74"
resourceItem="paint" />
<mainToolsPanelItem name="line" modi="line" labelid="75"
resourceItem="line_rsc" />
@@ -115,36 +110,31 @@
<mainToolsPanelItem name="ellipse" modi="ellipse" labelid="78"
resourceItem="ellipse" />
<mainToolsPanelItem name="drawarrow" modi="drawarrow" labelid="79"
resourceItem="drawarrowicon_rsc" />
<mainToolsPanelItem name="clipart" modi="clipart" labelid="1323" >
-
- <handler name="oninit">
- if (this["_bgIcon"]) {
- this._bgIcon.setAttribute("visible", false);
- }
- var imageurl = canvas.getUrl() + 'public/cliparts/thumb/'
- +
canvas._drawarea.currentClipArtRessourceName;
-
- this._rscIcon.setSource(imageurl);
- </handler>
-
- <view x="$once{ parent.x_insetResource }" y="$once{
parent.x_insetResource }"
- height="18" width="18" stretches="both" name="_bgIconIcon" />
-
- <view resource="sub_menu_tools_panel_rsc"
- x="$once{ parent.width - 10 }" y="$once{ parent.height - 10 }">
- <handler name="onclick">
- if ($debug) Debug.write("Show Sub Menu");
- new lz.subMenuIconToolsToUpload(canvas,{
- x:500,
- y:82,
- refToolbar:parent
- });
- </handler>
- <labelTooltip labelid="1335" />
- </view>
-
- </mainToolsPanelItem>
-</class>
+ <handler name="oninit">
+ if (!!this["_bgIcon"]) {
+ this._bgIcon.setAttribute("visible", false);
+ }
+ var imageurl = canvas.getUrl() +
'public/cliparts/thumb/' + canvas._drawarea.currentClipArtRessourceName;
+ //if ($debug) Debug.write("!!!!!! CLIPART:: ",
imageurl);
+ _rscIcon.setAttribute("src", imageurl);
+ </handler>
+
+ <view x="$once{ parent.x_insetResource }" y="$once{
parent.x_insetResource }"
+ height="18" width="18" stretches="both"
name="_bgIconIcon" />
+ <view resource="sub_menu_tools_panel_rsc" x="$once{
parent.width - 10 }" y="$once{ parent.height - 10 }">
+ <handler name="onclick">
+ if ($debug) Debug.write("Show Sub Menu");
+ new lz.subMenuIconToolsToUpload(canvas,{
+ x:500,
+ y:82,
+ refToolbar:parent
+ });
+ </handler>
+ <labelTooltip labelid="1335" />
+ </view>
+ </mainToolsPanelItem>
+</class>
<class name="mainToolsTopPanel" extends="baseTopPanel"
width="420" height="33" title="" docking="true"
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanelItem.lzx
Wed Dec 21 10:01:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,8 +20,7 @@
-->
<library>
-<class name="mainToolsPanelItem" extends="blueButton"
- width="26" height="26">
+<class name="mainToolsPanelItem" extends="blueButton" width="26" height="26">
<attribute name="modi" value="" type="string" />
<attribute name="labelid" value="0" type="number" />
@@ -34,8 +33,8 @@
</handler>
<method name="setSelectionWithoutEvent">
- parent.parent.parent.setSelectionWithoutEvent(this);
- </method>
+ parent.parent.parent.setSelectionWithoutEvent(this);
+ </method>
<handler name="onmouseup">
//if ($debug)
Debug.write("parent.parent.parent",parent.parent.parent);
@@ -47,19 +46,18 @@
<class name="redoUndoToolsPanelItem" extends="mainToolsPanelItem"
setSelectionToItem="false">
<attribute name="doredo" value="true" type="boolean" />
<handler name="onclick">
- if(this.doredo){
- this.parent.parent.parent.parent._drawareaMask._drawarea.doredo();
- } else {
-
this.parent.parent.parent.parent._drawareaMask._drawarea.undoredo();
- }
- </handler>
+ if(this.doredo){
+
this.parent.parent.parent.parent._drawareaMask._drawarea.doredo();
+ } else {
+
this.parent.parent.parent.parent._drawareaMask._drawarea.undoredo();
+ }
+ </handler>
</class>
<class name="mainToolsHPanelSeperator" extends="view" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }"
- width="26" height="1" ></class>
-
+ width="26" height="1" />
+
<class name="mainToolsVPanelSeperator" extends="view" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }"
- width="1" height="26" ></class>
+ width="1" height="26" />
-
</library>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Wed Dec 21 10:01:17 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/baseVideoObject.lzx
Wed Dec 21 10:01:17 2016
@@ -306,7 +306,7 @@
if (this.subviews[eg].name != "_toolbar"
&& this.subviews[eg].name !=
"_innertop"
&& this.subviews[eg].name !=
"_loudness") {
-
this.subviews[eg].setAttribute("visibility","hidden");
+
this.subviews[eg].setAttribute("visibility","hidden");
}
}
@@ -344,7 +344,7 @@
&&
this.subviews[eg].name != "_innertop"
&&
this.subviews[eg].name != "_loudness"
&&
this.subviews[eg].name != "_innerbottom") {
-
this.subviews[eg].setAttribute("visibility","visible");
+
this.subviews[eg].setAttribute("visibility","visible");
}
}
if (isMicrophonesRoom) {
@@ -404,15 +404,19 @@
</handler>
</view>
+ <method name="resync">
+ resetValues();
+ if (!isremote) {
+
canvas.commonVideoViewContent._startAvBroadcast(true);
+ }
+ </method>
+
<view name="_toolbar" x="${ parent.width-this.width-2 }"
layout="axis:x;spacing:0" y="2">
<attribute name="isload" value="true" type="boolean" />
<miniIconsPresenter name="_resync"
iconRessourceName="resyncuser_rsc">
<handler name="onclick">
- parent.parent.resetValues();
- if (!parent.parent.isremote) {
-
canvas.commonVideoViewContent._startAvBroadcast(true)
- }
+ parent.parent.resync();
</handler>
<labelTooltip name="_tip" labelid="540" />
</miniIconsPresenter>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/videoObjectPlayBroadcast.lzx
Wed Dec 21 10:01:17 2016
@@ -22,8 +22,7 @@
<!--- Contains no microphone or camera Object, this view can only
subscribe
to a video or live-stream -->
- <class name="videoObjectPlayBroadcast" extends="baseVideoObject"
- isremote="true">
+ <class name="videoObjectPlayBroadcast" extends="baseVideoObject"
isremote="true">
<attribute name="interviewPodId" value="-1" />
<attribute name="ratioW" value="1" />
<attribute name="ratioH" value="1" />
@@ -44,13 +43,12 @@
<!--- Change the video resolution by chaning pod size -->
<method name="setDefaultVideoSize" args="w,h">
this.initRatio = w / h;
- this.setAttribute("width",w+this.videoInsetX);
+ this.setAttribute("width", w + this.videoInsetX);
if (canvas.currentRoomObj.showMicrophoneStatus) {
-
this.setAttribute("bottomBarHeight",this._innertop.height + 1);
+ this.setAttribute("bottomBarHeight",
this._innertop.height + 1);
}
-
-
this.setAttribute("height",h+this.videoInsetY+this.bottomBarHeight);
+ this.setAttribute("height", (minimized ? 0 : h) +
this.videoInsetY + this.bottomBarHeight);
</method>
<view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
y="$once{ parent.videoInsetY-1 }"
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java?rev=1775382&r1=1775381&r2=1775382&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
Wed Dec 21 10:01:17 2016
@@ -18,15 +18,13 @@
*/
package org.apache.openmeetings.web.room.sidebar.icon;
-import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
-
import org.apache.openmeetings.web.app.Client;
+import org.apache.openmeetings.web.app.Client.Activity;
import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.room.RoomPanel.Action;
public class RefreshIcon extends ClientIcon {
private static final long serialVersionUID = 1L;
-
+
public RefreshIcon(String id, Client client, RoomPanel room) {
super(id, client, room);
mainCssClass = "restart ";
@@ -36,20 +34,20 @@ public class RefreshIcon extends ClientI
protected String getTitle() {
return getString("610");
}
-
+
@Override
protected String getAlign() {
return ALIGN_RIGHT;
}
-
+
@Override
protected boolean isClickable() {
- return false;//TODO broadcasting return self ||
room.getClient().hasRight(right) && !client.hasRight(Right.superModerator);
+ return client.hasActivity(Activity.broadcastA) ||
client.hasActivity(Activity.broadcastV);
}
-
+
@Override
protected String getScript() {
- return String.format("%s('%s', '%s');", FUNC_ACTION,
Action.refresh.name(), client.getUid());
+ return
String.format("document.getElementById('lzapp').refreshAv('%s');",
client.getUid());
}
@Override
