You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/12/22 06:30:27 UTC

svn commit: r1775576 - in /openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer: dynamicFileName.lzx fileExplorer.lzx treeitems/baseFileExplorerItem.lzx treeitems/folderFileExplorerItem.lzx

Author: solomax
Date: Thu Dec 22 06:30:27 2016
New Revision: 1775576

URL: http://svn.apache.org/viewvc?rev=1775576&view=rev
Log:
[OPENMEETINGS-1523] inplace file/folder editing works as expected

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx?rev=1775576&r1=1775575&r2=1775576&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx Thu Dec 22 06:30:27 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
@@ -57,7 +57,7 @@
 	<method name="rename">
 	<![CDATA[
 		var moveLoader = new RestCall({
-				url: canvas.getUrl() + 'services/file/rename/' + this.refObj.fileId + '/' + this.text
+				url: canvas.getUrl() + 'services/file/rename/' + this.refObj.fileId + '/' + encodeURIComponent(this.text)
 				, method: URLRequestMethod.POST
 				, errorCallback: renameError
 				, successCallback: renameComplete

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1775576&r1=1775575&r2=1775576&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx Thu Dec 22 06:30:27 2016
@@ -8,19 +8,18 @@
   "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
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <library>
 
-
 <!-- ###################
 	Class fileExplorer
  -->
@@ -36,14 +35,14 @@
 	<attribute name="rootFileLoader" />
 	<attribute name="createFileLoader"/>
 	<attribute name="createFileRefObj"/>
-	
+
 	<event name="onClose"/>
-	
+
 	<handler name="oninit">
 		canvas.currentFileExplorer = this;
 		lz.Track.register(this._trashBar._trashIcon, canvas.currentImagesListdraw.currentTrackGroupName);
 	</handler>
-	
+
 	<handler name="onvisible">
 		if ($debug) Debug.write("fileExplorer::onvisible this._selected ", this._selected);
 		//This is thrown whenever an uploaded Document has completed
@@ -53,33 +52,32 @@
 			this._selected.refresh();
 		}
 	</handler>
-	
+
 	<method name="selectItem" args="itemRef">
 		if (this._selected != null) {
 			this._selected.deselectItem();
 		}
-		
 		this._selected = itemRef;
 		this._selected.selectItem(null);
 	</method>
-	
+
 	<method name="addFile">
 	<![CDATA[
 		if ($debug) Debug.write("addFile :: ", this._selected);
-		
+
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
 			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
 			return;
 		}
-		
+
 		new lz.uploadWindowExplorer(canvas.main_content._content.inner, {x:60});
 	]]>
 	</method>
-	
+
 	<method name="getSelectedItem">
 		return this._selected ? this._selected : this._filearea._contentarea.subviews[0];
 	</method>
-	
+
 	<method name="getSelectedFolder">
 		var selF = getSelectedItem();
 		if (selF.type != 'Folder') {
@@ -88,7 +86,7 @@
 		}
 		return selF;
 	</method>
-	
+
 	<method name="addFolder">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
@@ -98,14 +96,12 @@
 		getSelectedFolder().addFolder();
 	]]>
 	</method>
-	
+
 	<method name="loadWmlFile" args="itemObj">
 		this.selectItem(itemObj);
-		canvas._drawarea.prepareLoadWMLFile(itemObj); 
-		//canvas._drawarea.loadObjectList(itemObj); 
+		canvas._drawarea.prepareLoadWMLFile(itemObj);
 	</method>
 
-	
 	<method name="loadDocument" args="itemObj">
 		this.selectItem(itemObj);
 		this._documentsTabs.setAttribute("height",20);
@@ -115,18 +111,15 @@
 						documentObj:itemObj,
 						refObjList:this
 					});
-		//t.sendToBack();
-		//this._bg1.sendToBack();
-		//this._bg2.sendToBack();
 		this._documentsTabs.bringToFront();
 		return t;
 	</method>
-	
+
 	<method name="playVideo" args="itemObj">
 		this.selectItem(itemObj);
 		canvas._drawarea.playVideoSynced(itemObj.fileId,itemObj.fileName,itemObj.flvWidth,itemObj.flvHeight);
 	</method>
