Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Buschtöns2013-07-23 09:49:53 +0000
committerTim Buschtöns2013-07-23 09:49:53 +0000
commit1550afdaae378542d9582828958702d4552c2ef5 (patch)
treebdd6d84f7712ab52e918a9475494bb2b262af54a
parentc1ea615422e37d391ad94ac62512c1a7b99ca976 (diff)
downloadorg.eclipse.rap.incubator.dropdown-1550afdaae378542d9582828958702d4552c2ef5.tar.gz
org.eclipse.rap.incubator.dropdown-1550afdaae378542d9582828958702d4552c2ef5.tar.xz
org.eclipse.rap.incubator.dropdown-1550afdaae378542d9582828958702d4552c2ef5.zip
Remove unnecessary fields from AutoSugget.js results object
"query" and "limit" were only used by tests, and those were rather redundant
-rw-r--r--bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/resources/AutoSuggest.js4
-rw-r--r--tests/org.eclipse.rap.addons.dropdown.test/jasmine/jasmine/specs/AutoSuggestSpec.js6
2 files changed, 1 insertions, 9 deletions
diff --git a/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/resources/AutoSuggest.js b/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/resources/AutoSuggest.js
index 92548e3..8b6d2e5 100644
--- a/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/resources/AutoSuggest.js
+++ b/bundles/org.eclipse.rap.addons.dropdown/src/org/eclipse/rap/addons/dropdown/internal/resources/AutoSuggest.js
@@ -205,9 +205,7 @@ function searchItems( items, query, limit ) {
var resultItems = filterArray( items, filter, resultLimit );
return {
"items" : resultItems,
- "indicies" : resultIndicies,
- "query" : query,
- "limit" : resultLimit
+ "indicies" : resultIndicies
};
}
diff --git a/tests/org.eclipse.rap.addons.dropdown.test/jasmine/jasmine/specs/AutoSuggestSpec.js b/tests/org.eclipse.rap.addons.dropdown.test/jasmine/jasmine/specs/AutoSuggestSpec.js
index 651e96b..d693c4f 100644
--- a/tests/org.eclipse.rap.addons.dropdown.test/jasmine/jasmine/specs/AutoSuggestSpec.js
+++ b/tests/org.eclipse.rap.addons.dropdown.test/jasmine/jasmine/specs/AutoSuggestSpec.js
@@ -150,7 +150,6 @@
it( "returns empty result for empty array", function() {
var results = searchItems( [], /foo/ );
- expect( results.query.toString() ).toEqual( "/foo/" );
expect( results.items ).toEqual( [] );
expect( results.indicies ).toEqual( [] );
} );
@@ -160,10 +159,8 @@
var results = searchItems( items, /foo/ );
- expect( results.query.toString() ).toBe( "/foo/" );
expect( results.items ).toEqual( [ "afoo", "food" ] );
expect( results.indicies ).toEqual( [ 0, 2 ] );
- expect( results.limit ).toBe( 0 );
} );
it( "returns multiple items with limit", function() {
@@ -171,17 +168,14 @@
var results = searchItems( items, /foo/, 3 );
- expect( results.query.toString() ).toBe( "/foo/" );
expect( [ "afoo", "bfoo", "cfoo" ], results.items );
expect( [ 0, 1, 3 ], results.indicies );
- expect( 3, results.limit );
} );
it( "returns only items starting with string", function() {
var items = [ "afoo", "bar", "food", "abc" ];
var results = searchItems( items, /^foo/ );
- expect( results.query.toString() ).toBe( "/^foo/" );
expect( results.items ).toEqual( [ "food" ] );
expect( results.indicies ).toEqual( [ 2 ] );
} );

Back to the top