summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelijahe <elijahe@ca.ibm.com>2014-07-22 15:40:28 -0400
committerelijahe <elijahe@ca.ibm.com>2014-07-22 15:40:28 -0400
commitb7782a9c611b3be51ec37aaeaf34d871eecc6eba (patch)
tree4328d1b93e2710e345375367b6560604d875a394
parent09a54564e7b62a0bfd74f6fd6dfdbf13dfd17abc (diff)
downloadorg.eclipse.orion.client-origin/inlineSearch2.zip
org.eclipse.orion.client-origin/inlineSearch2.tar.gz
org.eclipse.orion.client-origin/inlineSearch2.tar.bz2
Bug 438076 - Replace Global Search Page (search.html) with Inline Search in Edit Page (edit.html)origin/inlineSearch2
- Open side panel if global search is triggered while it is collapsed
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
index 159c1c4..db0e705 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
@@ -495,9 +495,13 @@ define([
name: messages["Global Search"], //$NON-NLS-0$
id: "orion.openInlineSearchPane", //$NON-NLS-0$
visibleWhen: function() {
- return true;
+ return true;
},
callback: function (data) {
+ var mainSplitter = mGlobalCommands.getMainSplitter();
+ if (mainSplitter.splitter.isClosed()) {
+ mainSplitter.splitter.toggleSidePanel();
+ }
this._inlineSearchPane.show();
this._inlineSearchPane.showSearchOptions();
}.bind(this)