-	
+
 	<method name="loadFiles">
 	<![CDATA[
 		if (!rootFileLoader) {
@@ -140,30 +133,30 @@
 		rootFileLoader.load('');
 	]]>
 	</method>
-	
+
 	<method name="loadFilesComplete" args="event">
 		var o = JSON.parse(event.target.data);
 		if ($debug) Debug.info("loadFilesComplete ", o);
 		createRootItems(o.fileExplorerObject);
 	</method>
-	
+
 	<method name="httpRequestError" args="event">
 		if ($debug) Debug.error("httpRequestError ", event);
 	</method>
-	
+
 	<method name="setSize" args="size, el">
 		var sizem = Math.round((size / 1024 / 1024) * 100) / 100;
 		el.setAttribute("text","" + sizem + " MBytes");
 	</method>
-		
+
 	<method name="createRootItems" args="roomObject">
 	<![CDATA[
 		this.clearContent();
 		if ($debug) Debug.info("createRootItems ", roomObject);
-		
+
 		setSize(roomObject.userHomeSize, this._userSpace._userHomeSize);
 		setSize(roomObject.roomHomeSize, this._userSpace._roomHomeSize);
-		
+
 		var userHome = new lz.rootFileExplorerItem(this._filearea._contentarea,{
 				open:true
 				, fileId: -1
@@ -177,7 +170,7 @@
 		userHome.icon_folder_pre.setAttribute("frame", 2);
 		userHome._folderIcon.setAttribute("frame", 2);
 		userHome.setNodes(roomObject.userHome);
-		
+
 		var roomHome = new lz.rootFileExplorerItem(this._filearea._contentarea,{
 				open: true
 				, fileId: -2
@@ -193,7 +186,7 @@
 		roomHome.setNodes(roomObject.roomHome);
 	]]>
 	</method>
-	
+
 	<method name="clearContent">
 	<![CDATA[
 		var area = this._filearea._contentarea;
@@ -203,7 +196,7 @@
 		}
 	]]>
 	</method>
-	
+
 	<method name="createFile" args="fileName, bytes, refObj, fileObj">
 	<![CDATA[
 		this.createFileRefObj = refObj;
@@ -243,42 +236,41 @@
 	<method name="createFileError" args="event">
 		this.createFileRefObj.createFileError(event);
 	</method>
-	
+
 	<!--
 		Borders
 	 -->
-			   
-	<view name="_border2" x="0" y="${ 33 + parent._documentsTabs.height }" width="$once{ parent.width }" 
-		  height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" />	 
-	
+
+	<view name="_border2" x="0" y="${ 33 + parent._documentsTabs.height }" width="$once{ parent.width }"
+			height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" />
+
 	<!--
 		Documents - Tabbar
-	 --> 
+	 -->
 	<documentsTabBar name="_documentsTabs" y="14" width="$once{ parent.width }"
-					visibility="hidden" />
-		
-	
+			visibility="hidden" />
+
 	<!--
 		File Tree Content Tabbar
-	 --> 
-	 
+	 -->
+
 	<view name="_fileBar" layout="axis:x" x="0" y="${ 14 + parent._documentsTabs.height }">
 		<baseChooseIconView labelid="702" height="20" width="19" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }"
-							resourceN="file_explorer_add_file_rsc">
+				resourceN="file_explorer_add_file_rsc">
 			<handler name="onclick">
 				if ($debug) Debug.write("Upload File");
 				parent.parent.addFile();
 			</handler>
 		</baseChooseIconView>
 		<baseChooseIconView labelid="703" height="20" width="19" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }"
-							resourceN="file_explorer_add_folder_rsc" >
+				resourceN="file_explorer_add_folder_rsc" >
 			<handler name="onclick">
 				if ($debug) Debug.write("Add Folder");
 				parent.parent.addFolder();
 			</handler>
 		</baseChooseIconView>
 		<baseChooseIconView labelid="704" height="20" width="19" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }"
-							resourceN="file_explorer_reload_rsc" >
+				resourceN="file_explorer_reload_rsc" >
 			<handler name="onclick">
 				if ($debug) Debug.write("Refresh Folder");
 				parent.parent.loadFiles();
@@ -286,14 +278,14 @@
 		</baseChooseIconView>
 		<view bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" height="20" width="1" />
 	</view>
-	
+
 	<!--
 		File Tree Content Trashbar
-	 --> 
-	 
-	<view name="_trashBar" layout="axis:x" x="$once{ parent.width - 20 }" 
+	 -->
+
+	<view name="_trashBar" layout="axis:x" x="$once{ parent.width - 20 }"
 		  y="${ 14 + parent._documentsTabs.height }">
-		<baseChooseIconView name="_trashIcon" labelid="705" height="20" width="19" 
+		<baseChooseIconView name="_trashIcon" labelid="705" height="20" width="19"
 						 resourceN="file_explorer_trash_rsc" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }">
 			<attribute name="isTrashCan" value="true" type="boolean" />
 			<handler name="onclick">
@@ -312,43 +304,40 @@
 			<handler name="onmousetrackup">
 				if ($debug) Debug.write("onmousetrackup");
 				this.onmouseout.sendEvent();
-			</handler> 
+			</handler>
 		</baseChooseIconView>
 		<view bgcolor="0xE0E0E0" height="20" width="1" />
 	</view>
-	
+
 	<!--
 		File Tree Content
-	 --> 
-	
+	 -->
+
 	<view name="_filearea" x="1" y="${ 34 + parent._documentsTabs.height }" clip="true"
-		  height="${ parent.height - 35 - parent._documentsTabs.height - parent._userSpace.height }" 
-		  width="$once{ parent.width }">
-		
+			height="${ parent.height - 35 - parent._documentsTabs.height - parent._userSpace.height }"
+			width="$once{ parent.width }">
+
 		<attribute name="currentTrackGroupName" value="fileExplorer" type="string" />
-		
 		<attribute name="currentDragItem" value="null" />
-		
+
 		<handler name="oninit">
 			canvas.currentImagesListdraw = this;
 		</handler>
-		
+
 		<view name="_contentarea" layout="axis:y;inset:1" />
-		
+
 		<om_vscrollbar name="_scrollbar" />
 		<om_hscrollbar name="_hscrollbar" />
 	</view>
-	
+
 	<view name="_userSpace" height="40" valign="bottom" width="$once{ parent.width }">
-		
 		<labelText name="_userHomeSizeLabel" labelid="923" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" />
-		
+
 		<labelText name="_userHomeSize" align="right" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" />
-		
+
 		<labelText name="_roomHomeSizeLabel" labelid="924" y="20" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" />
-		
+
 		<labelText name="_roomHomeSize" align="right" y="20" fgcolor="$once{ canvas.getThemeColor('menuTextColor') }" />
-		
 	</view>
 </class>
 </library>

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1775576&r1=1775575&r2=1775576&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx Thu Dec 22 06:30:27 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
@@ -47,35 +47,35 @@
 	<attribute name="isTrashCan" value="false" type="boolean" />
 	<attribute name="folderLoader" />
 	<attribute name="deleteLoader" />
-		
+
 	<handler name="oninit">
 		this.singleClickDelegate = new LzDelegate(this, "doSingleClick");
 		this.resetClickDelegate = new LzDelegate(this, "doResetSingleClick");
 		this.mouseDownClickDelegate = new LzDelegate(this, "doMouseDownClick");
 		if (this.type == 'Folder') {
-		    lz.Track.register(this._fileName, canvas.currentImagesListdraw.currentTrackGroupName);
+			lz.Track.register(this._fileName, canvas.currentImagesListdraw.currentTrackGroupName);
 		}
 	</handler>
-	
+
 	<method name="doOpen">
 		this.open = true;
 		if (this.type == 'Folder') {
-    		this.icon_folder_pre.setAttribute("frame",2);
-    		this.content.setAttribute("visibility","visible");
+			this.icon_folder_pre.setAttribute("frame",2);
+			this.content.setAttribute("visibility","visible");
 			this._folderIcon.setAttribute("frame",2);
-		    this.loadFiles();
+			this.loadFiles();
 		}
 	</method>
-	
+
 	<method name="doClose">
 		this.open = false;
 		if (this.type == 'Folder') {
-            this.icon_folder_pre.setAttribute("frame",1);
-            this.content.setAttribute("visibility","hidden");
-            this._folderIcon.setAttribute("frame",1);
+			this.icon_folder_pre.setAttribute("frame",1);
+			this.content.setAttribute("visibility","hidden");
+			this._folderIcon.setAttribute("frame",1);
 		}
 	</method>
-	
+
 	<method name="doMouseDownClick" args="itemObj">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
@@ -92,55 +92,55 @@
 			});
 	]]>
 	</method>
