Attachment 232446 Details for Bug 410927 – fix

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

fix

file_410927.txt (text/plain), 2.39 KB, created by Silenio Quarti

on 2013-06-17 11:07:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2013-06-17 11:07:08 EDT

Size: 2.39 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js
>index 86555f9..45bf226 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js
>@@ -218,7 +218,7 @@
> 			var string = this.getFindString();
> 			var count;
> 			if (tempOptions) {
>-				string = tempOptions.findString || this.getFindString();
>+				string = tempOptions.findString || string;
> 				count =  tempOptions.count;
> 			}
> 			var savedOptions = this.getOptions();
>@@ -363,7 +363,7 @@
> 					this._showAll = options.showAll;
> 					if (this.isVisible()) {
> 						if (this._showAll) {
>-							this._markAllOccurrences(true);
>+							this._markAllOccurrences();
> 						} else {
> 							var annotationModel = this._editor.getAnnotationModel();
> 							if (annotationModel) {
>@@ -475,7 +475,7 @@
> 						}
> 						var that = this;
> 						this._timer = window.setTimeout(function(){
>-							that._markAllOccurrences(!!result, string);
>+							that._markAllOccurrences();
> 							that._timer = null;
> 						}, 500);
> 					}
>@@ -497,7 +497,7 @@
> 			editor.setText(newStr, start, end);
> 			editor.setSelection(start, start + newStr.length, true);
> 		},
>-		_markAllOccurrences: function(match, string) {
>+		_markAllOccurrences: function() {
> 			var annotationModel = this._editor.getAnnotationModel();
> 			if (!annotationModel) {
> 				return;
>@@ -512,18 +512,17 @@
> 				}
> 			}
> 			if (this.isVisible()) {
>-				if (match && string) {
>-					iter = this._editor.getModel().find({
>-						string: string,
>-						regex: this._regex,
>-						wholeWord: this._wholeWord,
>-						caseInsensitive: this._caseInsensitive
>-					});
>-					add = [];
>-					while (iter.hasNext()) {
>-						var range = iter.next();
>-						add.push(mAnnotations.AnnotationType.createAnnotation(type, range.start, range.end));
>-					}
>+				var string = this.getFindString();
>+				iter = this._editor.getModel().find({
>+					string: string,
>+					regex: this._regex,
>+					wholeWord: this._wholeWord,
>+					caseInsensitive: this._caseInsensitive
>+				});
>+				add = [];
>+				while (iter.hasNext()) {
>+					var range = iter.next();
>+					add.push(mAnnotations.AnnotationType.createAnnotation(type, range.start, range.end));
> 				}
> 			}
> 			annotationModel.replaceAnnotations(remove, add);

Actions: View

Attachments on bug 410927: 232446