Permalink
Browse files

merge from upstream

  • Loading branch information...
2 parents 434dac2 + aaaefd2 commit fb3bb98228e729b4653f41644f18bc56e0628768 @jrburke jrburke committed Dec 13, 2012
Showing with 6,266 additions and 5,030 deletions.
  1. +2 −0 .gitignore
  2. +6 −0 .npmignore
  3. +5 −0 .travis.yml
  4. +2 −0 CNAME
  5. +9 −0 CONTRIBUTING.md
  6. +3 −2 Rakefile
  7. +37 −34 backbone-min.js
  8. +542 −440 backbone.js
  9. +69 −27 docs/backbone-localstorage.html
  10. +519 −454 docs/backbone.html
  11. +7 −1 docs/docco.css
  12. BIN docs/images/airbnb-mobile.png
  13. BIN docs/images/airbnb.png
  14. BIN docs/images/animoto.png
  15. BIN docs/images/artsy.png
  16. BIN docs/images/attictv.png
  17. BIN docs/images/audiovroom.png
  18. BIN docs/images/backbone.png
  19. BIN docs/images/basecamp-calendar.jpg
  20. BIN docs/images/basecamp-mobile.png
  21. BIN docs/images/bitbucket.png
  22. BIN docs/images/blackcomb.png
  23. BIN docs/images/blossom.png
  24. BIN docs/images/chaincal.png
  25. BIN docs/images/chop.png
  26. BIN docs/images/disqus.png
  27. BIN docs/images/ducksboard.png
  28. BIN docs/images/easel.png
  29. BIN docs/images/editd.png
  30. BIN docs/images/gilt.jpg
  31. BIN docs/images/grove.png
  32. BIN docs/images/hulu.png
  33. BIN docs/images/inkling.png
  34. BIN docs/images/irccloud.png
  35. BIN docs/images/jolicloud.jpg
  36. BIN docs/images/khan-academy.png
  37. BIN docs/images/kicksend.png
  38. BIN docs/images/linkedin-mobile.png
  39. BIN docs/images/newsblur.jpg
  40. BIN docs/images/pitchfork.png
  41. BIN docs/images/posterous-spaces.png
  42. BIN docs/images/prose.png
  43. BIN docs/images/quietwrite.png
  44. BIN docs/images/rdio.png
  45. BIN docs/images/shortmail.png
  46. BIN docs/images/spin.png
  47. BIN docs/images/syllabus.jpg
  48. BIN docs/images/usa-today.png
  49. BIN docs/images/walmart-mobile.png
  50. BIN docs/images/wpcom-notifications.png
  51. BIN docs/images/wunderkit.png
  52. +210 −0 docs/js/jquery.lazyload.js
  53. +37 −36 docs/todos.html
  54. +119 −80 examples/backbone-localstorage.js
  55. +8 −8 examples/todos/index.html
  56. +17 −19 examples/todos/todos.js
  57. +1,018 −448 index.html
  58. +9 −5 package.json
  59. +474 −129 test/collection.js
  60. +45 −0 test/environment.js
  61. +227 −34 test/events.js
  62. +35 −0 test/index.html
  63. +321 −161 test/model.js
  64. +1 −1 test/noconflict.js
  65. +360 −134 test/router.js
  66. +0 −31 test/setdomlibrary.js
  67. +18 −8 test/speed.js
  68. +133 −72 test/sync.js
  69. +0 −30 test/test-ender.html
  70. +1 −1 test/test-zepto.html
  71. +0 −36 test/test.html
  72. +0 −1,678 test/vendor/ender-jeesh.js
  73. +35 −26 test/vendor/qunit.css
  74. +1,180 −788 test/vendor/qunit.js
  75. +98 −0 test/vendor/runner.js
  76. +480 −257 test/vendor/{underscore-1.3.1.js → underscore.js}
  77. +239 −90 test/view.js
View
@@ -1,2 +1,4 @@
raw
*.sw?
+.DS_Store
+node_modules
View
@@ -0,0 +1,6 @@
+test/
+Rakefile
+docs/
+raw/
+examples/examples/
+index.html
View
@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+ - 0.8
+notifications:
+ email: false
View
2 CNAME
@@ -0,0 +1,2 @@
+backbonejs.org
+
View
@@ -0,0 +1,9 @@
+## How to contribute to Backbone.js
+
+* Before you open a ticket or send a pull request, [search](https://github.com/documentcloud/backbone/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.
+
+* Before sending a pull request for a feature, be sure to have [tests](http://backbonejs.org/test/test.html).
+
+* Use the same coding style as the rest of the [codebase](https://github.com/documentcloud/backbone/blob/master/backbone.js).
+
+* In your pull request, do not add documentation or re-build the minified `backbone-min.js` file. We'll do those things before cutting a new release.
View
@@ -7,7 +7,7 @@ task :build do
begin
require 'closure-compiler'
rescue LoadError
- puts "closure-compiler not found.\nInstall it by running 'gem install closure-compiler"
+ puts "closure-compiler not found.\nInstall it by running 'gem install closure-compiler'"
exit
end
source = File.read 'backbone.js'
@@ -25,12 +25,13 @@ end
desc "run JavaScriptLint on the source"
task :lint do
+ check 'jsl', 'JavaScript Lint', 'http://www.javascriptlint.com/'
system "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
end
desc "test the CoffeeScript integration"
task :test do
- check 'coffee', 'CoffeeScript', 'https://github.com/jashkenas/coffee-script.git'
+ check 'coffee', 'CoffeeScript', 'http://coffeescript.org/'
system "coffee test/*.coffee"
end
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit fb3bb98

Please sign in to comment.