-    
-    <!--
-    	Check if this is the Owner
-     -->
-    <method name="checkForIsOwner">
-    	if (this.isRoot) {
-    		return this.isOwner;
-    	} else {
-    		return parent.parent.checkForIsOwner();
-    	}
-    </method>
-    
-    <!--
-    	Check if the user tries to move a file in its own tree,
-    	see moveFile
-     -->
-    <method name="checkForIsChild" args="compFileId">
-    	if (this.isRoot) {
-    		return false;
-    	} else {
-    		if (this.fileId == compFileId) {
-    			return true;
-    		} else {
-    			return parent.parent.checkForIsChild(compFileId);
-    		}
-    	}
-    </method>
-    
-    <method name="deleteFile" args="labelid">
-    	<![CDATA[
-			if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-	    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-	    		return;
-	    	}
-	    	new lz.confirmationSingle(canvas,{
-	                           refObj:this,
-	                           labelid:labelid,
-	                           labeliderror:713,
-	                           showCheckBox:false
-	                        });
-    	]]>
-    </method>
-    
-    <method name="sendConfirmation" args="bool,askAgain">
-        if (bool) {
-            this.deleteFileOrFolder();
-        }
-    </method>
-    
+
+	<!--
+		Check if this is the Owner
+	 -->
+	<method name="checkForIsOwner">
+		if (this.isRoot) {
+			return this.isOwner;
+		} else {
+			return parent.parent.checkForIsOwner();
+		}
+	</method>
+
+	<!--
+		Check if the user tries to move a file in its own tree,
+		see moveFile
+	 -->
+	<method name="checkForIsChild" args="compFileId">
+		if (this.isRoot) {
+			return false;
+		} else {
+			if (this.fileId == compFileId) {
+				return true;
+			} else {
+				return parent.parent.checkForIsChild(compFileId);
+			}
+		}
+	</method>
+	
+	<method name="deleteFile" args="labelid">
+	<![CDATA[
+		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
+		new lz.confirmationSingle(canvas,{
+					refObj:this,
+					labelid:labelid,
+					labeliderror:713,
+					showCheckBox:false
+				});
+	]]>
+	</method>
+	
+	<method name="sendConfirmation" args="bool,askAgain">
+		if (bool) {
+			this.deleteFileOrFolder();
+		}
+	</method>
+	
 	<method name="deleteFileOrFolder">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
