Author: solomax
Date: Wed Nov 23 13:43:12 2016
New Revision: 1770968
URL: http://svn.apache.org/viewvc?rev=1770968&view=rev
Log:
[OPENMEETINGS-1488] code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1770968&r1=1770967&r2=1770968&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Wed Nov 23 13:43:12 2016
@@ -98,17 +98,15 @@
, allowUserQuestions:
this.roomobj.allowUserQuestions
, roomName: this.roomobj.name
});
- if ($debug) Debug.write("GROUPS!!! ", this.roomobj.roomGroups);
- if (this.roomobj.roomGroups) {
+ //if ($debug) Debug.write("GROUPS!!! ",
this.roomobj.roomGroups);
+ if (!!this.roomobj.roomGroups &&
!!this.roomobj.roomGroups.length) {
var g = this.roomobj.roomGroups[0].group;
- if ($debug) Debug.write("GROUPS!!! ", g);
m._group_logo.setAttribute('src', canvas.getUrl() +
"group/" + g.id + "?anticache=" + new Date().getTime());
m._group_logo.setAttribute("visible", true);
if (g.tag) {
m._group_tag.setAttribute("text", g.tag);
m._group_tag.setAttribute("visible", true);
}
- if ($debug) Debug.write("GROUPS!!! ", m);
}
if (roomobj.appointment) {
canvas.appointmentNotificationPopUp = new
lz.appointmentNotificationPopUp(this,{name:'appDetail', roomobj:this.roomobj });
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1770968&r1=1770967&r2=1770968&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Wed Nov 23 13:43:12 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
@@ -35,7 +35,6 @@
<view y="24">
-
<dtmfButton text="1" x="20" dtmf="1"/>
<dtmfButton text="2" x="40" dtmf="2"/>
<dtmfButton text="3" x="60" dtmf="3"/>
@@ -46,22 +45,17 @@
<dtmfButton text="7" x="20" y="40" dtmf="7"/>
<dtmfButton text="8" x="40" y="40" dtmf="8"/>
- <dtmfButton text="9" x="60" y="40" dtmf="9"/>
-
+ <dtmfButton text="9" x="60" y="40" dtmf="9"/>
<dtmfButton text="10" x="20" y="60" dtmf="10"/>
-
</view>
-
-
</class>
<class name="baseConferenceRoom" extends="baseContentView"
destroyByMethod="true" >
-
- <attribute name="roomobj" value="null" />
-
+ <attribute name="roomobj" value="null" />
+
<handler name="oninit">
<![CDATA[
- if ($debug) Debug.write("baseConferenceRoom:: oninit");
+ if ($debug) Debug.write("baseConferenceRoom:: oninit");
_mainScrollBar.setAttribute("visibility","hidden");
if ($debug) Debug.write("roomobj: ",this.roomobj);
@@ -75,7 +69,7 @@
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
]]>
</handler>
-
+
<handler name="onkeydown" reference="lz.Keys" args="keyCode">
<