[pve-devel] r6289 - pve-manager/pve2/www/manager

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jul 8 16:30:40 CEST 2011


Author: dietmar
Date: 2011-07-08 16:30:40 +0200 (Fri, 08 Jul 2011)
New Revision: 6289

Modified:
   pve-manager/pve2/www/manager/Workspace.js
Log:
make lint happy


Modified: pve-manager/pve2/www/manager/Workspace.js
===================================================================
--- pve-manager/pve2/www/manager/Workspace.js	2011-07-08 14:22:45 UTC (rev 6288)
+++ pve-manager/pve2/www/manager/Workspace.js	2011-07-08 14:30:40 UTC (rev 6289)
@@ -65,17 +65,20 @@
 
 	me.callParent();
 
-        if (!PVE.Utils.authOK())
+        if (!PVE.Utils.authOK()) {
 	    me.showLogin();
-	else 
-	    if (me.loginData)
+	} else { 
+	    if (me.loginData) {
 		me.onLogin(me.loginData);
+	    }
+	}
 
 	Ext.TaskManager.start({
 	    run: function() {
 		var ticket = PVE.Utils.authOK();
-		if (!ticket || !PVE.UserName)
+		if (!ticket || !PVE.UserName) {
 		    return;
+		}
 
 		Ext.Ajax.request({
 		    params: { 
@@ -123,7 +126,7 @@
 		toplevel: true
 	    };
 	} else if (consoleType === 'shell') {
-	    me.title = "node " + param.node + " - Proxmox Shell"
+	    me.title = "node " + param.node + " - Proxmox Shell";
 	    content = {
 		xtype: 'pveShell',
 		nodename: param.node,
@@ -138,9 +141,9 @@
 	}
 
 	Ext.apply(me, {
-	    layout: 'fit',
- 	    border: false,
-	    items: content
+	    layout: { type: 'fit' },
+	    border: false,
+	    items: [ content ]
 	});
 
 	me.callParent();       
@@ -169,8 +172,9 @@
     setContent: function(comp) {
 	var me = this;
 	
-	if (!comp) 
+	if (!comp) { 
 	    comp = me.defaultContent;
+	}
 
 	var cont = me.child('#content');
 	cont.removeAll(true);
@@ -189,8 +193,9 @@
 
 	me.updateUserInfo();
 
-	if (loginData)
+	if (loginData) {
 	    PVE.data.ResourceStore.startUpdate();
+	}
     },
 
     updateUserInfo: function() {
@@ -248,7 +253,7 @@
 			    comp = { 
 				xtype: tlckup[n.data.type || 'root'] || 
 				    'PVE.panel.Config',
-				layout: 'fit',
+				layout: { type: 'fit' },
 				showSearch: (n.data.id === 'root') ||
 				    Ext.isDefined(n.data.groupbyid),
 				pveSelNode: n,
@@ -263,7 +268,7 @@
 	});
 
 	Ext.apply(me, {
- 	    layout: 'border',
+	    layout: { type: 'border' },
 	    border: false,
 	    items: [
 		{
@@ -338,18 +343,18 @@
 		    region: 'center',
 		    id: 'content',
 		    xtype: 'panel',
-		    layout: 'fit',
+		    layout: { type: 'fit' },
 		    border: false,
 		    stateful: false,
 		    margins:'0 5 0 0',
-		    items: me.defaultContent
+		    items: [ me.defaultContent ]
 		},
 		rtree,
 		{
 		    xtype: 'pveStatusPanel',
 		    region: 'south',
 		    margins:'0 5 5 5',
-	    	    height: 200,       
+		    height: 200,       
 		    collapsible: true,
 		    split:true
 		}



More information about the pve-devel mailing list