@@ -161,7 +161,7 @@
 		deleteLoader.load('--dummy--');
 	]]>
 	</method>
-    
+	
 	<method name="deleteComplete" args="event">
 		var o = JSON.parse(event.target.data);
 		if ($debug) Debug.info("base::deleteComplete ", o);
@@ -169,7 +169,7 @@
 		this.parent.parent.doOpen();
 		canvas.currentFileExplorer._selected = null;
 	</method>
-    
+	
 	<method name="deleteError" args="event">
 		if ($debug) Debug.error("base::deleteError ", event);
 	</method>
@@ -178,8 +178,8 @@
 		this.singleClickStarted = false;
 		//Cannot change name for Root Icons
 		if (this.isRoot) {
-            return;
-        }
+			return;
+		}
 		this.addOrUpdateFolderName();
 	</method>
 	
@@ -226,9 +226,9 @@
 	<method name="playVideo">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-    		return;
-    	}
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
 		canvas.currentFileExplorer.playVideo(this);
 	]]>
 	</method>
@@ -236,9 +236,9 @@
 	<method name="editFolderName">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-    		return;
-    	}
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
 		this.addOrUpdateFolderName();
 	]]>
 	</method>
@@ -246,9 +246,9 @@
 	<method name="loadDocument">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-    		return;
