Attachment 236717 Details for Bug 419981 – Second patch after Simon's first review

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

Second patch after Simon's first review

patch419981_1.txt (text/plain), 2.87 KB, created by libing wang

on 2013-10-21 10:58:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: libing wang

Created: 2013-10-21 10:58:27 EDT

Size: 2.87 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
>index 049d44a..e76836d 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalSearch/advSearchOptContainer.js
>@@ -98,18 +98,24 @@
> 	        if (this._searchParams.resource.length > 0) {
> 	            this._serviceRegistry.getService("orion.page.progress").progress(this.fileClient.read(this._searchParams.resource, true), "Getting file metadata " + this._searchParams.resource).then( //$NON-NLS-1$ //$NON-NLS-0$
> 	            function(meta) {
>-	                var parentName = mSearchUtils.fullPathNameByMeta(meta.Parents);
>+	                var parentName = meta.Parents ? mSearchUtils.fullPathNameByMeta(meta.Parents) : "";
> 	                this._locationName = parentName.length === 0 ? meta.Name : parentName + "/" + meta.Name; //$NON-NLS-0$
>-					this._searchNameBox.value = this._getDefaultSaveName();
>+		            if(this._searchNameBox){
>+						this._searchNameBox.value = this._getDefaultSaveName();
>+					}
> 	            }.bind(this),
> 	
> 	            function(error) {
> 	                this._locationName = "root"; //$NON-NLS-0$
>-					this._searchNameBox.value = this._getDefaultSaveName();
>+		            if(this._searchNameBox){
>+						this._searchNameBox.value = this._getDefaultSaveName();
>+					}
> 	            }.bind(this));
> 	        } else {
> 	            this._locationName = "root"; //$NON-NLS-0$
>-				this._searchNameBox.value = this._getDefaultSaveName();
>+	            if(this._searchNameBox){
>+					this._searchNameBox.value = this._getDefaultSaveName();
>+				}
> 	        }
> 	        //this._searchHelper = mSearchUtils.generateSearchHelper(searchParams);
> 			this._loadSearchParams();
>@@ -185,7 +191,7 @@
> 	    },
> 	
> 	    _getDefaultSaveName: function() {
>-	        if (this._searchBox.value) {
>+	        if (this._searchBox && this._searchBox.value) {
> 	            var qName = "\'" + this._searchBox.value + "\' in "; //$NON-NLS-1$ //$NON-NLS-0$
> 	            var locName = "root"; //$NON-NLS-0$
> 	            if(this._locationName){
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>index 9f77684..e71db94 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchExplorer.js
>@@ -1468,6 +1468,7 @@
> 		    this.parentNode.textContent = "";
> 		    var textBold = _createElement('b', null, null, this.parentNode); //$NON-NLS-1$ //$NON-NLS-0$
> 		    _place(document.createTextNode(message), textBold, "only"); //$NON-NLS-0$
>+            this.reportStatus("");
> 		    return;
> 		} 
>         var that = this;

Actions: View

Attachments on bug 419981: 236716 | 236717