Attachment 260074 Details for Bug 488798 – Fix

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

[patch] Fix

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

on 2016-03-03 17:26:54 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2016-03-03 17:26:54 EST

Size: 2.16 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
>index 4f5f97b..12079fb 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js
>@@ -280,19 +280,30 @@
> 		
> 		// TODO We check that the internal access to annotation model exists so if it breaks we don't show the checkbox at all
> 		if (command.fixAllEnabled && commandInvocation.userData._annotationModel){
>-			var id = command.name + 'fixAll'; //$NON-NLS-1$
>-			fixAllCheckbox = document.createElement('input'); //$NON-NLS-1$
>-			fixAllCheckbox.type = 'checkbox'; //$NON-NLS-1$
>-			fixAllCheckbox.className = "quickfixAllParameter"; //$NON-NLS-1$
>-			fixAllCheckbox.id = id;
>-			
>-			fixAllLabel = document.createElement('label'); //$NON-NLS-1$
>-			fixAllLabel.htmlFor = id;
>-			fixAllLabel.className = "quickfixAllParameter"; //$NON-NLS-1$
>-			fixAllLabel.appendChild(document.createTextNode(messages['fixAll'])); 
>-			
>-			element.appendChild(fixAllCheckbox);
>-			element.appendChild(fixAllLabel);
>+			var targetAnnotation = commandInvocation.userData;
>+			var hasMultiple = false;
>+			var allAnnotations = commandInvocation.userData._annotationModel._annotations;
>+			for (var i=0; i<allAnnotations.length; i++) {
>+				if (allAnnotations[i].id === targetAnnotation.id && (allAnnotations[i].start !== targetAnnotation.start || allAnnotations[i].end !== targetAnnotation.end)){
>+					hasMultiple = true;
>+					break;
>+				}
>+			}
>+			if (hasMultiple){
>+				var id = command.name + 'fixAll'; //$NON-NLS-1$
>+				fixAllCheckbox = document.createElement('input'); //$NON-NLS-1$
>+				fixAllCheckbox.type = 'checkbox'; //$NON-NLS-1$
>+				fixAllCheckbox.className = "quickfixAllParameter"; //$NON-NLS-1$
>+				fixAllCheckbox.id = id;
>+				
>+				fixAllLabel = document.createElement('label'); //$NON-NLS-1$
>+				fixAllLabel.htmlFor = id;
>+				fixAllLabel.className = "quickfixAllParameter"; //$NON-NLS-1$
>+				fixAllLabel.appendChild(document.createTextNode(messages['fixAll'])); 
>+				
>+				element.appendChild(fixAllCheckbox);
>+				element.appendChild(fixAllLabel);
>+			}
> 		}
> 		
> 		parent.appendChild(element);

Actions: View | Diff

Attachments on bug 488798: 260074