Attachment 236865 Details for Bug 420337 – Patch

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

[patch] Patch

file_420337.txt (text/plain), 2.47 KB, created by Bogdan Gheorghe

on 2013-10-24 17:33:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2013-10-24 17:33:17 EDT

Size: 2.47 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
>index 5031e93..4a931b8 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
>@@ -421,6 +421,9 @@
> 					if (!editor.getTextView()) {
> 						return false;
> 					}
>+					if (self.editorSettings && !self.editorSettings().showBlame) {
>+						return false;
>+					}
> 					return blamer.isVisible(self.serviceRegistry, self.inputManager);
> 				},
> 				callback: function(data) {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorPreferences.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorPreferences.js
>index 0ee0549..60f12fe 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorPreferences.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorPreferences.js
>@@ -29,6 +29,8 @@
> 		autoLoadVisible: true,
> 		saveDiffs: true,
> 		saveDiffsVisible: true,
>+		showBlame: false,
>+		showBlameVisible: true,
> 		autoPairParentheses: true,
> 		autoPairParenthesesVisible: true,
> 		autoPairBraces: true,
>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 5775419..e2ffb12 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
>@@ -166,6 +166,8 @@
> 	"autoPairQuotations": 'Autopair "Strings"',
> 	"autoCompleteComments": "Autocomplete /** Block Comments */",
> 	"smartIndentation": "Smart Indentation",
>+	"sourceControl": "Source Control",
>+	"showBlame": "Show Blame",
> 	"Editor preferences updated": "Editor preferences updated",
> 	"Editor defaults restored": "Editor defaults restored",
> 	"Theme": "Theme",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/EditorSettings.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/EditorSettings.js
>index 302dc4a..af3ddf8 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/EditorSettings.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/settings/EditorSettings.js
>@@ -183,6 +183,11 @@
> 				overviewRuler: {
> 					create: createBooleanProperty
> 				}
>+			},
>+			sourceControl: {
>+				showBlame: {
>+					create: createBooleanProperty
>+				}
> 			}
> 		}
> 	};

Actions: View | Diff

Attachments on bug 420337: 236865