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/05 06:35:02 UTC

svn commit: r1772601 - /openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx

Author: solomax
Date: Mon Dec  5 06:35:02 2016
New Revision: 1772601

URL: http://svn.apache.org/viewvc?rev=1772601&view=rev
Log:
[OPENMEETINGS-1517] close private chat works as expected

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx?rev=1772601&r1=1772600&r2=1772601&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/chat/chatBarMenu.lzx Mon Dec  5 06:35:02 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
@@ -21,91 +21,92 @@
 <library>
 
 <class name="chatBarMenu" extends="view" width="${ parent.width }" x="0" 
-    height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
-    
-    <attribute name="staticwidth" type="number" value="120" />
-    <attribute name="currentBtn" value="null" />
-    
-    <event name="onRemoveWindow" />
-    
-    <method name="getCurrentSize">
-        <![CDATA[
-            if ( ((this.subviews.length+1)*(this.staticwidth+1)) <= this.width) {
-                return this.staticwidth;
-            } else {
-                var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length+1));
-                for (var i=0;i<this.subviews.length;i++) {
-                    this.subviews[i].setAttribute('width',newwidth);
-                }
-                return newwidth;
-            }   
-        ]]>
-    </method>
-    
-    <handler name="onwidth">
-        <![CDATA[
-            if ( ((this.subviews.length)*(this.staticwidth+1)) <= this.width) {
-                for (var i=0;i<this.subviews.length;i++) {
-                    this.subviews[i].setAttribute('width',this.staticwidth);
-                }
-            } else {
-                var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length));
-                for (var i=0;i<this.subviews.length;i++) {
-                    this.subviews[i].setAttribute('width',newwidth);
-                }
-            } 
-        ]]>
-    </handler>
-    
-    <method name="removeObject" args="btn">
-    	this.removeObjectSynced(btn);
-    	if ($debug) Debug.write("removeObject :: ",btn);
-    	this.onRemoveWindow.sendEvent(btn.objRef.refObj.publicSID);
-    </method>
-    
-    <method name="removeObjectSynced" args="btn">
-    	var removeCurrent = false;
-    	if (this.currentBtn == btn){
-    		removeCurrent = true;
-    	}
-    	btn.objRef.destroy();
-        btn.destroy();
-        if (this.subviews.length != 0) {
-	        if (removeCurrent) {
-	        	this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
-	        }
-        }
-        
-    </method>
-
-    
-    <method name="sendActiveWindow" args="btn,win">
-        if ($debug) Debug.write("sendActiveWindow: ", btn, win);
-        this.sendActiveWindowSynced(btn);
-    </method>
-    
-    <method name="sendActiveWindowSynced" args="btn">
-    	<![CDATA[
-            if (this.currentBtn != null){
-                this.currentBtn.isactive=false;
-                this.currentBtn.objRef.setAttribute("visibility", "hidden");
-                if ($debug) Debug.write("sendActiveWindow1: ",this.currentBtn);
-                this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
-                this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
-            }
-            this.currentBtn = btn;
-            this.currentBtn.objRef.setAttribute("visibility","visible");
-        	this.currentBtn.objRef.bringToFront();
-            //if ($debug) Debug.write("sendActiveWindow2: ",this.currentBtn);
-            this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
-            this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
-            this.currentBtn.isactive=true;
-            if (!!this.currentBtn.objRef.sendActiveWindow) {
-	       		this.currentBtn.objRef.sendActiveWindow();
-	       	}
-        ]]>
-    </method>
-    
-</class>
+	height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
+
+	<attribute name="staticwidth" type="number" value="120" />
+	<attribute name="currentBtn" value="null" />
+
+	<event name="onRemoveWindow" />
+
+	<method name="getCurrentSize">
+	<![CDATA[
+		if ( ((this.subviews.length+1)*(this.staticwidth+1)) <= this.width) {
+			return this.staticwidth;
+		} else {
+			var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length+1));
+			for (var i=0;i<this.subviews.length;i++) {
+				this.subviews[i].setAttribute('width',newwidth);
+			}
+			return newwidth;
+		}
+	]]>
+	</method>
 
+	<handler name="onwidth">
+	<![CDATA[
+		if ( ((this.subviews.length)*(this.staticwidth+1)) <= this.width) {
+			for (var i=0;i<this.subviews.length;i++) {
+				this.subviews[i].setAttribute('width',this.staticwidth);
+			}
+		} else {
+			var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length));
+			for (var i=0;i<this.subviews.length;i++) {
+				this.subviews[i].setAttribute('width',newwidth);
+			}
+		}
+	]]>
+	</handler>
+
+	<method name="removeObject" args="btn">
+		this.removeObjectSynced(btn);
+		if ($debug) Debug.write("removeObject :: ",btn);
+		this.onRemoveWindow.sendEvent(btn.objRef.refObj.publicSID);
+	</method>
+
+	<method name="removeObjectSynced" args="btn">
+		var removeCurrent = false;
+		if (this.currentBtn == btn){
+			removeCurrent = true;
+		}
+		btn.objRef.destroy();
+		btn.destroy();
+		if (this.subviews.length != 0) {
+			if (removeCurrent) {
+				this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
+			}
+		}
+		
+	</method>
+
+	<method name="sendActiveWindow" args="btn,win">
+		if ($debug) Debug.write("sendActiveWindow: ", btn, win);
+		this.sendActiveWindowSynced(btn);
+	</method>
+
+	<method name="sendActiveWindowSynced" args="btn">
+	<![CDATA[
+		if (this.currentBtn != null){
+			this.currentBtn.isactive = false;
+			this.currentBtn.objRef.setAttribute("visibility", "hidden");
+			if ($debug) Debug.write("sendActiveWindow1: ", this.currentBtn);
+			if (!!currentBtn._minimizebtn_mo) {
+				currentBtn._minimizebtn_mo.setAttribute('visibility', 'hidden');
+			}
+			if (!!currentBtn._minimizebtn_dn) {
+				currentBtn._minimizebtn_dn.setAttribute('visibility', 'hidden');
+			}
+		}
+		this.currentBtn = btn;
+		this.currentBtn.objRef.setAttribute("visibility","visible");
+		this.currentBtn.objRef.bringToFront();
+		//if ($debug) Debug.write("sendActiveWindow2: ",this.currentBtn);
+		this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
+		this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
+		this.currentBtn.isactive = true;
+		if (!!this.currentBtn.objRef.sendActiveWindow) {
+			this.currentBtn.objRef.sendActiveWindow();
+		}
+	]]>
+	</method>
+</class>
 </library>