Permalink
Browse files

Merge branch 'master' into gh-pages

* master: (25 commits)
  Updating docs for 0.5.0
  Bumping version to 0.5.0.
  Updating VisualSearch.js to 0.5.0. Includes many bug fixes, upgraded dependencies, and readOnly option.
  Adding readOnly option. Closing #119.
  Upgrading jQuery to 1.11.0 and jQuery UI to 1.10.4.
  Upping Backbone to v1.1.0 and Underscore to v1.5.2.
  Revert "Revert "Listento Keyup events to handle inputBox.resize""
  Fixing clear search on command+a.
  Revert "Listento Keyup events to handle inputBox.resize"
  Moving @hirokiosame's search.js to gh-pages index.html instead of readme. Closes #114.
  Source formatting.
  Expose removedFacet as a callback
  Add clearSearch in defaults callbacks
  forgot a comma...
  adding bower file for visualsearch
  Minor grammatical fix
  Adding support for managing options on views according newer bb versions
  whitespaces
  Removed Markdown formatting to make link
  Listento Keyup events to handle inputBox.resize
  ...
  • Loading branch information...
2 parents f8dddda + 372ea11 commit 33e0702f2486f5709028b52933d09477e7c650cc @samuelclay samuelclay committed Feb 10, 2014
Showing with 25,168 additions and 18,460 deletions.
  1. +1 −1 README
  2. +1 −1 assets.yml
  3. +31 −0 bower.json
  4. +868 −312 build-min/dependencies.js
  5. BIN build-min/dependencies.js.gz
  6. +1 −1 build-min/visualsearch-datauri.css
  7. BIN build-min/visualsearch-datauri.css.gz
  8. +1 −1 build-min/visualsearch.css
  9. BIN build-min/visualsearch.css.gz
  10. +36 −67 build-min/visualsearch.js
  11. BIN build-min/visualsearch.js.gz
  12. +2 −2 build-min/visualsearch_templates.js
  13. BIN build-min/visualsearch_templates.js.gz
  14. +9,054 −8,136 build/dependencies.js
  15. +15 −0 build/visualsearch-datauri.css
  16. +15 −0 build/visualsearch.css
  17. +111 −69 build/visualsearch.js
  18. +5 −3 demo.html
  19. +135 −12 docs/backbone_extensions.html
  20. +466 −146 docs/docco.css
  21. +318 −62 docs/hotkeys.html
  22. +164 −12 docs/inflector.html
  23. +419 −161 docs/jquery_extensions.html
  24. BIN docs/public/fonts/aller-bold.eot
  25. BIN docs/public/fonts/aller-bold.ttf
  26. BIN docs/public/fonts/aller-bold.woff
  27. BIN docs/public/fonts/aller-light.eot
  28. BIN docs/public/fonts/aller-light.ttf
  29. BIN docs/public/fonts/aller-light.woff
  30. BIN docs/public/fonts/novecento-bold.eot
  31. BIN docs/public/fonts/novecento-bold.ttf
  32. BIN docs/public/fonts/novecento-bold.woff
  33. +375 −0 docs/public/stylesheets/normalize.css
  34. +1,025 −333 docs/search_box.html
  35. +859 −332 docs/search_facet.html
  36. +230 −50 docs/search_facets.html
  37. +852 −320 docs/search_input.html
  38. +287 −59 docs/search_parser.html
  39. +274 −47 docs/search_query.html
  40. +115 −7 docs/templates.html
  41. +242 −55 docs/visualsearch.html
  42. +29 −9 index.html
  43. +15 −0 lib/css/workspace.css
  44. +1 −1 lib/js/templates/search_box.jst
  45. +1 −1 lib/js/templates/search_facet.jst
  46. +1 −1 lib/js/templates/search_input.jst
  47. +3 −3 lib/js/templates/templates.js
  48. +22 −11 lib/js/views/search_box.js
  49. +51 −34 lib/js/views/search_facet.js
  50. +29 −18 lib/js/views/search_input.js
  51. +6 −3 lib/js/visualsearch.js
  52. +648 −565 vendor/{backbone-0.9.10.js → backbone-1.1.0.js}
  53. +8,206 −7,424 vendor/{jquery-1.9.0.js → jquery-1.11.0.js}
  54. +36 −44 vendor/jquery.ui.autocomplete.js
  55. +20 −24 vendor/jquery.ui.core.js
  56. +15 −9 vendor/jquery.ui.menu.js
  57. +16 −12 vendor/jquery.ui.position.js
  58. +5 −5 vendor/jquery.ui.widget.js
  59. +162 −107 vendor/{underscore-1.4.3.js → underscore-1.5.2.js}
View
2 README
@@ -13,4 +13,4 @@ completable values for any facet. You can retrieve the search query as a
structured object, so you don't have to parse the query string yourself.
For documentation, pre-packed downloads, demos, and tests, see:
-http://documentcloud.github.com/visualsearch
+http://documentcloud.github.com/visualsearch
View
@@ -19,7 +19,7 @@ javascripts:
- lib/js/utils/*.js
- lib/js/models/*.js
- lib/js/templates/*.jst
- <% unless $VS_MIN %>visualsearch_templates:
+ <% if not $VS_MIN %>visualsearch_templates:
- lib/js/templates/*.jst
<% end %>
View
@@ -0,0 +1,31 @@
+{
+ "name": "visualsearch",
+ "version": "0.5.0",
+ "homepage": "http://documentcloud.github.io/visualsearch/",
+ "authors": [
+ "Samuel Clay",
+ "@samuelclay"
+ ],
+ "description": "A Rich Search Box for Real Data",
+ "main": ["build-min/visualsearch-datauri.css", "build-min/visualsearch.css", "build-min/visualsearch.js"],
+ "license": "MIT",
+ "dependencies": {
+ "jQuery": ">=1.4",
+ "jquery-ui": ">=1.8",
+ "backbone": ">=0.9.10",
+ "underscore":">=1.4.3"
+ },
+ "ignore": [
+ "**/.*",
+ "node_modules",
+ "bower_components",
+ "test",
+ "tests",
+ "Rakefile",
+ "vendor",
+ "*.html",
+ "build",
+ "docs",
+ "*.yml"
+ ]
+}
View

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 33e0702

Please sign in to comment.