remove useless require declarations

diff --git a/www/manager/Workspace.js b/www/manager/Workspace.js
index 754264302e7e06452c7bae2927690557979adc93..10db212f4c4ef24776be5b18d9d984a5d1b39ac9 100644 (file)
--- a/www/manager/Workspace.js
+++ b/www/manager/Workspace.js
@@ -8,11 +8,6 @@
 
 Ext.define('PVE.Workspace', {
     extend: 'Ext.container.Viewport',
-    requires: [             
-       'Ext.tip.*',   
-       'PVE.Utils', 
-       'PVE.window.LoginWindow'
-    ],
 
     title: 'Proxmox Virtual Environment',
 
@@ -103,9 +98,6 @@ Ext.define('PVE.Workspace', {
 
 Ext.define('PVE.ConsoleWorkspace', {
     extend: 'PVE.Workspace',
-    requires: [          
-       'PVE.KVMConsole'
-    ],
 
     alias: ['widget.pveConsoleWorkspace'],
 

diff --git a/www/manager/data/ResourceStore.js b/www/manager/data/ResourceStore.js
index e5ddcf071ff55c96ccb6d00f5d54ad096506e87b..c67385b6a2c499641f1d759cf4842d936e9363b8 100644 (file)
--- a/www/manager/data/ResourceStore.js
+++ b/www/manager/data/ResourceStore.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.data.ResourceStore', {
     extend: 'PVE.data.UpdateStore',
-    requires: ['PVE.Utils'],
     singleton: true,
 
     findNextVMID: function() {

diff --git a/www/manager/data/UpdateStore.js b/www/manager/data/UpdateStore.js
index 0079e43406a77d408db4a7e4831c8cc470e8a1b3..ee02cd255b34632f64191e6e4dd246a845623ab3 100644 (file)
--- a/www/manager/data/UpdateStore.js
+++ b/www/manager/data/UpdateStore.js
@@ -1,10 +1,5 @@
 Ext.define('PVE.data.UpdateStore', {
     extend: 'Ext.data.Store',
-    requires: [
-       'PVE.Utils', 
-       'Ext.util.*', 
-       'PVE.data.UpdateQueue'
-    ],
 
     constructor: function(config) {
        var me = this;

diff --git a/www/manager/dc/ACLView.js b/www/manager/dc/ACLView.js
index 442cfb553b22edf13baf67d3b5c9cbfc86c91e1b..7ea314c59895d72f4c961fd059c19e678f4bbdcb 100644 (file)
--- a/www/manager/dc/ACLView.js
+++ b/www/manager/dc/ACLView.js
@@ -3,6 +3,7 @@ Ext.define('PVE.dc.ACLAdd', {
     alias: ['widget.pveACLAdd'],
 
     initComponent : function() {
+       /*jslint confusion: true */
         var me = this;
 
        me.create = true;

diff --git a/www/manager/dc/AuthView.js b/www/manager/dc/AuthView.js
index 02ec826542596cfb7488dc79e291270e3dcae919..fe5667756f33f6f07c2089a907a993173b45174b 100644 (file)
--- a/www/manager/dc/AuthView.js
+++ b/www/manager/dc/AuthView.js
@@ -49,7 +49,7 @@ Ext.define('PVE.dc.AuthView', {
        });
 
        var remove_btn = new PVE.button.Button({
-           text: gettext('Remove'),
+           text: gettext('Remove'),
            disabled: true,
            selModel: sm,
            confirmMsg: function (rec) {

diff --git a/www/manager/dc/UserEdit.js b/www/manager/dc/UserEdit.js
index eb7ce65ef377020312c1841b05ab6bc1e3deaeac..1a4d0b5826abeb309bf2b2b81e5a64a8340811c6 100644 (file)
--- a/www/manager/dc/UserEdit.js
+++ b/www/manager/dc/UserEdit.js
@@ -19,6 +19,9 @@ Ext.define('PVE.dc.UserEdit', {
             method = 'PUT';
        }
 
+       var verifypw;
+       var pwfield;
+
        var validate_pw = function() {
            if (verifypw.getValue() !== pwfield.getValue()) {
                return gettext("Passwords does not match");
@@ -26,7 +29,7 @@ Ext.define('PVE.dc.UserEdit', {
            return true;
        };
 
-       var verifypw = Ext.createWidget('textfield', { 
+       verifypw = Ext.createWidget('textfield', { 
            inputType: 'password',
            fieldLabel: gettext('Verify Password'), 
            name: 'verifypassword',
@@ -36,7 +39,7 @@ Ext.define('PVE.dc.UserEdit', {
            validator: validate_pw
        });
 
-       var pwfield = Ext.createWidget('textfield', { 
+       pwfield = Ext.createWidget('textfield', { 
            inputType: 'password',
            fieldLabel: gettext('Password'), 
            minLength: 5,

diff --git a/www/manager/dc/UserView.js b/www/manager/dc/UserView.js
index 9b242ee71f0c491c139b451fc87f4162c6374d3f..0fa32e946bf54ac9c0eaa10f167da7346d1b97d7 100644 (file)
--- a/www/manager/dc/UserView.js
+++ b/www/manager/dc/UserView.js
@@ -8,6 +8,9 @@ Ext.define('PVE.window.PasswordEdit', {
            throw "no userid specified";
        }
 
+       var verifypw;
+       var pwfield;
+
        var validate_pw = function() {
            if (verifypw.getValue() !== pwfield.getValue()) {
                return gettext("Passwords does not match");
@@ -15,7 +18,7 @@ Ext.define('PVE.window.PasswordEdit', {
            return true;
        };
 
-       var verifypw = Ext.createWidget('textfield', { 
+       verifypw = Ext.createWidget('textfield', { 
            inputType: 'password',
            fieldLabel: gettext('Verify Password'), 
            name: 'verifypassword',
@@ -23,7 +26,7 @@ Ext.define('PVE.window.PasswordEdit', {
            validator: validate_pw
        });
 
-       var pwfield = Ext.createWidget('textfield', { 
+       pwfield = Ext.createWidget('textfield', { 
            inputType: 'password',
            fieldLabel: gettext('Password'), 
            minLength: 5,
@@ -39,7 +42,7 @@ Ext.define('PVE.window.PasswordEdit', {
                {
                    xtype: 'hiddenfield',
                    name: 'userid',
-                   value: me.userid,
+                   value: me.userid
                }
            ]
        });

diff --git a/www/manager/form/BridgeSelector.js b/www/manager/form/BridgeSelector.js
index 086ba2e548ed6cef78027c38a82c7953b45a9547..1cd818f48615d9d4b6a11c1b01b9159b77637ae2 100644 (file)
--- a/www/manager/form/BridgeSelector.js
+++ b/www/manager/form/BridgeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.BridgeSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-       'Ext.data.Store', 
-       'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.BridgeSelector'],
 
     setNodename: function(nodename) {

diff --git a/www/manager/form/ComboGrid.js b/www/manager/form/ComboGrid.js
index 4ec48b16e24002fca26d8139d36c68a9222a40d9..e326aaf647f6b5d4538afa8425d788142d2e6090 100644 (file)
--- a/www/manager/form/ComboGrid.js
+++ b/www/manager/form/ComboGrid.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.ComboGrid', {
     extend: 'Ext.form.field.ComboBox',
-    requires: [
-       'Ext.grid.Panel',
-       'PVE.Utils'
-    ],
     alias: ['widget.PVE.form.ComboGrid'],
 
     computeHeight: function() {

diff --git a/www/manager/form/FileSelector.js b/www/manager/form/FileSelector.js
index 1044db2d6c41a61bd84b117db9225f0039e1b246..d0d7deba869506aab98a847589b4699491c619ef 100644 (file)
--- a/www/manager/form/FileSelector.js
+++ b/www/manager/form/FileSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.FileSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-       'Ext.data.Store', 
-       'PVE.RestProxy'
-    ],
     alias: ['widget.pveFileSelector'],
 
     setStorage: function(storage, nodename) {

diff --git a/www/manager/form/GroupSelector.js b/www/manager/form/GroupSelector.js
index b3d94b6cfdad83945a10a03840ca08fc88748c7c..89830deb258348013e0ed3982abb1d7aaedd7925 100644 (file)
--- a/www/manager/form/GroupSelector.js
+++ b/www/manager/form/GroupSelector.js
@@ -47,7 +47,7 @@ Ext.define('PVE.form.GroupSelector', {
        fields: [ 'groupid', 'comment' ],
        proxy: {
             type: 'pve',
-           url: "/api2/json/access/groups",
+           url: "/api2/json/access/groups"
        },
        idProperty: 'groupid'
     });

diff --git a/www/manager/form/NodeSelector.js b/www/manager/form/NodeSelector.js
index 9e446f548e8f7d6c6d4c59ed96f3a73b6c13cb5a..e992515be688659823e9c9521d11ac3b34677ee0 100644 (file)
--- a/www/manager/form/NodeSelector.js
+++ b/www/manager/form/NodeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.NodeSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-       'Ext.data.Store', 
-       'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.NodeSelector'],
 
     // invalidate nodes which are offline

diff --git a/www/manager/form/PoolSelector.js b/www/manager/form/PoolSelector.js
index ca930454fcfb4e68d1c68f4d6a3a75339cdf7d63..fa9a30fc5348b84455db3e14cf5c2307e9fda92f 100644 (file)
--- a/www/manager/form/PoolSelector.js
+++ b/www/manager/form/PoolSelector.js
@@ -47,7 +47,7 @@ Ext.define('PVE.form.PoolSelector', {
        fields: [ 'poolid', 'comment' ],
        proxy: {
             type: 'pve',
-           url: "/api2/json/access/pools",
+           url: "/api2/json/access/pools"
        },
        idProperty: 'poolid'
     });

diff --git a/www/manager/form/RRDTypeSelector.js b/www/manager/form/RRDTypeSelector.js
index 061484d2a5a40e2b57e77132d6f619fa3e73bc50..973a64a2ab7660290bac61777f1bb3b8e641a037 100644 (file)
--- a/www/manager/form/RRDTypeSelector.js
+++ b/www/manager/form/RRDTypeSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.RRDTypeSelector', {
     extend: 'Ext.form.field.ComboBox',
-    requires: [
-       'Ext.state.Manager'
-    ],
-
     alias: ['widget.pveRRDTypeSelector'],
   
     initComponent: function() {

diff --git a/www/manager/form/RealmComboBox.js b/www/manager/form/RealmComboBox.js
index a25b503c46bc960bce464803743227cb0c8b9061..04289dbdd881088ed6be183278a09b0b83cb1518 100644 (file)
--- a/www/manager/form/RealmComboBox.js
+++ b/www/manager/form/RealmComboBox.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.form.RealmComboBox', {
     extend: 'Ext.form.field.ComboBox',
-    requires: ['Ext.data.Store', 'PVE.RestProxy'],
     alias: ['widget.pveRealmComboBox'],
 
     initComponent: function() {

diff --git a/www/manager/form/StorageSelector.js b/www/manager/form/StorageSelector.js
index cadbd4fa27cc7dbfc4d45fb5afd030b1bf5b703e..497aae7c1529df48232dbad1cc12a0260c89b87f 100644 (file)
--- a/www/manager/form/StorageSelector.js
+++ b/www/manager/form/StorageSelector.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.form.StorageSelector', {
     extend: 'PVE.form.ComboGrid',
-    requires: [
-       'Ext.data.Store', 
-       'PVE.RestProxy'
-    ],
     alias: ['widget.PVE.form.StorageSelector'],
 
     setNodename: function(nodename) {

diff --git a/www/manager/form/ViewSelector.js b/www/manager/form/ViewSelector.js
index d971f5227d50575cabcbc501f28a9ec2e13c1f50..c74f75cbdf57fe82da0b66254eb22a0468cb3798 100644 (file)
--- a/www/manager/form/ViewSelector.js
+++ b/www/manager/form/ViewSelector.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.form.ViewSelector', {
     extend: 'Ext.form.field.ComboBox',
-    requires: ['Ext.data.Store'],
     alias: ['widget.pveViewSelector'],
 
     initComponent: function() {

diff --git a/www/manager/grid/ObjectGrid.js b/www/manager/grid/ObjectGrid.js
index d93077864e4e38b7f821e7eaac362dd0d64a4ce4..96962bde27fc6d60e774fc5b3e50912844d2b90e 100644 (file)
--- a/www/manager/grid/ObjectGrid.js
+++ b/www/manager/grid/ObjectGrid.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.grid.ObjectGrid', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-       'Ext.grid.*',
-       'PVE.data.ObjectStore'
-    ],
     alias: ['widget.pveObjectGrid'],
 
     getObjectValue: function(key, defaultValue) {

diff --git a/www/manager/grid/PoolMembers.js b/www/manager/grid/PoolMembers.js
index e104c72dfe6dc49d8a3d2c9c34c2bbb3239b242d..7798d56ebac45d1610f27bb6b07782d64953d80c 100644 (file)
--- a/www/manager/grid/PoolMembers.js
+++ b/www/manager/grid/PoolMembers.js
@@ -2,6 +2,7 @@ Ext.define('PVE.pool.AddVM', {
     extend: 'PVE.window.Edit',
 
     initComponent : function() {
+       /*jslint confusion: true */
        var me = this;
 
        if (!me.pool) {
@@ -35,6 +36,7 @@ Ext.define('PVE.pool.AddStorage', {
     extend: 'PVE.window.Edit',
 
     initComponent : function() {
+       /*jslint confusion: true */
        var me = this;
 
        if (!me.pool) {

diff --git a/www/manager/grid/ResourceGrid.js b/www/manager/grid/ResourceGrid.js
index 8054b6d237891378b41884bd239aa67bed4c9ff2..7f94bc5cb6fb43a0a4226778fe5b1962a67379f9 100644 (file)
--- a/www/manager/grid/ResourceGrid.js
+++ b/www/manager/grid/ResourceGrid.js
@@ -15,16 +15,6 @@ Ext.override(Ext.grid.feature.Chunking, {
 
 Ext.define('PVE.grid.ResourceGrid', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-       'Ext.grid.*',
-       'Ext.grid.feature.Chunking',
-       'Ext.state.Manager',
-       'Ext.data.*',
-       'Ext.data.Store',
-       'Ext.util.*',
-       'PVE.Utils', 
-       'PVE.data.ResourceStore'
-    ],
     alias: ['widget.pveResourceGrid'],
 
     //fixme: this makes still problems with the scrollbar

diff --git a/www/manager/index.pl b/www/manager/index.pl
index ddde386760b982d9a440aece33f82d1c98b4be16..000edb165186fe822fc83966ea3dfb38d54987fa 100644 (file)
--- a/www/manager/index.pl
+++ b/www/manager/index.pl
@@ -71,8 +71,6 @@ if (-f $langfile) {
 
 $jssrc .= <<_EOJS;
 
-Ext.require(['*', '$workspace']);
-
 // we need this (the java applet ignores the zindex)
 Ext.useShims = true;
 

diff --git a/www/manager/node/DNSEdit.js b/www/manager/node/DNSEdit.js
index 4b3261d6b9fc60835b773c7dc1225319619a3801..a29236ec9ce9ecceb3993f11a4d511d0fe3a8703 100644 (file)
--- a/www/manager/node/DNSEdit.js
+++ b/www/manager/node/DNSEdit.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.node.DNSEdit', {
     extend: 'PVE.window.Edit',
-    requires: [
-       'PVE.Utils'
-    ],
-
     alias: ['widget.pveNodeDNSEdit'],
 
     initComponent : function() {

diff --git a/www/manager/node/TimeEdit.js b/www/manager/node/TimeEdit.js
index f56d7450728cb43f7a96f867a1c4cf1ff95d8434..c976eb2403ab4b86a4022abef368d8578b861692 100644 (file)
--- a/www/manager/node/TimeEdit.js
+++ b/www/manager/node/TimeEdit.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.node.TimeEdit', {
     extend: 'PVE.window.Edit',
-    requires: ['PVE.data.TimezoneStore'],
     alias: ['widget.pveNodeTimeEdit'],
 
     initComponent : function() {

diff --git a/www/manager/openvz/CreateWizard.js b/www/manager/openvz/CreateWizard.js
index 38d7e8e477a167d6cd0eb5d56b4ab5d3aea7e2a6..cd60c04930bd11406e77de0dbc54553a4346872e 100644 (file)
--- a/www/manager/openvz/CreateWizard.js
+++ b/www/manager/openvz/CreateWizard.js
@@ -1,10 +1,6 @@
 /*jslint confusion: true */
 Ext.define('PVE.openvz.CreateWizard', {
     extend: 'PVE.window.Wizard',
-    requires: [    
-       'Ext.form.*',
-       'PVE.data.ResourceStore'
-    ],
 
     initComponent: function() {
        var me = this;

diff --git a/www/manager/openvz/Network.js b/www/manager/openvz/Network.js
index f2d91776ede945461c965cc956ddca7ea98d16c6..c904d65d7e428130c0645903906d254b14083616 100644 (file)
--- a/www/manager/openvz/Network.js
+++ b/www/manager/openvz/Network.js
@@ -147,9 +147,6 @@ Ext.define('PVE.OpenVZ.IPAdd', {
 
 Ext.define('PVE.openvz.NetworkView', {
     extend: 'Ext.grid.GridPanel',
-    requires: [
-       'Ext.grid.*'
-    ],
     alias: ['widget.pveOpenVZNetworkView'],
 
     dataCache: {}, // used to store result of last load

diff --git a/www/manager/panel/InputPanel.js b/www/manager/panel/InputPanel.js
index 1c6c9c5fe95c7267c8206b32f4d9111ddaa7ffcf..a7da9f416ce226ca535f30928723e3f7ec0a7c78 100644 (file)
--- a/www/manager/panel/InputPanel.js
+++ b/www/manager/panel/InputPanel.js
@@ -1,8 +1,5 @@
 Ext.define('PVE.panel.InputPanel', {
     extend: 'Ext.panel.Panel',
-    requires: [
-       'PVE.Utils'
-    ],
     alias: ['widget.inputpanel'],
 
     border: false,

diff --git a/www/manager/panel/StatusPanel.js b/www/manager/panel/StatusPanel.js
index ed0d4f37d5e686105dee6f6f474b07f370fccefc..0c5beb450dfeb96cc2d6be051de8cd15b04000a6 100644 (file)
--- a/www/manager/panel/StatusPanel.js
+++ b/www/manager/panel/StatusPanel.js
@@ -1,10 +1,5 @@
 Ext.define('PVE.panel.StatusPanel', {
     extend: 'Ext.tab.Panel',
-    requires: [
-       'Ext.state.Manager',
-       'PVE.dc.Log',
-       'PVE.dc.Tasks'
-    ],
     alias: 'widget.pveStatusPanel',
 
     

diff --git a/www/manager/qemu/CreateWizard.js b/www/manager/qemu/CreateWizard.js
index b58cd7ceff1f8ca0ea309249e2b594243f2998f4..99466325e02afc4d1661bc0d1a8154967a6c26b9 100644 (file)
--- a/www/manager/qemu/CreateWizard.js
+++ b/www/manager/qemu/CreateWizard.js
@@ -2,10 +2,6 @@
 /*jslint confusion: true */
 Ext.define('PVE.qemu.CreateWizard', {
     extend: 'PVE.window.Wizard',
-    requires: [    
-       'Ext.form.*',
-       'PVE.data.ResourceStore'
-    ],
 
     initComponent: function() {
        var me = this;

diff --git a/www/manager/tree/ResourceTree.js b/www/manager/tree/ResourceTree.js
index da694d7edc381aa6f0d0c9bbd6097c892f2811ed..a640124f103ade6bec1806c620de4836ecc47f2e 100644 (file)
--- a/www/manager/tree/ResourceTree.js
+++ b/www/manager/tree/ResourceTree.js
@@ -1,9 +1,5 @@
 Ext.define('PVE.tree.ResourceTree', {
     extend: 'Ext.tree.TreePanel',
-    requires: ['Ext.tree.*', 
-              'Ext.state.Manager',
-              'PVE.Utils', 
-              'PVE.data.ResourceStore'],
     alias: ['widget.pveResourceTree'],
 
     statics: {

diff --git a/www/manager/window/LoginWindow.js b/www/manager/window/LoginWindow.js
index e8f8e7f06716b01e61cc69b9d3c14f28a569420e..74fba4b759ed3de8bf1b8ec82c60861e08e0cfcb 100644 (file)
--- a/www/manager/window/LoginWindow.js
+++ b/www/manager/window/LoginWindow.js
@@ -1,6 +1,5 @@
 Ext.define('PVE.window.LoginWindow', {
     extend: 'Ext.window.Window',
-    requires: ['PVE.form.RealmComboBox'],
 
     // private
     onLogon: function() {

diff --git a/www/manager/window/TaskViewer.js b/www/manager/window/TaskViewer.js
index 75e6a5e816b101df0d1948bd18b849d67036b8c8..75e91b5e035825b5324b3947f6cc904be1509a46 100644 (file)
--- a/www/manager/window/TaskViewer.js
+++ b/www/manager/window/TaskViewer.js
@@ -3,9 +3,6 @@
 
 Ext.define('PVE.window.TaskViewer', {
     extend: 'Ext.window.Window',
-    requires: [
-        'PVE.Utils'
-    ],
     alias: 'widget.pveTaskViewer',
 
     initComponent: function() {

diff --git a/www/manager/window/Wizard.js b/www/manager/window/Wizard.js
index a6e779fd9f0c8e194b6f814c4ac6ded297b58889..0e6b02d32ad01bdbf9e6ef889798dd4eed8ca369 100644 (file)
--- a/www/manager/window/Wizard.js
+++ b/www/manager/window/Wizard.js
@@ -1,8 +1,5 @@
 Ext.define('PVE.window.Wizard', {
     extend: 'Ext.window.Window',
-    requires: [
-       'PVE.Utils'
-    ],
     
     getValues: function(dirtyOnly) {
        var me = this;