Bug 423386 - Sidebar resizing in a filtered outline mode causes 'View…

…' menu button to disappear - Removed tooltip and moved filter back to the left --Signed-off-by: Elijah El-Haddad <elijahe@ca.ibm.com>
elijahe · Dec 6, 2013 · a0b1df7 · a0b1df7
1 parent 1b31a87
commit a0b1df7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/edit/common.css b/bundles/org.eclipse.orion.client.ui/web/edit/common.css
@@ -17,8 +17,8 @@
 .outlineFilter {
 	border: 1px solid lightgrey;
 	margin: 4px;
-	width: 210px;
-	position: absolute;
+	width: 65%;
+	float: left;
 }
 
 .outlineRowMatchesFilter {

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js b/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js
@@ -21,9 +21,8 @@ define([
 	'orion/URITemplate',
 	'orion/EventTarget',
 	'orion/i18nUtil',
-	'orion/edit/editorContext',
-	'orion/webui/tooltip'
-], function(messages, Deferred, lib, mUIUtils, mSection, mExplorer, mCommands, URITemplate, EventTarget, i18nUtil, EditorContext, Tooltip) {
+	'orion/edit/editorContext'
+], function(messages, Deferred, lib, mUIUtils, mSection, mExplorer, mCommands, URITemplate, EventTarget, i18nUtil, EditorContext) {
 
 	function OutlineRenderer (options, explorer, title, selectionService) {
 		this.explorer = explorer;
@@ -415,10 +414,6 @@ define([
 				this.explorer.destroy();
 				this.explorer = null;
 			}
-
-			//reset the sidebar switcher node's layout state
-			this._sidebar.switcherNode.classList.remove("layoutLeft");
-			this._sidebar.switcherNode.classList.add("layoutRight");
 		},
 
 		_createFilterInput: function() {
@@ -454,33 +449,7 @@ define([
 				}
 			}.bind(this), false);
 
-			input.commandTooltip = new Tooltip.Tooltip({
-				node: input,
-				text: messages["Filter"], //$NON-NLS-0$
-				position: ["right", "above", "left"], //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
-				trigger: "none" //$NON-NLS-0$
-			});
-
-			// add handlers to show/hide tooltip
-			var showTooltip = function(e){
-				input.commandTooltip.show();
-			};
-			var hideTooltip = function(e){
-				input.commandTooltip.hide(0);
-			};
-			input.addEventListener("mouseover", showTooltip, false);
-			input.addEventListener("mouseout", function(e) {
-				if (input !== document.activeElement) {
-					hideTooltip();	
-				}
-			}, false);
-			input.addEventListener("focus", showTooltip, false);
-			input.addEventListener("blur", hideTooltip, false);
-
 			this._toolbar.appendChild(input);
-			//move the sidebar's switcher node to the left
-			this._sidebar.switcherNode.classList.remove("layoutRight");
-			this._sidebar.switcherNode.classList.add("layoutLeft");
 		},
 
 		/**