ui: eslint: fix trailing comma and comma related whitespaces errors

[pve-manager.git] / www / manager6 / panel / IPSet.js

diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js
index d4b36928e59169bb1d4c658ae4b601a74ff0de7a..13091c325ad7fc16e6e229baf6564429fc0e4520 100644 (file)
--- a/www/manager6/panel/IPSet.js
+++ b/www/manager6/panel/IPSet.js
@@ -1,7 +1,7 @@
 Ext.define('pve-fw-ipsets', {
     extend: 'Ext.data.Model',
     fields: [ 'name', 'comment', 'digest' ],
-    idProperty: 'name'
+    idProperty: 'name',
 });
 
 Ext.define('PVE.IPSetList', {
@@ -34,13 +34,13 @@ Ext.define('PVE.IPSetList', {
        var store = new Ext.data.Store({
            model: 'pve-fw-ipsets',
            proxy: {
-               type: 'pve',
-               url: "/api2/json" + me.base_url
+               type: 'proxmox',
+               url: "/api2/json" + me.base_url,
            },
            sorters: {
                property: 'name',
-               order: 'DESC'
-           }
+               order: 'DESC',
+           },
        });
 
        var sm = Ext.create('Ext.selection.RowModel', {});
@@ -49,7 +49,7 @@ Ext.define('PVE.IPSetList', {
            var oldrec = sm.getSelection()[0];
            store.load(function(records, operation, success) {
                if (oldrec) {
-                   var rec = store.findRecord('name', oldrec.data.name);
+                   var rec = store.findRecord('name', oldrec.data.name, 0, false, true, true);
                    if (rec) {
                        sm.select(rec);
                    }
@@ -62,7 +62,7 @@ Ext.define('PVE.IPSetList', {
            if (!rec) {
                return;
            }
-           var win = Ext.create('PVE.window.Edit', {
+           var win = Ext.create('Proxmox.window.Edit', {
                subject: "IPSet '" + rec.data.name + "'",
                url: me.base_url,
                method: 'POST',
@@ -71,39 +71,39 @@ Ext.define('PVE.IPSetList', {
                    {
                        xtype: 'hiddenfield',
                        name: 'rename',
-                       value: rec.data.name
+                       value: rec.data.name,
                    },
                    {
                        xtype: 'textfield',
                        name: 'name',
                        value: rec.data.name,
                        fieldLabel: gettext('Name'),
-                       allowBlank: false
+                       allowBlank: false,
                    },
                    {
                        xtype: 'textfield',
                        name: 'comment',
                        value: rec.data.comment,
-                       fieldLabel: gettext('Comment')
-                   }
-               ]
+                       fieldLabel: gettext('Comment'),
+                   },
+               ],
            });
            win.show();
            win.on('destroy', reload);
        };
 
-       me.editBtn = new PVE.button.Button({
+       me.editBtn = new Proxmox.button.Button({
            text: gettext('Edit'),
            disabled: true,
            selModel: sm,
-           handler: run_editor
+           handler: run_editor,
        });
 
-       me.addBtn = new PVE.button.Button({
+       me.addBtn = new Proxmox.button.Button({
            text: gettext('Create'),
            handler: function() {
                sm.deselectAll();
-               var win = Ext.create('PVE.window.Edit', {
+               var win = Ext.create('Proxmox.window.Edit', {
                    subject: 'IPSet',
                    url: me.base_url,
                    method: 'POST',
@@ -113,26 +113,26 @@ Ext.define('PVE.IPSetList', {
                            name: 'name',
                            value: '',
                            fieldLabel: gettext('Name'),
-                           allowBlank: false
+                           allowBlank: false,
                        },
                        {
                            xtype: 'textfield',
                            name: 'comment',
                            value: '',
-                           fieldLabel: gettext('Comment')
-                       }
-                   ]
+                           fieldLabel: gettext('Comment'),
+                       },
+                   ],
                });
                win.show();
                win.on('destroy', reload);
 
-           }
+           },
        });
 
        me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
            selModel: sm,
            baseurl: me.base_url + '/',
-           callback: reload
+           callback: reload,
        });
 
        Ext.apply(me, {
@@ -141,7 +141,7 @@ Ext.define('PVE.IPSetList', {
            selModel: sm,
            columns: [
                { header: 'IPSet', dataIndex: 'name', width: '100' },
-               { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 }
+               { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 },
            ],
            listeners: {
                itemdblclick: run_editor,
@@ -152,18 +152,18 @@ Ext.define('PVE.IPSetList', {
                deselect: function() {
                    me.ipset_panel.setBaseUrl(undefined);
                },
-               show: reload
-           }
+               show: reload,
+           },
        });
 
        me.callParent();
 
        store.load();
-    }
+    },
 });
 
 Ext.define('PVE.IPSetCidrEdit', {
-    extend: 'PVE.window.Edit',
+    extend: 'Proxmox.window.Edit',
 
     cidr: undefined,
 
@@ -197,42 +197,42 @@ Ext.define('PVE.IPSetCidrEdit', {
                editable: true,
                base_url: me.list_refs_url,
                value: '',
-               fieldLabel: gettext('IP/CIDR')
+               fieldLabel: gettext('IP/CIDR'),
            });
        } else {
            column1.push({
                xtype: 'displayfield',
                name: 'cidr',
                value: '',
-               fieldLabel: gettext('IP/CIDR')
+               fieldLabel: gettext('IP/CIDR'),
            });
        }
 
-       var ipanel = Ext.create('PVE.panel.InputPanel', {
+       var ipanel = Ext.create('Proxmox.panel.InputPanel', {
            isCreate: me.isCreate,
            column1: column1,
            column2: [
                {
-                   xtype: 'pvecheckbox',
+                   xtype: 'proxmoxcheckbox',
                    name: 'nomatch',
                    checked: false,
                    uncheckedValue: 0,
-                   fieldLabel: 'nomatch'
-               }
+                   fieldLabel: 'nomatch',
+               },
            ],
            columnB: [
                {
                    xtype: 'textfield',
                    name: 'comment',
                    value: '',
-                   fieldLabel: gettext('Comment')
-               }
-           ]
+                   fieldLabel: gettext('Comment'),
+               },
+           ],
        });
 
        Ext.apply(me, {
            subject: gettext('IP/CIDR'),
-           items: [ ipanel ]
+           items: [ ipanel ],
        });
 
        me.callParent();
@@ -242,10 +242,10 @@ Ext.define('PVE.IPSetCidrEdit', {
                success:  function(response, options) {
                    var values = response.result.data;
                    ipanel.setValues(values);
-               }
+               },
            });
        }
-    }
+    },
 });
 
 Ext.define('PVE.IPSetGrid', {
@@ -274,8 +274,8 @@ Ext.define('PVE.IPSetGrid', {
            me.addBtn.setDisabled(false);
            me.removeBtn.baseurl = url + '/';
            me.store.setProxy({
-               type: 'pve',
-               url: '/api2/json' + url
+               type: 'proxmox',
+               url: '/api2/json' + url,
            });
 
            me.store.load();
@@ -283,7 +283,6 @@ Ext.define('PVE.IPSetGrid', {
     },
 
     initComponent: function() {
-       /*jslint confusion: true */
         var me = this;
 
        if (!me.list_refs_url) {
@@ -291,7 +290,7 @@ Ext.define('PVE.IPSetGrid', {
        }
 
        var store = new Ext.data.Store({
-           model: 'pve-ipset'
+           model: 'pve-ipset',
        });
 
        var reload = function() {
@@ -307,20 +306,20 @@ Ext.define('PVE.IPSetGrid', {
            }
            var win = Ext.create('PVE.IPSetCidrEdit', {
                base_url: me.base_url,
-               cidr: rec.data.cidr
+               cidr: rec.data.cidr,
            });
            win.show();
            win.on('destroy', reload);
        };
 
-       me.editBtn = new PVE.button.Button({
+       me.editBtn = new Proxmox.button.Button({
            text: gettext('Edit'),
            disabled: true,
            selModel: sm,
-           handler: run_editor
+           handler: run_editor,
        });
 
-       me.addBtn = new PVE.button.Button({
+       me.addBtn = new Proxmox.button.Button({
            text: gettext('Add'),
            disabled: true,
            handler: function() {
@@ -329,17 +328,17 @@ Ext.define('PVE.IPSetGrid', {
                }
                var win = Ext.create('PVE.IPSetCidrEdit', {
                    base_url: me.base_url,
-                   list_refs_url: me.list_refs_url
+                   list_refs_url: me.list_refs_url,
                });
                win.show();
                win.on('destroy', reload);
-           }
+           },
        });
 
        me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
            selModel: sm,
            baseurl: me.base_url + '/',
-           callback: reload
+           callback: reload,
        });
 
        var render_errors = function(value, metaData, record) {
@@ -349,8 +348,8 @@ Ext.define('PVE.IPSetGrid', {
                if (msg) {
                    metaData.tdCls = 'proxmox-invalid-row';
                    var html = '<p>' +  Ext.htmlEncode(msg) + '</p>';
-                   metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + 
-                       html.replace(/\"/g,'&quot;') + '"';
+                   metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' +
+                       html.replace(/\"/g, '&quot;') + '"';
                }
            }
            return value;
@@ -361,11 +360,11 @@ Ext.define('PVE.IPSetGrid', {
            store: store,
            selModel: sm,
            listeners: {
-               itemdblclick: run_editor
+               itemdblclick: run_editor,
            },
            columns: [
                {
-                   xtype: 'rownumberer'
+                   xtype: 'rownumberer',
                },
                {
                    header: gettext('IP/CIDR'),
@@ -377,7 +376,7 @@ Ext.define('PVE.IPSetGrid', {
                            return '<b>! </b>' + value;
                        }
                        return value;
-                   }
+                   },
                },
                {
                    header: gettext('Comment'),
@@ -385,9 +384,9 @@ Ext.define('PVE.IPSetGrid', {
                    flex: 1,
                    renderer: function(value) {
                        return Ext.util.Format.htmlEncode(value);
-                   }
-               }
-           ]
+                   },
+               },
+           ],
        });
 
        me.callParent();
@@ -395,14 +394,14 @@ Ext.define('PVE.IPSetGrid', {
        if (me.base_url) {
            me.setBaseUrl(me.base_url); // load
        }
-    }
+    },
 }, function() {
 
     Ext.define('pve-ipset', {
        extend: 'Ext.data.Model',
        fields: [ { name: 'nomatch', type: 'boolean' },
                  'cidr', 'comment', 'errors' ],
-       idProperty: 'cidr'
+       idProperty: 'cidr',
     });
 
 });
@@ -427,7 +426,7 @@ Ext.define('PVE.IPSet', {
        var ipset_panel = Ext.createWidget('pveIPSetGrid', {
            region: 'center',
            list_refs_url: me.list_refs_url,
-           border: false
+           border: false,
        });
 
        var ipset_list = Ext.createWidget('pveIPSetList', {
@@ -436,7 +435,7 @@ Ext.define('PVE.IPSet', {
            base_url: me.base_url,
            width: '50%',
            border: false,
-           split: true
+           split: true,
        });
 
        Ext.apply(me, {
@@ -445,10 +444,10 @@ Ext.define('PVE.IPSet', {
            listeners: {
                show: function() {
                    ipset_list.fireEvent('show', ipset_list);
-               }
-           }
+               },
+           },
        });
 
        me.callParent();
-    }
+    },
 });