-    	}
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
 		canvas.currentFileExplorer.loadDocument(this);
 	]]>
 	</method>
@@ -256,9 +256,9 @@
 	<method name="loadWmlFile">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-    		return;
-    	}
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
 		canvas.currentFileExplorer.loadWmlFile(this);
 	]]>
 	</method>
@@ -266,9 +266,9 @@
 	<method name="loadChart">
 	<![CDATA[
 		if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
-    		new lz.labelerrorPopup(canvas,{errorlabelid:1462});
-    		return;
-    	}
+			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+			return;
+		}
 		canvas.currentFileExplorer.loadChart(this);
 	]]>
 	</method>
@@ -279,32 +279,23 @@
 			new lz.labelerrorPopup(canvas,{errorlabelid:1462});
 			return;
 		}
-		
 		if ($debug) Debug.write("addOrUpdateFolderName ", this.parentId);
 		var tWidth = this._fileName.width;
 		if (tWidth < 160) {
 			tWidth = 160;
 		}
-		var _y = this._fileName.getAttributeRelative("y", canvas);
-		var _x = this._fileName.getAttributeRelative("x", canvas);
-		if (this.fileId == 0) {
-			_y = 65;
-			_x += 10;
-		}
-		
-		var t = new lz.dynamicFileName(canvas, {
+		var t = new lz.dynamicFileName(this._fileName, {
 				text: this.fileName
 				, refObj: this
 				, width: tWidth + 10
-				, x: _x
-				, y: _y
+				, x: 0
+				, y: 0
 				});
-
-		lz.Focus.setFocus(t,true);
+		lz.Focus.setFocus(t, true);
 		lz.ModeManager.makeModal(t);
 	]]>
 	</method>
-	
+
 	<method name="doSetSelection">
 		this.singleClickStarted = true;
 		if (this.selected) {
@@ -377,11 +368,11 @@
 	<method name="deselectItem">
 		this.selected = false;
 		if (this["_fileName"]) {
-            this._fileName.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
-        } else {
-            if ($debug) Debug.warn("deselectItem:: _fileName is NULL ",this);
-        }
-    </method>
+			this._fileName.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+		} else {
+			if ($debug) Debug.warn("deselectItem:: _fileName is NULL ",this);
+		}
+	</method>
 	
 	<method name="clearContent">
 	<![CDATA[
@@ -390,7 +381,7 @@
 		}
 	]]>
 	</method>
