You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/02/20 19:06:13 UTC
svn commit: r1291395 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/src:
base/components/explorer/ base/components/text/
modules/conference/whiteboard/base/
modules/conference/whiteboard/panels/maintoolspanel/
modules/conference/whiteboard/...
Author: sebawagner
Date: Mon Feb 20 18:06:12 2012
New Revision: 1291395
URL: http://svn.apache.org/viewvc?rev=1291395&view=rev
Log:
OPENMEETINGS-65 Load playback component 100% in width/height in whiteboard, drag and drop makes no sense with the video playing in the SWF10 container.
Fix several runtime Nullpointer-Exceptions
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/whiteboardMiniButton.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/dragItemFileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx Mon Feb 20 18:06:12 2012
@@ -223,7 +223,7 @@
//check for dockable stuff which is connected to this Box
for (var eg in this.parent.subviews){
//check that you do not calc with yourself
- if (this.parent.subviews[eg]!=this && this.parent.subviews[eg].docking){
+ if (this.parent.subviews[eg]!=this && this.parent.subviews[eg]["docking"] && this.parent.subviews[eg].docking){
// there are 4 cases which have to be proofed to check every possible situation
var proof=false;
@@ -251,7 +251,7 @@
for (var eg in this.parent.subviews){
//check that you do not calc with yourself
- if (this.parent.subviews[eg]!=this && this.parent.subviews[eg].docking){
+ if (this.parent.subviews[eg]!=this && this.parent.subviews[eg]["docking"] && this.parent.subviews[eg].docking){
// there are 4 cases which have to be proofed to check every possible situation
//left box-border
if ( ( ((this.x+this.width)-this.parent.subviews[eg].x) < this.dockingbarrier ) && ( ((this.x+this.width)-this.parent.subviews[eg].x) > -this.dockingbarrier ) && ( (this.y+this.height) > this.parent.subviews[eg].y ) && ( this.y < (this.parent.subviews[eg].y+this.parent.subviews[eg].height) ) ){
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/text/labelTooltip.lzx Mon Feb 20 18:06:12 2012
@@ -61,19 +61,27 @@
} else {
yVal -= 24;
}
- this.holder.setAttribute('x',xVal);
- this.holder.setAttribute('y',yVal);
+ if (this.holder!=null) {
+ this.holder.setAttribute('x',xVal);
+ this.holder.setAttribute('y',yVal);
+ }
]]>
</handler>
<handler name="onmouseout" reference="this.parent">
- this.holder.destroy();
+ this.cleanHolder();
</handler>
<handler name="onmouseup" reference="this.parent">
- this.holder.destroy();
+ this.cleanHolder();
</handler>
<handler name="onclick" reference="this.parent">
- this.holder.destroy();
- </handler>
+ this.cleanHolder();
+ </handler>
+ <method name="cleanHolder">
+ if (this.holder!=null) {
+ this.holder.destroy();
+ this.holder = null;
+ }
+ </method>
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
<method name="setLabelId" args="_labelid" >
this.labelid = _labelid;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx Mon Feb 20 18:06:12 2012
@@ -739,18 +739,20 @@
- <method name="playVideoSynced" args="fileExplorerItemId,fileName">
+ <method name="playVideoSynced" args="fileExplorerItemId,fileName,flv_width,flv_height">
<![CDATA[
- if ($debug) Debug.write("playVideoSynced : ",fileExplorerItemId);
+ if ($debug) Debug.write("playVideoSynced : ",fileExplorerItemId,fileName,flv_width,flv_height);
var tName = 'flv'+this.getCounter();
- this.currentlayer = new lz.whiteboardVideoPlayer(this,{
+ this.currentlayer = new lz.whiteboardVideoPlayer(parent.parent,{
name:tName,
fileExplorerItemId:fileExplorerItemId,
title:fileName,
- sendInit:true
+ sendInit:true,
+ flv_width:flv_width,
+ flv_height:flv_height
});
this.layers.push(this.currentlayer);
@@ -763,26 +765,32 @@
if ($debug) Debug.write("sendNewVideoRemote : ",refObj.fileExplorerItemId,refObj.title);
this.flvregisterFinal(refObj.name,refObj.x,refObj.y,refObj.width,refObj.height,
- refObj.fileExplorerItemId,refObj.title,false,this.getZIndex());
+ refObj.fileExplorerItemId,refObj.title,
+ false, //isPlaying
+ refObj.flv_width,
+ refObj.flv_height,
+ this.getZIndex());
]]>
</method>
- <method name="flvregisterFinal" args="newName,x,y,width,height,fileExplorerItemId,fileName,isPlaying,zIndex">
+ <method name="flvregisterFinal" args="newName,x,y,width,height,fileExplorerItemId,fileName,isPlaying,flv_width,flv_height,zIndex">
var actionObject = new Array();
actionObject[0] = 'flv';
actionObject[1] = fileExplorerItemId;
actionObject[2] = fileName;
- actionObject[3] = isPlaying;
- actionObject[4] = zIndex;//-8
- actionObject[5] = null;//-7
- actionObject[6] = this.counter;//-6
- actionObject[7] = x;//-5
- actionObject[8] = y;//-4
- actionObject[9] = width;//-3
- actionObject[10] = height;//-2
- actionObject[11] = newName;//-1
+ actionObject[3] = isPlaying;
+ actionObject[4] = flv_width;
+ actionObject[5] = flv_height;
+ actionObject[6] = zIndex;//-8
+ actionObject[7] = null;//-7
+ actionObject[8] = this.counter;//-6
+ actionObject[9] = x;//-5
+ actionObject[10] = y;//-4
+ actionObject[11] = width;//-3
+ actionObject[12] = height;//-2
+ actionObject[13] = newName;//-1
this.baseactionobjectList.push(actionObject);
this.onsharedMessage('draw',actionObject);
</method>
@@ -792,14 +800,12 @@
if ($debug) Debug.write("drawFlvToHistory PLAY :: ",lastActionObject[3]);
- this.currentlayer = new lz.whiteboardVideoPlayer(this,{
+ this.currentlayer = new lz.whiteboardVideoPlayer(parent.parent,{
name:lastActionObject[lastActionObject.length-1],
fileExplorerItemId:lastActionObject[1],
title:lastActionObject[2],
- x:lastActionObject[lastActionObject.length-5],
- y:lastActionObject[lastActionObject.length-4],
- width:lastActionObject[lastActionObject.length-3],
- height:lastActionObject[lastActionObject.length-2]
+ flv_width:lastActionObject[4],
+ flv_height:lastActionObject[5]
});
if (lastActionObject[3]) {
@@ -810,6 +816,12 @@
]]>
</method>
+ <!--
+ x:lastActionObject[lastActionObject.length-5],
+ y:lastActionObject[lastActionObject.length-4],
+ width:lastActionObject[lastActionObject.length-3],
+ height:lastActionObject[lastActionObject.length-2]
+ -->
<method name="playFLV" args="refObj,play">
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx Mon Feb 20 18:06:12 2012
@@ -20,9 +20,9 @@
-->
<library>
-<class name="whiteboardVideoPlayer" extends="guiPresenter" y="100"
- docking="true" resizeable="true" closable="false" width="322"
- x="$once{ parent.width/2 - this.width/2 }" height="300">
+<class name="whiteboardVideoPlayer" extends="guiPresenter"
+ docking="false" resizeable="false" closable="true" minimizable="false"
+ x="0" y="0" width="${ parent.width }" height="${ parent.height }">
<attribute name="fileExplorerItemId" value="0" type="number" />
@@ -37,6 +37,10 @@
<attribute name="sendInit" value="false" type="boolean" />
+ <attribute name="flv_width" value="0" type="number" />
+
+ <attribute name="flv_height" value="0" type="number" />
+
<handler name="oninit">
this.timerDelegate = new LzDelegate( this, "calcProgressBar" );
if ($debug) Debug.write("whiteboardVideoPlayer :: ",this.fileExplorerItemId);
@@ -100,29 +104,69 @@
</method>
<method name="startStream">
-
- if (!this.isLoaded) {
- return;
- }
-
- if ($debug) Debug.write("startStream ",this.recordingName);
-
- if (this.recordingName != "") {
-
- this.isPaused = false;
-
- if (!this.timerDelegateStarted) {
- this.timerDelegateStarted = true;
- lz.Timer.addTimer( this.timerDelegate , 1000 );
+ <![CDATA[
+ if (!this.isLoaded) {
+ return;
+ }
+
+ if ($debug) Debug.write("startStream ",this.recordingName);
+
+ if (this.recordingName != "") {
+
+ this.isPaused = false;
+
+ if (!this.timerDelegateStarted) {
+ this.timerDelegateStarted = true;
+ lz.Timer.addTimer( this.timerDelegate , 1000 );
+ }
+
+ this._content._videostream.bringToFront();
+
+ if ($debug) Debug.write("PLAY STREAM ",this.recordingName);
+
+ var tObjectDimension = calcVideoWidthHeight();
+
+ if ($debug) Debug.write("SEND ",this.recordingName,0,tObjectDimension.x,tObjectDimension.y,tObjectDimension.width,tObjectDimension.height);
+
+ // this._content._videostream.playStream(this.recordingName,0,tObjectDimension.x,tObjectDimension.y,tObjectDimension.width,tObjectDimension.height);
+ }
+ ]]>
+ </method>
+
+ <!---
+ calculates the new x, y, width and height of the video so that it is 100%
+ visible in the container
+ -->
+ <method name="calcVideoWidthHeight">
+ <![CDATA[
+
+ if ($debug) Debug.write("calcVideoWidthHeight ",this.flv_width,this.flv_height);
+
+ var ratio = this.flv_width / this.flv_height;
+
+ //max height of container is new height of video;
+ //calc new width and x-position of video
+ var newHeight = this.height;
+ var newWidth = ratio * newHeight;
+ var newx = (this.width - newWidth) / 2;
+ var newy = 0;
+
+ if ($debug) Debug.write("calcVideoWidthHeight",ratio,this.width,this.height,newWidth,newHeight,newx,newy);
+
+ if (newWidth > this.width) {
+ newWidth = this.width;
+ newHeight = newWidth / ratio;
+ newx = 0;
+ newy = (this.height - newHeight) / 2;
}
- this._content._videostream.bringToFront();
-
- if ($debug) Debug.write("PLAY STREAM ",this.recordingName);
-
- this._content._videostream.playStream(this.recordingName,0);
- }
- </method>
+ var t = {'x':newx,'y':newy,'width':newWidth,'height':newHeight};
+
+ if ($debug) Debug.write("t",t);
+
+ return {'x':newx,'y':newy,'width':newWidth,'height':newHeight};
+ ]]>
+ </method>
<method name="calcProgressBar">
<![CDATA[
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx Mon Feb 20 18:06:12 2012
@@ -123,7 +123,9 @@
<mainToolsPanelItem name="clipart" modi="clipart" labelid="1323" >
<handler name="oninit">
- this._bgIcon.setAttribute("visibility","hidden");
+ if (this["_bgIcon"]) {
+ this._bgIcon.setAttribute("visibility","hidden");
+ }
var imageurl = canvas.protocol + '://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
+'public/cliparts/thumb/'
+canvas._drawarea.currentClipArtRessourceName;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Mon Feb 20 18:06:12 2012
@@ -99,7 +99,7 @@
this._content.changeOpacitySlider.setEnabled(false);
}
- if (drawmodus == 'letter'){
+ if (drawArea.drawmodus == 'letter'){
this._content._italic.setAttribute('enabled',true);
this._content._bold.setAttribute('enabled',true);
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Mon Feb 20 18:06:12 2012
@@ -115,11 +115,11 @@
////Debug.write(" g[image] ",storedImageDate);
if (storedImageDate["clearField"] && !storedImageDate["askagainclear"]){
canvas._drawarea.setModus('plain');
- Debug.write(" canvas._drawarea.addNewImage 1 ",this.downloadurl,this.x,this.y);
+ if ($debug) Debug.write(" canvas._drawarea.addNewImage 1 ",this.downloadurl,this.x,this.y);
canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
} else if (!storedImageDate["askagainclear"] && !storedImageDate["clearField"]){
canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
- Debug.write(" canvas._drawarea.addNewImage 2 ",this.downloadurl,this.x,this.y);
+ if ($debug) Debug.write(" canvas._drawarea.addNewImage 2 ",this.downloadurl,this.x,this.y);
} else if (storedImageDate["askagainclear"]){
this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/whiteboardMiniButton.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/conference/whiteboard/whiteboardMiniButton.lzx Mon Feb 20 18:06:12 2012
@@ -167,7 +167,7 @@
</view>
<text y="1" name="_long" text="..." fgcolor="0xFFFFFF"
- x="${ parent.width-28 }" fontsize="$once{ canvas.defaultFontSize }" />
+ x="${ parent.width-28 }" fontsize="10" />
<labelTooltip text="${ parent.btnName }" />
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/dragItemFileExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/dragItemFileExplorer.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/dragItemFileExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/dragItemFileExplorer.lzx Mon Feb 20 18:06:12 2012
@@ -70,6 +70,7 @@
</handler>
<method name="close">
+ <![CDATA[
//This can happen when the confirmation pops up
if (this.alreadySent) {
return;
@@ -86,7 +87,7 @@
if ($debug) Debug.write("this.overItem ",this.overItem);
- if (this.overItem.isTrashCan) {
+ if (this.overItem["isTrashCan"] && this.overItem.isTrashCan) {
if ($debug) Debug.write("SEND TO GARBAGE");
this.fileExplorerItemId = this.refObj.fileExplorerItemId;
new lz.confirmationSingle(canvas,{
@@ -95,7 +96,7 @@
labeliderror:713,
showCheckBox:false
});
- } else if (this.overItem.isFolder){
+ } else if (this.overItem["isFolder"] && this.overItem.isFolder){
if ($debug) Debug.write("MOVE ITEM",this.refObj.fileExplorerItemId);
if ($debug) Debug.write("MOVE TO PARENT",this.overItem.fileExplorerItemId);
this.fileExplorerItemId = this.refObj.fileExplorerItemId;
@@ -133,7 +134,7 @@
} else {
this.destroy();
}
-
+ ]]>
</method>
<method name="sendConfirmation" args="bool,askAgain">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx Mon Feb 20 18:06:12 2012
@@ -143,8 +143,7 @@
<method name="playVideo" args="itemObj">
this.selectItem(itemObj);
-
- canvas._drawarea.playVideoSynced(itemObj.fileExplorerItemId,itemObj.fileName);
+ canvas._drawarea.playVideoSynced(itemObj.fileExplorerItemId,itemObj.fileName,itemObj.flvWidth,itemObj.flvHeight);
</method>
<method name="loadFiles">
@@ -158,7 +157,6 @@
this.getFileExplorerByRoomSelf.setAttribute("src",downloadurl);
if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest 1 ",downloadurl);
- if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest 2 ",downloadurl.src);
this.getFileExplorerByRoomSelf.doRequest();
}
]]>
@@ -400,6 +398,8 @@
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
fileIcon:'file_explorer_video_rsc',
+ flvHeight:fileExplorerItem.flvHeight,
+ flvWidth:fileExplorerItem.flvWidth,
refObjListRoot:this
});
} else if (fileExplorerItem.isStoredWmlFile) {
@@ -478,6 +478,8 @@
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
fileIcon:'file_explorer_video_rsc',
+ flvHeight:fileExplorerItem.flvHeight,
+ flvWidth:fileExplorerItem.flvWidth,
refObjListRoot:this
});
} else if (fileExplorerItem.isStoredWmlFile) {
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1291395&r1=1291394&r2=1291395&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/treeitems/baseFileExplorerItem.lzx Mon Feb 20 18:06:12 2012
@@ -330,7 +330,11 @@
<method name="deselectItem">
this.selected = false;
- this._fileName.setAttribute("bgcolor",0xFFFFFF);
+ if (this["_fileName"]) {
+ this._fileName.setAttribute("bgcolor",0xFFFFFF);
+ } else {
+ if ($debug) Debug.warn("deselectItem:: _fileName is NULL ",this);
+ }
</method>
<method name="clearContent">
@@ -428,6 +432,8 @@
fileHash:fileExplorerItem.fileHash,
isFolder:false,isImage:true,
fileIcon:'file_explorer_video_rsc',
+ flvHeight:fileExplorerItem.flvHeight,
+ flvWidth:fileExplorerItem.flvWidth,
refObjListRoot:this.refObjListRoot
});
} else if (fileExplorerItem.isStoredWmlFile) {