alex/restaurant-search
1
Fork 0
Code Releases Activity

Merging with master

Browse Source
This commit is contained in:
Alex Yatskov 2014-09-27 10:13:15 +09:00
commit bdb5c93586
4 changed files with 590 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/bower.json
View File

@ -14,7 +14,6 @@
], ],
"dependencies": { "dependencies": {
"bootstrap": "~3.2.0", "bootstrap": "~3.2.0",
"closurelibrary": "*",
"fabric": "~1.4.8", "fabric": "~1.4.8",
"handlebars": "~1.3.0", "handlebars": "~1.3.0",
"underscore": "~1.6.0", "underscore": "~1.6.0",

21
client/index.html
View File

@ -161,18 +161,15 @@
</div> </div>
</div> </div>
<!-- <script src="bower_components/underscore/underscore.js"></script> --> <script src="bower_components/underscore/underscore.js"></script>
<!-- <script src="bower_components/handlebars/handlebars.min.js"></script> --> <script src="bower_components/handlebars/handlebars.min.js"></script>
<!-- <script src="bower_components/closurelibrary/closure/goog/base.js"></script> --> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<!-- <script src="bower_components/jquery/dist/jquery.min.js"></script> --> <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> --> <script src="bower_components/fabric/dist/fabric.min.js"></script>
<!-- <script src="bower_components/fabric/dist/fabric.min.js"></script> --> <script src="bower_components/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
<!-- <script src="bower_components/bootstrap-select/dist/js/bootstrap-select.min.js"></script> --> <script src="bower_components/tinycolor/tinycolor.js"></script>
<!-- <script src="bower_components/tinycolor/tinycolor.js"></script> -->
<!-- <script src="js/application.js"></script> --> <script src="js/application.js"></script>
<!-- <script src="js/grapher.js"></script> --> <script src="js/grapher.js"></script>
<script src="dist/all.min.js"></script>
</body> </body>
</html> </html>

2
client/js/application.js
View File

@ -49,7 +49,7 @@
ctx.hintSteps = query.hintSteps; ctx.hintSteps = query.hintSteps;
ctx.maxResults = query.maxResults; ctx.maxResults = query.maxResults;
ctx.grapher = new Grapher('grapher', ctx.searchRange, 150, true, true); ctx.grapher = new grapher.Grapher('grapher', ctx.searchRange, 150, true, true);
ctx.grapher.setColumns(results.columns); ctx.grapher.setColumns(results.columns);
ctx.grapher.setValueChangedListener(onAdjust); ctx.grapher.setValueChangedListener(onAdjust);

1096
client/js/grapher.js
View File

File diff suppressed because it is too large Load Diff