aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelijahe2013-11-21 14:23:12 (EST)
committerSilenio Quarti2013-11-21 14:40:14 (EST)
commit5a7f3bc35e5a9a8075a627846b203426631f126a (patch)
tree5e90d266ef1ccf3a48dda0f37ac0adbcf0fa8408
parentafb9e15af04830e1d888988ef139a866e57f042c (diff)
downloadorg.eclipse.orion.client-5a7f3bc35e5a9a8075a627846b203426631f126a.zip
org.eclipse.orion.client-5a7f3bc35e5a9a8075a627846b203426631f126a.tar.gz
org.eclipse.orion.client-5a7f3bc35e5a9a8075a627846b203426631f126a.tar.bz2
Bug 394861 - outliner should provide filtering
- Don't use absolute position for filter input - Fixed JSLint warning --Signed-off-by: Elijah El-Haddad <elijahe@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/edit/common.css4
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorerNavHandler.js14
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/outliner.js1
3 files changed, 8 insertions, 11 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
index 0007fcc..f4b6cd5 100644
--- a/bundles/org.eclipse.orion.client.ui/web/edit/common.css
+++ b/bundles/org.eclipse.orion.client.ui/web/edit/common.css
@@ -16,10 +16,8 @@
.outlineFilter {
border: 1px solid lightgrey;
- text-align: left;
+ margin: 4px;
width: 250px;
- position: absolute;
- top: 5px;
}
.outlineRowHidden {
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorerNavHandler.js b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorerNavHandler.js
index fe51fb4..0acf14f 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorerNavHandler.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorerNavHandler.js
@@ -705,11 +705,13 @@ exports.ExplorerNavHandler = (function() {
}
return;
}
+
+ var curModel = this._modelIterator.cursor();
+ if(!curModel){
+ return;
+ }
+
if(this.explorer.renderer.getRowActionElement){
- var curModel = this._modelIterator.cursor();
- if(!curModel){
- return;
- }
var div = this.explorer.renderer.getRowActionElement(this.model.getId(curModel));
if(div.href){
if(this._ctrlKeyOn(e)){
@@ -720,10 +722,6 @@ exports.ExplorerNavHandler = (function() {
}
}
if(this.explorer.renderer.performRowAction){
- var curModel = this._modelIterator.cursor();
- if(!curModel){
- return;
- }
this.explorer.renderer.performRowAction(e, curModel);
e.preventDefault();
return false;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js b/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js
index 24abd8e..6b772bb 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/outliner.js
@@ -354,6 +354,7 @@ define([
var input = document.createElement("input"); //$NON-NLS-0$
input.classList.add("outlineFilter"); //$NON-NLS-0$
+ input.classList.add("layoutLeft"); //$NON-NLS-0$
input.placeholder = messages["Filter"]; //$NON-NLS-0$
input.type="text"; //$NON-NLS-0$
input.addEventListener("input", function (e) { //$NON-NLS-0$