[pve-devel] [PATCH pve-manager] Declarative style ExtJS demo

[Emmanuel Kasper]

---
 www/manager/Makefile                    |  1 -
 www/manager/dc/OptionView.js            | 23 +++++++++--------------
 www/manager/form/VNCKeyboardSelector.js | 10 ----------
 3 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 www/manager/form/VNCKeyboardSelector.js

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 55a7ef5..1b3ac32 100644
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -50,7 +50,6 @@ JSSRC= 				                 	\
 	form/IPRefSelector.js				\
 	form/IPProtocolSelector.js			\
 	form/CPUModelSelector.js			\
-	form/VNCKeyboardSelector.js			\
 	form/LanguageSelector.js			\
 	form/DisplaySelector.js				\
 	form/CacheTypeSelector.js			\
diff --git a/www/manager/dc/OptionView.js b/www/manager/dc/OptionView.js
index 1a94be7..c4f7ee7 100644
--- a/www/manager/dc/OptionView.js
+++ b/www/manager/dc/OptionView.js
@@ -25,23 +25,18 @@ Ext.define('PVE.dc.HttpProxyEdit', {
 
 Ext.define('PVE.dc.KeyboardEdit', {
     extend: 'PVE.window.Edit',
-
+    subject: gettext('Keyboard Layout'),
+    items: {
+	xtype: 'pveKVComboBox',
+	name: 'keyboard',
+	value: '',
+	fieldLabel: gettext('Keyboard Layout'),
+	data: PVE.Utils.kvm_keymap_array()
+    },
     initComponent : function() {
 	var me = this;
-
-	Ext.applyIf(me, {
-	    subject: gettext('Keyboard Layout'),
-	    items: {
-		xtype: 'VNCKeyboardSelector',
-		name: 'keyboard',
-		value: '',
-		fieldLabel: gettext('Keyboard Layout')
-	    }
-	});
-
 	me.callParent();
-
-	me.load();
+	me.load(); // force display of current keyboard selection
     }
 });
 
diff --git a/www/manager/form/VNCKeyboardSelector.js b/www/manager/form/VNCKeyboardSelector.js
deleted file mode 100644
index 37fe976..0000000
--- a/www/manager/form/VNCKeyboardSelector.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Ext.define('PVE.form.VNCKeyboardSelector', {
-    extend: 'PVE.form.KVComboBox',
-    alias: ['widget.VNCKeyboardSelector'],
-  
-    initComponent: function() {
-	var me = this;
-	me.data = PVE.Utils.kvm_keymap_array();
-	me.callParent();
-    }
-});
-- 
2.1.4