[pve-devel] [PATCH manager v2 19/29] use TimezoneStore from widget toolkit

Thomas Lamprecht t.lamprecht at proxmox.com
Tue Dec 19 08:55:11 CET 2017


Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 www/manager6/Makefile              |   1 -
 www/manager6/data/TimezoneStore.js | 418 -------------------------------------
 www/manager6/node/TimeEdit.js      |   2 +-
 3 files changed, 1 insertion(+), 420 deletions(-)
 delete mode 100644 www/manager6/data/TimezoneStore.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index d1e488a7..0ac5e372 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -16,7 +16,6 @@ JSSRC= 				                 	\
 	lxc/CmdMenu.js					\
 	node/CmdMenu.js					\
 	VNCConsole.js					\
-	data/TimezoneStore.js				\
 	data/reader/JsonObject.js			\
 	data/PVEProxy.js				\
 	data/UpdateQueue.js				\
diff --git a/www/manager6/data/TimezoneStore.js b/www/manager6/data/TimezoneStore.js
deleted file mode 100644
index 79be8b7e..00000000
--- a/www/manager6/data/TimezoneStore.js
+++ /dev/null
@@ -1,418 +0,0 @@
-Ext.define('Timezone', {
-    extend: 'Ext.data.Model',
-    fields: ['zone']
-});
-
-Ext.define('PVE.data.TimezoneStore', {
-    extend: 'Ext.data.Store',
-    model: 'Timezone',
-    data: [
-	    ['Africa/Abidjan'],
-	    ['Africa/Accra'],
-	    ['Africa/Addis_Ababa'],
-	    ['Africa/Algiers'],
-	    ['Africa/Asmara'],
-	    ['Africa/Bamako'],
-	    ['Africa/Bangui'],
-	    ['Africa/Banjul'],
-	    ['Africa/Bissau'],
-	    ['Africa/Blantyre'],
-	    ['Africa/Brazzaville'],
-	    ['Africa/Bujumbura'],
-	    ['Africa/Cairo'],
-	    ['Africa/Casablanca'],
-	    ['Africa/Ceuta'],
-	    ['Africa/Conakry'],
-	    ['Africa/Dakar'],
-	    ['Africa/Dar_es_Salaam'],
-	    ['Africa/Djibouti'],
-	    ['Africa/Douala'],
-	    ['Africa/El_Aaiun'],
-	    ['Africa/Freetown'],
-	    ['Africa/Gaborone'],
-	    ['Africa/Harare'],
-	    ['Africa/Johannesburg'],
-	    ['Africa/Kampala'],
-	    ['Africa/Khartoum'],
-	    ['Africa/Kigali'],
-	    ['Africa/Kinshasa'],
-	    ['Africa/Lagos'],
-	    ['Africa/Libreville'],
-	    ['Africa/Lome'],
-	    ['Africa/Luanda'],
-	    ['Africa/Lubumbashi'],
-	    ['Africa/Lusaka'],
-	    ['Africa/Malabo'],
-	    ['Africa/Maputo'],
-	    ['Africa/Maseru'],
-	    ['Africa/Mbabane'],
-	    ['Africa/Mogadishu'],
-	    ['Africa/Monrovia'],
-	    ['Africa/Nairobi'],
-	    ['Africa/Ndjamena'],
-	    ['Africa/Niamey'],
-	    ['Africa/Nouakchott'],
-	    ['Africa/Ouagadougou'],
-	    ['Africa/Porto-Novo'],
-	    ['Africa/Sao_Tome'],
-	    ['Africa/Tripoli'],
-	    ['Africa/Tunis'],
-	    ['Africa/Windhoek'],
-	    ['America/Adak'],
-	    ['America/Anchorage'],
-	    ['America/Anguilla'],
-	    ['America/Antigua'],
-	    ['America/Araguaina'],
-	    ['America/Argentina/Buenos_Aires'],
-	    ['America/Argentina/Catamarca'],
-	    ['America/Argentina/Cordoba'],
-	    ['America/Argentina/Jujuy'],
-	    ['America/Argentina/La_Rioja'],
-	    ['America/Argentina/Mendoza'],
-	    ['America/Argentina/Rio_Gallegos'],
-	    ['America/Argentina/Salta'],
-	    ['America/Argentina/San_Juan'],
-	    ['America/Argentina/San_Luis'],
-	    ['America/Argentina/Tucuman'],
-	    ['America/Argentina/Ushuaia'],
-	    ['America/Aruba'],
-	    ['America/Asuncion'],
-	    ['America/Atikokan'],
-	    ['America/Bahia'],
-	    ['America/Bahia_Banderas'],
-	    ['America/Barbados'],
-	    ['America/Belem'],
-	    ['America/Belize'],
-	    ['America/Blanc-Sablon'],
-	    ['America/Boa_Vista'],
-	    ['America/Bogota'],
-	    ['America/Boise'],
-	    ['America/Cambridge_Bay'],
-	    ['America/Campo_Grande'],
-	    ['America/Cancun'],
-	    ['America/Caracas'],
-	    ['America/Cayenne'],
-	    ['America/Cayman'],
-	    ['America/Chicago'],
-	    ['America/Chihuahua'],
-	    ['America/Costa_Rica'],
-	    ['America/Cuiaba'],
-	    ['America/Curacao'],
-	    ['America/Danmarkshavn'],
-	    ['America/Dawson'],
-	    ['America/Dawson_Creek'],
-	    ['America/Denver'],
-	    ['America/Detroit'],
-	    ['America/Dominica'],
-	    ['America/Edmonton'],
-	    ['America/Eirunepe'],
-	    ['America/El_Salvador'],
-	    ['America/Fortaleza'],
-	    ['America/Glace_Bay'],
-	    ['America/Godthab'],
-	    ['America/Goose_Bay'],
-	    ['America/Grand_Turk'],
-	    ['America/Grenada'],
-	    ['America/Guadeloupe'],
-	    ['America/Guatemala'],
-	    ['America/Guayaquil'],
-	    ['America/Guyana'],
-	    ['America/Halifax'],
-	    ['America/Havana'],
-	    ['America/Hermosillo'],
-	    ['America/Indiana/Indianapolis'],
-	    ['America/Indiana/Knox'],
-	    ['America/Indiana/Marengo'],
-	    ['America/Indiana/Petersburg'],
-	    ['America/Indiana/Tell_City'],
-	    ['America/Indiana/Vevay'],
-	    ['America/Indiana/Vincennes'],
-	    ['America/Indiana/Winamac'],
-	    ['America/Inuvik'],
-	    ['America/Iqaluit'],
-	    ['America/Jamaica'],
-	    ['America/Juneau'],
-	    ['America/Kentucky/Louisville'],
-	    ['America/Kentucky/Monticello'],
-	    ['America/La_Paz'],
-	    ['America/Lima'],
-	    ['America/Los_Angeles'],
-	    ['America/Maceio'],
-	    ['America/Managua'],
-	    ['America/Manaus'],
-	    ['America/Marigot'],
-	    ['America/Martinique'],
-	    ['America/Matamoros'],
-	    ['America/Mazatlan'],
-	    ['America/Menominee'],
-	    ['America/Merida'],
-	    ['America/Mexico_City'],
-	    ['America/Miquelon'],
-	    ['America/Moncton'],
-	    ['America/Monterrey'],
-	    ['America/Montevideo'],
-	    ['America/Montreal'],
-	    ['America/Montserrat'],
-	    ['America/Nassau'],
-	    ['America/New_York'],
-	    ['America/Nipigon'],
-	    ['America/Nome'],
-	    ['America/Noronha'],
-	    ['America/North_Dakota/Center'],
-	    ['America/North_Dakota/New_Salem'],
-	    ['America/Ojinaga'],
-	    ['America/Panama'],
-	    ['America/Pangnirtung'],
-	    ['America/Paramaribo'],
-	    ['America/Phoenix'],
-	    ['America/Port-au-Prince'],
-	    ['America/Port_of_Spain'],
-	    ['America/Porto_Velho'],
-	    ['America/Puerto_Rico'],
-	    ['America/Rainy_River'],
-	    ['America/Rankin_Inlet'],
-	    ['America/Recife'],
-	    ['America/Regina'],
-	    ['America/Resolute'],
-	    ['America/Rio_Branco'],
-	    ['America/Santa_Isabel'],
-	    ['America/Santarem'],
-	    ['America/Santiago'],
-	    ['America/Santo_Domingo'],
-	    ['America/Sao_Paulo'],
-	    ['America/Scoresbysund'],
-	    ['America/Shiprock'],
-	    ['America/St_Barthelemy'],
-	    ['America/St_Johns'],
-	    ['America/St_Kitts'],
-	    ['America/St_Lucia'],
-	    ['America/St_Thomas'],
-	    ['America/St_Vincent'],
-	    ['America/Swift_Current'],
-	    ['America/Tegucigalpa'],
-	    ['America/Thule'],
-	    ['America/Thunder_Bay'],
-	    ['America/Tijuana'],
-	    ['America/Toronto'],
-	    ['America/Tortola'],
-	    ['America/Vancouver'],
-	    ['America/Whitehorse'],
-	    ['America/Winnipeg'],
-	    ['America/Yakutat'],
-	    ['America/Yellowknife'],
-	    ['Antarctica/Casey'],
-	    ['Antarctica/Davis'],
-	    ['Antarctica/DumontDUrville'],
-	    ['Antarctica/Macquarie'],
-	    ['Antarctica/Mawson'],
-	    ['Antarctica/McMurdo'],
-	    ['Antarctica/Palmer'],
-	    ['Antarctica/Rothera'],
-	    ['Antarctica/South_Pole'],
-	    ['Antarctica/Syowa'],
-	    ['Antarctica/Vostok'],
-	    ['Arctic/Longyearbyen'],
-	    ['Asia/Aden'],
-	    ['Asia/Almaty'],
-	    ['Asia/Amman'],
-	    ['Asia/Anadyr'],
-	    ['Asia/Aqtau'],
-	    ['Asia/Aqtobe'],
-	    ['Asia/Ashgabat'],
-	    ['Asia/Baghdad'],
-	    ['Asia/Bahrain'],
-	    ['Asia/Baku'],
-	    ['Asia/Bangkok'],
-	    ['Asia/Beirut'],
-	    ['Asia/Bishkek'],
-	    ['Asia/Brunei'],
-	    ['Asia/Choibalsan'],
-	    ['Asia/Chongqing'],
-	    ['Asia/Colombo'],
-	    ['Asia/Damascus'],
-	    ['Asia/Dhaka'],
-	    ['Asia/Dili'],
-	    ['Asia/Dubai'],
-	    ['Asia/Dushanbe'],
-	    ['Asia/Gaza'],
-	    ['Asia/Harbin'],
-	    ['Asia/Ho_Chi_Minh'],
-	    ['Asia/Hong_Kong'],
-	    ['Asia/Hovd'],
-	    ['Asia/Irkutsk'],
-	    ['Asia/Jakarta'],
-	    ['Asia/Jayapura'],
-	    ['Asia/Jerusalem'],
-	    ['Asia/Kabul'],
-	    ['Asia/Kamchatka'],
-	    ['Asia/Karachi'],
-	    ['Asia/Kashgar'],
-	    ['Asia/Kathmandu'],
-	    ['Asia/Kolkata'],
-	    ['Asia/Krasnoyarsk'],
-	    ['Asia/Kuala_Lumpur'],
-	    ['Asia/Kuching'],
-	    ['Asia/Kuwait'],
-	    ['Asia/Macau'],
-	    ['Asia/Magadan'],
-	    ['Asia/Makassar'],
-	    ['Asia/Manila'],
-	    ['Asia/Muscat'],
-	    ['Asia/Nicosia'],
-	    ['Asia/Novokuznetsk'],
-	    ['Asia/Novosibirsk'],
-	    ['Asia/Omsk'],
-	    ['Asia/Oral'],
-	    ['Asia/Phnom_Penh'],
-	    ['Asia/Pontianak'],
-	    ['Asia/Pyongyang'],
-	    ['Asia/Qatar'],
-	    ['Asia/Qyzylorda'],
-	    ['Asia/Rangoon'],
-	    ['Asia/Riyadh'],
-	    ['Asia/Sakhalin'],
-	    ['Asia/Samarkand'],
-	    ['Asia/Seoul'],
-	    ['Asia/Shanghai'],
-	    ['Asia/Singapore'],
-	    ['Asia/Taipei'],
-	    ['Asia/Tashkent'],
-	    ['Asia/Tbilisi'],
-	    ['Asia/Tehran'],
-	    ['Asia/Thimphu'],
-	    ['Asia/Tokyo'],
-	    ['Asia/Ulaanbaatar'],
-	    ['Asia/Urumqi'],
-	    ['Asia/Vientiane'],
-	    ['Asia/Vladivostok'],
-	    ['Asia/Yakutsk'],
-	    ['Asia/Yekaterinburg'],
-	    ['Asia/Yerevan'],
-	    ['Atlantic/Azores'],
-	    ['Atlantic/Bermuda'],
-	    ['Atlantic/Canary'],
-	    ['Atlantic/Cape_Verde'],
-	    ['Atlantic/Faroe'],
-	    ['Atlantic/Madeira'],
-	    ['Atlantic/Reykjavik'],
-	    ['Atlantic/South_Georgia'],
-	    ['Atlantic/St_Helena'],
-	    ['Atlantic/Stanley'],
-	    ['Australia/Adelaide'],
-	    ['Australia/Brisbane'],
-	    ['Australia/Broken_Hill'],
-	    ['Australia/Currie'],
-	    ['Australia/Darwin'],
-	    ['Australia/Eucla'],
-	    ['Australia/Hobart'],
-	    ['Australia/Lindeman'],
-	    ['Australia/Lord_Howe'],
-	    ['Australia/Melbourne'],
-	    ['Australia/Perth'],
-	    ['Australia/Sydney'],
-	    ['Europe/Amsterdam'],
-	    ['Europe/Andorra'],
-	    ['Europe/Athens'],
-	    ['Europe/Belgrade'],
-	    ['Europe/Berlin'],
-	    ['Europe/Bratislava'],
-	    ['Europe/Brussels'],
-	    ['Europe/Bucharest'],
-	    ['Europe/Budapest'],
-	    ['Europe/Chisinau'],
-	    ['Europe/Copenhagen'],
-	    ['Europe/Dublin'],
-	    ['Europe/Gibraltar'],
-	    ['Europe/Guernsey'],
-	    ['Europe/Helsinki'],
-	    ['Europe/Isle_of_Man'],
-	    ['Europe/Istanbul'],
-	    ['Europe/Jersey'],
-	    ['Europe/Kaliningrad'],
-	    ['Europe/Kiev'],
-	    ['Europe/Lisbon'],
-	    ['Europe/Ljubljana'],
-	    ['Europe/London'],
-	    ['Europe/Luxembourg'],
-	    ['Europe/Madrid'],
-	    ['Europe/Malta'],
-	    ['Europe/Mariehamn'],
-	    ['Europe/Minsk'],
-	    ['Europe/Monaco'],
-	    ['Europe/Moscow'],
-	    ['Europe/Oslo'],
-	    ['Europe/Paris'],
-	    ['Europe/Podgorica'],
-	    ['Europe/Prague'],
-	    ['Europe/Riga'],
-	    ['Europe/Rome'],
-	    ['Europe/Samara'],
-	    ['Europe/San_Marino'],
-	    ['Europe/Sarajevo'],
-	    ['Europe/Simferopol'],
-	    ['Europe/Skopje'],
-	    ['Europe/Sofia'],
-	    ['Europe/Stockholm'],
-	    ['Europe/Tallinn'],
-	    ['Europe/Tirane'],
-	    ['Europe/Uzhgorod'],
-	    ['Europe/Vaduz'],
-	    ['Europe/Vatican'],
-	    ['Europe/Vienna'],
-	    ['Europe/Vilnius'],
-	    ['Europe/Volgograd'],
-	    ['Europe/Warsaw'],
-	    ['Europe/Zagreb'],
-	    ['Europe/Zaporozhye'],
-	    ['Europe/Zurich'],
-	    ['Indian/Antananarivo'],
-	    ['Indian/Chagos'],
-	    ['Indian/Christmas'],
-	    ['Indian/Cocos'],
-	    ['Indian/Comoro'],
-	    ['Indian/Kerguelen'],
-	    ['Indian/Mahe'],
-	    ['Indian/Maldives'],
-	    ['Indian/Mauritius'],
-	    ['Indian/Mayotte'],
-	    ['Indian/Reunion'],
-	    ['Pacific/Apia'],
-	    ['Pacific/Auckland'],
-	    ['Pacific/Chatham'],
-	    ['Pacific/Chuuk'],
-	    ['Pacific/Easter'],
-	    ['Pacific/Efate'],
-	    ['Pacific/Enderbury'],
-	    ['Pacific/Fakaofo'],
-	    ['Pacific/Fiji'],
-	    ['Pacific/Funafuti'],
-	    ['Pacific/Galapagos'],
-	    ['Pacific/Gambier'],
-	    ['Pacific/Guadalcanal'],
-	    ['Pacific/Guam'],
-	    ['Pacific/Honolulu'],
-	    ['Pacific/Johnston'],
-	    ['Pacific/Kiritimati'],
-	    ['Pacific/Kosrae'],
-	    ['Pacific/Kwajalein'],
-	    ['Pacific/Majuro'],
-	    ['Pacific/Marquesas'],
-	    ['Pacific/Midway'],
-	    ['Pacific/Nauru'],
-	    ['Pacific/Niue'],
-	    ['Pacific/Norfolk'],
-	    ['Pacific/Noumea'],
-	    ['Pacific/Pago_Pago'],
-	    ['Pacific/Palau'],
-	    ['Pacific/Pitcairn'],
-	    ['Pacific/Pohnpei'],
-	    ['Pacific/Port_Moresby'],
-	    ['Pacific/Rarotonga'],
-	    ['Pacific/Saipan'],
-	    ['Pacific/Tahiti'],
-	    ['Pacific/Tarawa'],
-	    ['Pacific/Tongatapu'],
-	    ['Pacific/Wake'],
-	    ['Pacific/Wallis']
-	]
-});
diff --git a/www/manager6/node/TimeEdit.js b/www/manager6/node/TimeEdit.js
index 22f8606c..e2d884d5 100644
--- a/www/manager6/node/TimeEdit.js
+++ b/www/manager6/node/TimeEdit.js
@@ -22,7 +22,7 @@ Ext.define('PVE.node.TimeEdit', {
 		fieldLabel: gettext('Time zone'),
 		name: 'timezone',
 		queryMode: 'local',
-		store: Ext.create('PVE.data.TimezoneStore'),
+		store: Ext.create('Proxmox.data.TimezoneStore'),
 		valueField: 'zone',
 		displayField: 'zone',
 		triggerAction: 'all',
-- 
2.11.0





More information about the pve-devel mailing list