alex/restaurant-search
1
Fork 0
Code Releases Activity

More work on plumbing through brackets

Browse Source
This commit is contained in:
Alex Yatskov 2015-06-28 12:36:35 +09:00
parent d0931fdea0
commit 01a610c77a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
static/scripts/grapher.js
View File

@ -88,6 +88,7 @@
var _height = 500;
var _padding = 10;
var _panelSize = 20;
var _tickSize = 5;
var _width = 120;
var _animation = null;
@ -137,7 +138,7 @@
// label
_elements.label = _canvas.text(
_width / 2,
(_width - _bracketSize) / 2,
_height - _panelSize / 2,
_name
).attr({
@ -168,7 +169,7 @@
_elements.tick = _canvas.line(
_densitySize,
origin,
_width - _densitySize - _bracketSize,
_width - _bracketSize + _tickSize,
origin
).attr({
stroke: _tickColor
@ -320,10 +321,13 @@
return colorStops;
}
function updateValue(value) {
_data.value = _range.clamp(value);
function updateValue(value, bracket) {
_data.value = _range.clamp(value);
_data.bracket.max = _range.clamp(bracket.max);
_data.bracket.min = _range.clamp(bracket.min);
if (_onValueChanged) {
_onValueChanged(_name, _data.value);
_onValueChanged(_name, _data.value, _data.bracket);
}
animateIndicator(_valueAnimated, _data.value);
@ -400,16 +404,19 @@
function indicatorClick(event, x, y) {
var rect = _canvas.node.getBoundingClientRect();
var val = indicatorToValue(y - rect.top);
updateValue(val);
updateValue(indicatorToValue(y - rect.top), _data.bracket);
}
function bracketClick(event, x, y) {
var mid = (_data.bracket.min + _data.bracket.max) / 2;
var rect = _canvas.node.getBoundingClientRect();
var val = bracketToValue(y - rect.top);
alert('Clicked');
var dist = Math.abs(mid - bracketToValue(y - rect.top));
dist = Math.min(dist, Math.abs(_range.max - mid));
dist = Math.min(dist, Math.abs(_range.min - mid));
updateValue(_data.value, {max: mid + dist, min: mid - dist});
}
this.update = function(data, scale) {

2
static/scripts/search.js
View File

@ -25,7 +25,7 @@
var _ctx = {};
function onAdjust(name, value) {
function onAdjust(name, value, bracket) {
_ctx.query.features[name] = value;
$.post('/query', JSON.stringify(_ctx.query), function(results) {