-    
+	
 	<method name="loadFiles">
 	<![CDATA[
 		if (!folderLoader) {
@@ -410,7 +401,7 @@
 		if ($debug) Debug.info("base::loadFilesComplete ", o);
 		setNodes(o.fileExplorerItemDTO);
 	</method>
-    
+	
 	<method name="loadFilesError" args="event">
 		if ($debug) Debug.error("base::loadFilesError ", event);
 	</method>
@@ -424,16 +415,16 @@
 	<view name="_folderIcon" resource="$once{ parent.fileIcon }" x="16" y="2" >
 		<handler name="onmousedown">
 			if (parent.isRoot) {
-                return;
-            }
-            lz.Timer.addTimer( parent.mouseDownClickDelegate, 300 );
-        </handler>
-        <handler name="onmouseup">
-        	if (parent.isRoot) {
-                return;
-            }
-            lz.Timer.removeTimer( parent.mouseDownClickDelegate );
-        </handler>
+				return;
+			}
+			lz.Timer.addTimer( parent.mouseDownClickDelegate, 300 );
+		</handler>
+		<handler name="onmouseup">
+			if (parent.isRoot) {
+				return;
+			}
+			lz.Timer.removeTimer( parent.mouseDownClickDelegate );
+		</handler>
 		<handler name="onclick">
 			parent.toggleOpen(false);
 		</handler>

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx?rev=1775576&r1=1775575&r2=1775576&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx Thu Dec 22 06:30:27 2016
@@ -9,75 +9,70 @@
   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
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <library>
 
 <class name="folderFileExplorerItem" extends="baseFileExplorerItem" type="Folder">
-	
+
 	<text name="_fileName" x="36" text="${ parent.fileName }" fontsize="10" resize="true" y="1">
 		<contextmenu>
-			
-			<contextmenuitem caption="$once{ canvas.getLabelName(711) }" 
-							 onselect="parent.parent.parent.editFolderName()" />
-			
-            <contextmenuitem caption="$once{ canvas.getLabelName(708) }" 
-            				 separatorbefore="true"
-            				 onselect="parent.parent.parent.addFile()" />
-            				 
-            <contextmenuitem caption="$once{ canvas.getLabelName(709) }" 
-            				 onselect="parent.parent.parent.addFolder()" />
-            				 
-            <contextmenuitem caption="$once{ canvas.getLabelName(710) }" 
-            				 onselect="parent.parent.parent.deleteFile(719)" />
-            				 
-        </contextmenu>
-        
-        <handler name="onmousetrackover">
-            //if ($debug) Debug.write("onmousetrackover");
-            canvas.currentImagesListdraw.currentDragItem.sendOverItem(parent);
-            this.setAttribute("bgcolor",0x93FE92);
-        </handler>
-        
-        <handler name="onmousetrackout">
-            //if ($debug) Debug.write("onmousetrackout");
-            canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
-            this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
-        </handler>
-        
-        <handler name="onmousetrackup">
-            if ($debug) Debug.write("onmousetrackup");
-            this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
-        </handler> 
-        
-        <handler name="onmousedown">
-        	if (parent.isRoot) {
-                return;
-            }
-            lz.Timer.addTimer( parent.mouseDownClickDelegate, 300 );
-        </handler>
-        <handler name="onmouseup">
-        	if (parent.isRoot) {
-                return;
-            }
-            lz.Timer.removeTimer( parent.mouseDownClickDelegate );
-        </handler>
+			<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
+					onselect="parent.parent.parent.editFolderName()" />
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(708) }"
+					separatorbefore="true" onselect="parent.parent.parent.addFile()" />
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(709) }"
+					onselect="parent.parent.parent.addFolder()" />
+
+			<contextmenuitem caption="$once{ canvas.getLabelName(710) }"
+					onselect="parent.parent.parent.deleteFile(719)" />
+		</contextmenu>
+
+		<handler name="onmousetrackover">
+			//if ($debug) Debug.write("onmousetrackover");
+			canvas.currentImagesListdraw.currentDragItem.sendOverItem(parent);
+			this.setAttribute("bgcolor",0x93FE92);
+		</handler>
+
+		<handler name="onmousetrackout">
+			//if ($debug) Debug.write("onmousetrackout");
+			canvas.currentImagesListdraw.currentDragItem.sendOutItem(parent);
+			this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+		</handler>
+
+		<handler name="onmousetrackup">
+			if ($debug) Debug.write("onmousetrackup");
+			this.setAttribute("bgcolor",canvas.getThemeColor('mainBackgroundColor'));
+		</handler>
+
+		<handler name="onmousedown">
+			if (parent.isRoot) {
+				return;
+			}
+			lz.Timer.addTimer( parent.mouseDownClickDelegate, 300 );
+		</handler>
+		<handler name="onmouseup">
+			if (parent.isRoot) {
+				return;
+			}
+			lz.Timer.removeTimer( parent.mouseDownClickDelegate );
+		</handler>
 		<handler name="onclick">
-            parent.toggleOpen(true);
-        </handler>
+			parent.toggleOpen(true);
+		</handler>
 	</text>
-	
+
 	<view name="content" x="12" y="18" layout="axis:y;inset:1" visibility="hidden">
-		
+
 	</view>
 </class>
-
-
 </library>