drop jslint lines

[pve-manager.git] / www / manager6 / lxc / Network.js

diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js
index 1620a7a6363a266222d00de8d71944676d00750d..2938c503c882d12738400a005c9f45906590a608 100644 (file)
--- a/www/manager6/lxc/Network.js
+++ b/www/manager6/lxc/Network.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.lxc.NetworkInputPanel', {
-    extend: 'PVE.panel.InputPanel',
+    extend: 'Proxmox.panel.InputPanel',
     alias: 'widget.pveLxcNetworkInputPanel',
 
     insideWizard: false,
@@ -8,7 +8,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
 
     setNodename: function(nodename) {
        var me = this;
-       
+
        if (!nodename || (me.nodename === nodename)) {
            return;
        }
@@ -18,7 +18,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
        var bridgesel = me.query("[isFormField][name=bridge]")[0];
        bridgesel.setNodename(nodename);
     },
-    
+
     onGetValues: function(values) {
        var me = this;
 
@@ -49,17 +49,19 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
     initComponent : function() {
        var me = this;
 
-       if (!me.dataCache) {
-           throw "no dataCache specified";
-       }
-       
        var cdata = {};
 
        if (me.insideWizard) {
            me.ifname = 'net0';
            cdata.name = 'eth0';
+           me.dataCache = {};
        }
-       
+       cdata.firewall =  (me.insideWizard || me.isCreate);
+
+       if (!me.dataCache) {
+           throw "no dataCache specified";
+       }
+
        if (!me.isCreate) {
            if (!me.ifname) {
                throw "no interface name specified";
@@ -90,7 +92,8 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
            {
                xtype: 'textfield',
                name: 'name',
-               fieldLabel: gettext('Name') + ' (i.e. eth0)',
+               fieldLabel: gettext('Name'),
+               emptyText: '(e.g., eth0)',
                allowBlank: false,
                value: cdata.name,
                validator: function(value) {
@@ -109,7 +112,6 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                        return result;
                    }
                    // validator can return bool/string
-                   /*jslint confusion:true*/
                    return true;
                }
            },
@@ -146,10 +148,10 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                allowBlank: true
            },
            {
-               xtype: 'pvecheckbox',
+               xtype: 'proxmoxcheckbox',
                fieldLabel: gettext('Firewall'),
                name: 'firewall',
-               checked: cdata.firewall
+               value: cdata.firewall
            }
        ];
 
@@ -188,6 +190,9 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                        margin: '0 0 0 10',
                        listeners: {
                            change: function(cb, value) {
+                               me.down('field[name=ip]').setEmptyText(
+                                   !!value ? Proxmox.Utils.NoneText : ""
+                               );
                                me.down('field[name=ip]').setDisabled(!value);
                                me.down('field[name=gw]').setDisabled(!value);
                            }
@@ -208,6 +213,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                name: 'ip',
                vtype: 'IPCIDRAddress',
                value: cdata.ip,
+               emptyText: dhcp4 ? '' : Proxmox.Utils.NoneText,
                disabled: dhcp4,
                fieldLabel: 'IPv4/CIDR' // do not localize
            },
@@ -246,6 +252,9 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                        margin: '0 0 0 10',
                        listeners: {
                            change: function(cb, value) {
+                               me.down('field[name=ip6]').setEmptyText(
+                                   !!value ? Proxmox.Utils.NoneText : ""
+                               );
                                me.down('field[name=ip6]').setDisabled(!value);
                                me.down('field[name=gw6]').setDisabled(!value);
                            }
@@ -273,6 +282,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                xtype: 'textfield',
                name: 'ip6',
                value: cdata.ip6,
+               emptyText: dhcp6 || auto6 ? '' : Proxmox.Utils.NoneText,
                vtype: 'IP6CIDRAddress',
                disabled: (dhcp6 || auto6),
                fieldLabel: 'IPv6/CIDR' // do not localize
@@ -290,10 +300,9 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
        me.callParent();
     }
 });
-       
 
 Ext.define('PVE.lxc.NetworkEdit', {
-    extend: 'PVE.window.Edit',
+    extend: 'Proxmox.window.Edit',
 
     isAdd: true,
 
@@ -314,7 +323,7 @@ Ext.define('PVE.lxc.NetworkEdit', {
            dataCache: me.dataCache,
            isCreate: me.isCreate
        });
-          
+
        Ext.apply(me, {
            subject: gettext('Network Device') + ' (veth)',
            digest: me.dataCache.digest,
@@ -339,15 +348,15 @@ Ext.define('PVE.lxc.NetworkView', {
     load: function() {
        var me = this;
 
-       PVE.Utils.setErrorMask(me, true);
+       Proxmox.Utils.setErrorMask(me, true);
 
-       PVE.Utils.API2Request({
+       Proxmox.Utils.API2Request({
            url: me.url,
            failure: function(response, opts) {
-               PVE.Utils.setErrorMask(me, gettext('Error') + ': ' + response.htmlStatus);
+               Proxmox.Utils.setErrorMask(me, gettext('Error') + ': ' + response.htmlStatus);
            },
            success: function(response, opts) {
-               PVE.Utils.setErrorMask(me, false);
+               Proxmox.Utils.setErrorMask(me, false);
                var result = Ext.decode(response.responseText);
                var data = result.data || {};
                me.dataCache = data;
@@ -395,7 +404,7 @@ Ext.define('PVE.lxc.NetworkView', {
 
        var sm = Ext.create('Ext.selection.RowModel', {});
 
-       var remove_btn = new PVE.button.Button({
+       var remove_btn = new Proxmox.button.Button({
            text: gettext('Remove'),
            disabled: true,
            selModel: sm,
@@ -407,7 +416,7 @@ Ext.define('PVE.lxc.NetworkView', {
                                         "'" + rec.data.id + "'");
            },
            handler: function(btn, event, rec) {
-               PVE.Utils.API2Request({
+               Proxmox.Utils.API2Request({
                    url: me.url,
                    waitMsgTarget: me,
                    method: 'PUT',
@@ -442,7 +451,7 @@ Ext.define('PVE.lxc.NetworkView', {
            win.show();
        };
 
-       var edit_btn = new PVE.button.Button({
+       var edit_btn = new Proxmox.button.Button({
            text: gettext('Edit'),
            selModel: sm,
            disabled: true,
@@ -479,7 +488,7 @@ Ext.define('PVE.lxc.NetworkView', {
            ],
            columns: [
                {
-                   header: gettext('ID'),
+                   header: 'ID',
                    width: 50,
                    dataIndex: 'id'
                },
@@ -497,7 +506,7 @@ Ext.define('PVE.lxc.NetworkView', {
                    header: gettext('Firewall'),
                    width: 80,
                    dataIndex: 'firewall',
-                   renderer: PVE.Utils.format_boolean
+                   renderer: Proxmox.Utils.format_boolean
                },
                {
                    header: gettext('VLAN Tag'),