Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions examples/simple/search/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
<!DOCTYPE html>
<html>

<head>
<style>
div.ss.ac {
left:0px;
}
</style>
</head>


<!--
<head>
<style>
#breaksAc {
Expand All @@ -10,18 +21,40 @@
position: relative;
}
</style>
<script searchspring-id="i845p9" src="/dev-dist/widgets.js"></script>
<script searchspring-id="wdi2sa" src="/dev-dist/widgets.js"></script>
<script>window.m = SearchSpring.Widgets.Utilities.m;</script>
</head>
<body>
<header>
<form action="">
<input style="float: right" type="text" placeholder="search" name="keyword"></input>
<input style="font-size: 24pt; width: 500px;" type="text" placeholder="What are you shopping for?" name="keyword"></input>
<searchspring widget="simple/autocomplete"></searchspring>
<div style="clear:both"></div>
</form>
</header>
<hr />

<searchspring widget="simple/search" parameter="keyword"></searchspring>
</body>
-->

<body>

<div id="search">
<form action="">
<input id="express-preview-input" name="query" type="text" placeholder="What are you shopping for?" style="font-size: 24pt; width: 500px;" />
<searchspring widget="simple/autocomplete"></searchspring>
</form>
</div>

<hr size="1"/>

<searchspring widget="simple/search" parameter="query"></searchspring>

<script src="/dist/widgets.js" searchspring-id="wdi2sa"></script>
<script>window.m = SearchSpring.Widgets.Utilities.m;</script>

</body>
</html>


5 changes: 0 additions & 5 deletions gulpfile.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ function getWebpackConf(_path) {
]
},
},
{
test: /\.js$/,
loader: "eslint-loader",
exclude: [ /node_modules/, /.test.js$/ ]
},
{
test: /\.scss$/,
exclude: /node_modules/,
Expand Down
17 changes: 14 additions & 3 deletions src/library/Services/Autocompleter.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Autocompleter extends Requester {
this._mutators = []; // disable Requester mutator
this._acMutators = [];

this.searcher = new Searcher({ siteId: defaultParams.pubId });
this.searcher = new Searcher({ siteId: defaultParams.pubId}, { apiEndpoint: '/api/search/autocomplete.json' });
}

mutated(cb) {
Expand All @@ -42,7 +42,11 @@ class Autocompleter extends Requester {
});
} else {
super.request(params).then(acData => {
if(acData.terms && acData.terms.length) {

// TODO: Potential spot for autocomplete gate

// if(true || (acData.terms && acData.terms.length)) {
/*
acData.terms = (acData.terms || [])
.map(suggestion => suggestion.replace(/<\/?em>/g, ''))
.map(term => {
Expand All @@ -62,15 +66,22 @@ class Autocompleter extends Requester {

return ret;
});
*/

let query = acData.terms[0].raw;
acData.terms = []; // ignore Autocomplete query suggestions

// let query = (acData.terms && acData.terms.length > 0) ? acData.terms[0].raw : params.query;
let query = params.query;

this.searcher.request({ q: query }).then(searchData => {
cb(Object.assign({}, searchData, { terms: acData.terms }), Object.assign({}, params, { q: query }));
}, () => deferred.reject());

/*
} else {
deferred.reject();
}
*/
});
}

Expand Down
1 change: 1 addition & 0 deletions src/library/Services/Searcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class Searcher extends Requester {
constructor(defaultParams, config) {
defaultParams = Object.assign({}, {
domain: encodeURIComponent(window.location.href),
experimentalMode: 'discrete-loose',
resultsFormat: 'native'
}, defaultParams || {});

Expand Down
7 changes: 6 additions & 1 deletion widgets/simple/autocomplete/src/Components/Autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ let Autocomplete = {
});

let search = (chunk, keep) => {

autocompleter.request(chunk).then(acData => {
state(Object.assign(acData, keep || {}, { chunk }));
}, () => {
Expand Down Expand Up @@ -64,7 +65,11 @@ let Autocomplete = {
};

this.isVisible = () => {
return attrs.input.value && (state().results || []).length && (state().terms || []).length;

// TODO: Gate for autocomplete to not require terms
//return attrs.input.value && (state().results || []).length && (state().terms || []).length;
return attrs.input.value && (state().results || []).length;

};
});
},
Expand Down
1 change: 0 additions & 1 deletion widgets/simple/autocomplete/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Widgets.register('simple/autocomplete', {
}));

document.body.addEventListener('click', () => {
console.log('click body');
this.vm.focus(false);
});

Expand Down
7 changes: 7 additions & 0 deletions widgets/simple/search/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ Widgets.register('simple/search', {
}

searcher.request(request).then(response => {

// Redirect the shopper if so directed by merchandising directive
if (response.merchandising && response.merchandising.redirect) {
window.location.href = response.merchandising.redirect;
return;
}

state({ response, q });
});
};
Expand Down