Attachment #264836 for bug #490492

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 284-288 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js (-1 / +2 lines)
284	"editorTheme selection background": "Selection background",	284	"editorTheme selection background": "Selection background",
285	'customizeTheme': 'Custom Style...',	285	'customizeTheme': 'Custom Style...',
286	'moreEditorSettings': 'Editor Settings...',	286	'moreEditorSettings': 'Editor Settings...',
287	'SettingWarning' : '${0} Warning: Global settings for \'${2}\' are overriden by the settings defined in: ${1}'	287	'SettingWarning' : '${0} Warning: Global settings for \'${2}\' are overriden by the settings defined in: ${1}',
		288	"version": "Version ${0}",
288	});	289	});




	'orion/globalCommands',
	'orion/PageUtil',
	'orion/webui/littlelib',
	'orion/i18nUtil',
	'orion/objects',
	'orion/operationsClient',
	'orion/URITemplate',
	'orion/widgets/themes/ThemeBuilder',
	'orion/settings/ui/PluginSettings',
	'orion/status',
	'orion/widgets/themes/ThemePreferences',
	'orion/widgets/themes/editor/ThemeData',
	'orion/widgets/themes/ThemeImporter',

	'orion/editorPreferences',
	'orion/generalPreferences',
	'orion/metrics',
	'orion/util',
], function(messages, mGlobalCommands, PageUtil, lib, i18nUtil, objects, mOperationsClient, URITemplate, 
		ThemeBuilder, SettingsList, mStatus, mThemePreferences, editorThemeData, editorThemeImporter, SplitSelectionLayout, PluginList, 
		GitSettings, EditorSettings, ThemeSettings, UserSettings, GlobalizationSettings, GeneralSettings, mEditorPreferences, mGeneralPreferences, mMetrics, util) {

	
	/**
	 * @param {Object} options
	 * @param {DomNode} node

	var superPrototype = SplitSelectionLayout.prototype;
	function SettingsContainer(options, node) {
		SplitSelectionLayout.apply(this, arguments);
		this.operationsClient = new mOperationsClient.OperationsClient(this.registry);
		this.statusService = new mStatus.StatusReportingService(this.registry, this.operationsClient, "statusPane", "notifications", "notificationArea"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$

		var getPluginsRefs = this.registry.getServiceReferences("orion.core.getplugins"); //$NON-NLS-0$
		this.pluginsUri = getPluginsRefs[0] && getPluginsRefs[0].getProperty("uri"); //$NON-NLS-0$

		this.settingsCore.pluginRegistry.addEventListener("started", pluginsUpdated);
		this.settingsCore.pluginRegistry.addEventListener("stopped", pluginsUpdated);
		this.settingsCore.pluginRegistry.addEventListener("updated", pluginsUpdated);
		
		if (localStorage.darklaunch){
			var xhr = new XMLHttpRequest();
			xhr.onreadystatechange = function() {
				if (xhr.readyState === 4 && xhr.status === 200){
					var resp = JSON.parse(xhr.responseText);
					if (typeof resp.build === "string"){
						this.statusService.setMessage(i18nUtil.formatMessage(messages["version"], resp.build));
					}
				}
			}.bind(this);
			xhr.open("GET", "../version",  true); //$NON-NLS-1$ //$NON-NLS-2$
			xhr.send(null);
		}
	}
	SettingsContainer.prototype = Object.create(superPrototype);
	objects.mixin(SettingsContainer.prototype, {


			this.updateToolbar(id);

			var editorSettingsNode = document.createElement('div');
			this.table.appendChild(editorSettingsNode);

			var editorTheme = new editorThemeData.ThemeData();


			this.updateToolbar(id);
			
			var userNode = document.createElement('div');
			this.table.appendChild(userNode);

			this.userWidget = new UserSettings({


			this.updateToolbar(id);
			
			var userNode = document.createElement('div');
			this.table.appendChild(userNode);

			this.gitWidget = new GitSettings({


			this.updateToolbar(id);

			var themeSettingsNode = document.createElement('div');
			this.table.appendChild(themeSettingsNode);

			var editorTheme = new editorThemeData.ThemeData();


			this.updateToolbar(id);
			
			var userNode = document.createElement('div');
			this.table.appendChild(userNode);

			this.globalizationWidget = new GlobalizationSettings({


			this.updateToolbar(id);
			
			var userNode = document.createElement('div');
			this.table.appendChild(userNode);
			
			var generalPreferences = new mGeneralPreferences.GeneralPreferences (this.preferences);

Return to bug 490492

Lines 18-27 Link Here

(-)a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/SettingsContainer.js (-9 / +29 lines)
18	'orion/globalCommands',	18	'orion/globalCommands',
19	'orion/PageUtil',	19	'orion/PageUtil',
20	'orion/webui/littlelib',	20	'orion/webui/littlelib',
		21	'orion/i18nUtil',
21	'orion/objects',	22	'orion/objects',
		23	'orion/operationsClient',
22	'orion/URITemplate',	24	'orion/URITemplate',
23	'orion/widgets/themes/ThemeBuilder',	25	'orion/widgets/themes/ThemeBuilder',
24	'orion/settings/ui/PluginSettings',	26	'orion/settings/ui/PluginSettings',
		27	'orion/status',
25	'orion/widgets/themes/ThemePreferences',	28	'orion/widgets/themes/ThemePreferences',
26	'orion/widgets/themes/editor/ThemeData',	29	'orion/widgets/themes/editor/ThemeData',
27	'orion/widgets/themes/ThemeImporter',	30	'orion/widgets/themes/ThemeImporter',
Lines 36-46 Link Here
36	'orion/editorPreferences',	39	'orion/editorPreferences',
37	'orion/generalPreferences',	40	'orion/generalPreferences',
38	'orion/metrics',	41	'orion/metrics',
39	'orion/util'	42	'orion/util',
40	], function(messages, mGlobalCommands, PageUtil, lib, objects, URITemplate,	43	], function(messages, mGlobalCommands, PageUtil, lib, i18nUtil, objects, mOperationsClient, URITemplate,
41	ThemeBuilder, SettingsList, mThemePreferences, editorThemeData, editorThemeImporter, SplitSelectionLayout, PluginList,	44	ThemeBuilder, SettingsList, mStatus, mThemePreferences, editorThemeData, editorThemeImporter, SplitSelectionLayout, PluginList,
42	GitSettings, EditorSettings, ThemeSettings, UserSettings, GlobalizationSettings, GeneralSettings, mEditorPreferences, mGeneralPreferences, mMetrics, util) {	45	GitSettings, EditorSettings, ThemeSettings, UserSettings, GlobalizationSettings, GeneralSettings, mEditorPreferences, mGeneralPreferences, mMetrics, util) {
43		46
		47
44	/**	48	/**
45	* @param {Object} options	49	* @param {Object} options
46	* @param {DomNode} node	50	* @param {DomNode} node
Lines 48-53 Link Here
48	var superPrototype = SplitSelectionLayout.prototype;	52	var superPrototype = SplitSelectionLayout.prototype;
49	function SettingsContainer(options, node) {	53	function SettingsContainer(options, node) {
50	SplitSelectionLayout.apply(this, arguments);	54	SplitSelectionLayout.apply(this, arguments);
		55	this.operationsClient = new mOperationsClient.OperationsClient(this.registry);
		56	this.statusService = new mStatus.StatusReportingService(this.registry, this.operationsClient, "statusPane", "notifications", "notificationArea"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
51		57
52	var getPluginsRefs = this.registry.getServiceReferences("orion.core.getplugins"); //$NON-NLS-0$	58	var getPluginsRefs = this.registry.getServiceReferences("orion.core.getplugins"); //$NON-NLS-0$
53	this.pluginsUri = getPluginsRefs[0] && getPluginsRefs[0].getProperty("uri"); //$NON-NLS-0$	59	this.pluginsUri = getPluginsRefs[0] && getPluginsRefs[0].getProperty("uri"); //$NON-NLS-0$
Lines 61-66 Link Here
61	this.settingsCore.pluginRegistry.addEventListener("started", pluginsUpdated);	67	this.settingsCore.pluginRegistry.addEventListener("started", pluginsUpdated);
62	this.settingsCore.pluginRegistry.addEventListener("stopped", pluginsUpdated);	68	this.settingsCore.pluginRegistry.addEventListener("stopped", pluginsUpdated);
63	this.settingsCore.pluginRegistry.addEventListener("updated", pluginsUpdated);	69	this.settingsCore.pluginRegistry.addEventListener("updated", pluginsUpdated);
		70
		71	if (localStorage.darklaunch){
		72	var xhr = new XMLHttpRequest();
		73	xhr.onreadystatechange = function() {
		74	if (xhr.readyState === 4 && xhr.status === 200){
		75	var resp = JSON.parse(xhr.responseText);
		76	if (typeof resp.build === "string"){
		77	this.statusService.setMessage(i18nUtil.formatMessage(messages["version"], resp.build));
		78	}
		79	}
		80	}.bind(this);
		81	xhr.open("GET", "../version", true); //$NON-NLS-1$ //$NON-NLS-2$
		82	xhr.send(null);
		83	}
64	}	84	}
65	SettingsContainer.prototype = Object.create(superPrototype);	85	SettingsContainer.prototype = Object.create(superPrototype);
66	objects.mixin(SettingsContainer.prototype, {	86	objects.mixin(SettingsContainer.prototype, {
Lines 197-203 Link Here
197		217
198	this.updateToolbar(id);	218	this.updateToolbar(id);
199		219
200	var editorSettingsNode = document.createElement('div'); //$NON-NLS-0$	220	var editorSettingsNode = document.createElement('div');
201	this.table.appendChild(editorSettingsNode);	221	this.table.appendChild(editorSettingsNode);
202		222
203	var editorTheme = new editorThemeData.ThemeData();	223	var editorTheme = new editorThemeData.ThemeData();
Lines 230-236 Link Here
230		250
231	this.updateToolbar(id);	251	this.updateToolbar(id);
232		252
233	var userNode = document.createElement('div'); //$NON-NLS-0$	253	var userNode = document.createElement('div');
234	this.table.appendChild(userNode);	254	this.table.appendChild(userNode);
235		255
236	this.userWidget = new UserSettings({	256	this.userWidget = new UserSettings({
Lines 258-264 Link Here
258		278
259	this.updateToolbar(id);	279	this.updateToolbar(id);
260		280
261	var userNode = document.createElement('div'); //$NON-NLS-0$	281	var userNode = document.createElement('div');
262	this.table.appendChild(userNode);	282	this.table.appendChild(userNode);
263		283
264	this.gitWidget = new GitSettings({	284	this.gitWidget = new GitSettings({
Lines 281-287 Link Here
281		301
282	this.updateToolbar(id);	302	this.updateToolbar(id);
283		303
284	var themeSettingsNode = document.createElement('div'); //$NON-NLS-0$	304	var themeSettingsNode = document.createElement('div');
285	this.table.appendChild(themeSettingsNode);	305	this.table.appendChild(themeSettingsNode);
286		306
287	var editorTheme = new editorThemeData.ThemeData();	307	var editorTheme = new editorThemeData.ThemeData();
Lines 325-331 Link Here
325		345
326	this.updateToolbar(id);	346	this.updateToolbar(id);
327		347
328	var userNode = document.createElement('div'); //$NON-NLS-0$	348	var userNode = document.createElement('div');
329	this.table.appendChild(userNode);	349	this.table.appendChild(userNode);
330		350
331	this.globalizationWidget = new GlobalizationSettings({	351	this.globalizationWidget = new GlobalizationSettings({
Lines 353-359 Link Here
353		373
354	this.updateToolbar(id);	374	this.updateToolbar(id);
355		375
356	var userNode = document.createElement('div'); //$NON-NLS-0$	376	var userNode = document.createElement('div');
357	this.table.appendChild(userNode);	377	this.table.appendChild(userNode);
358		378
359	var generalPreferences = new mGeneralPreferences.GeneralPreferences (this.preferences);	379	var generalPreferences = new mGeneralPreferences.GeneralPreferences (this.preferences);