Attachment 264836 Details for Bug 490492 – Patch to display in status pane wrapped in darklaunch flag

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

[patch] Patch to display in status pane wrapped in darklaunch flag

changes (9).patch (text/plain), 5.42 KB, created by Curtis Windatt

on 2016-10-13 16:29:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2016-10-13 16:29:42 EDT

Size: 5.42 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>index d316f3d..ea05e17 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/settings/nls/root/messages.js
>@@ -284,5 +284,6 @@
>     "editorTheme selection background": "Selection background",
>     'customizeTheme': 'Custom Style...',
>     'moreEditorSettings': 'Editor Settings...',
>-    'SettingWarning' : '${0} Warning: Global settings for \'${2}\' are overriden by the settings defined in: ${1}'
>+    'SettingWarning' : '${0} Warning: Global settings for \'${2}\' are overriden by the settings defined in: ${1}',
>+    "version": "Version ${0}",
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/SettingsContainer.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/SettingsContainer.js
>index 2990b07..03f4f30 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/SettingsContainer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/SettingsContainer.js
>@@ -18,10 +18,13 @@
> 	'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',
>@@ -36,11 +39,12 @@
> 	'orion/editorPreferences',
> 	'orion/generalPreferences',
> 	'orion/metrics',
>-	'orion/util'
>-], function(messages, mGlobalCommands, PageUtil, lib, objects, URITemplate, 
>-		ThemeBuilder, SettingsList, mThemePreferences, editorThemeData, editorThemeImporter, SplitSelectionLayout, PluginList, 
>+	'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
>@@ -48,6 +52,8 @@
> 	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$
>@@ -61,6 +67,20 @@
> 		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, {
>@@ -197,7 +217,7 @@
> 
> 			this.updateToolbar(id);
> 
>-			var editorSettingsNode = document.createElement('div'); //$NON-NLS-0$
>+			var editorSettingsNode = document.createElement('div');
> 			this.table.appendChild(editorSettingsNode);
> 
> 			var editorTheme = new editorThemeData.ThemeData();
>@@ -230,7 +250,7 @@
> 
> 			this.updateToolbar(id);
> 			
>-			var userNode = document.createElement('div'); //$NON-NLS-0$
>+			var userNode = document.createElement('div');
> 			this.table.appendChild(userNode);
> 
> 			this.userWidget = new UserSettings({
>@@ -258,7 +278,7 @@
> 
> 			this.updateToolbar(id);
> 			
>-			var userNode = document.createElement('div'); //$NON-NLS-0$
>+			var userNode = document.createElement('div');
> 			this.table.appendChild(userNode);
> 
> 			this.gitWidget = new GitSettings({
>@@ -281,7 +301,7 @@
> 
> 			this.updateToolbar(id);
> 
>-			var themeSettingsNode = document.createElement('div'); //$NON-NLS-0$
>+			var themeSettingsNode = document.createElement('div');
> 			this.table.appendChild(themeSettingsNode);
> 
> 			var editorTheme = new editorThemeData.ThemeData();
>@@ -325,7 +345,7 @@
> 
> 			this.updateToolbar(id);
> 			
>-			var userNode = document.createElement('div'); //$NON-NLS-0$
>+			var userNode = document.createElement('div');
> 			this.table.appendChild(userNode);
> 
> 			this.globalizationWidget = new GlobalizationSettings({
>@@ -353,7 +373,7 @@
> 
> 			this.updateToolbar(id);
> 			
>-			var userNode = document.createElement('div'); //$NON-NLS-0$
>+			var userNode = document.createElement('div');
> 			this.table.appendChild(userNode);
> 			
> 			var generalPreferences = new mGeneralPreferences.GeneralPreferences (this.preferences);

Actions: View | Diff

Attachments on bug 490492: 260647 | 264835 | 264836