Merge pull request #26 from dobtco/bb-1.1.0

Upgrade to Backbone 1.1.0 and include basic tests.

Author: hijonathan

Gruntfile.coffee

@@ -13,11 +13,13 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks('grunt-contrib-uglify')
   grunt.loadNpmTasks('grunt-contrib-watch')
   grunt.loadNpmTasks('grunt-release')
+  grunt.loadNpmTasks('grunt-karma')
 
   grunt.initConfig
 
     pkg: '<json:package.json>'
     distFolder: 'dist'
+    testFolder: 'test'
 
     jst:
       all:
@@ -63,5 +65,11 @@ module.exports = (grunt) ->
     release:
       npm: false
 
+    karma:
+      unit:
+        configFile: '<%= testFolder %>/karma.conf.coffee'
+
+
   grunt.registerTask 'default', ALL_TASKS
   grunt.registerTask 'dist', ['cssmin:dist', 'uglify:dist']
+  grunt.registerTask 'test', ['dist', 'karma']

bower.json

@@ -6,7 +6,7 @@
     "adamjacobbecker <[email protected]>"
   ],
   "description": "Graphical form builder for the web.",
-  "main": "dist",
+  "main": "index.js",
   "license": "MIT",
   "ignore": [
     "**/.*",
@@ -16,14 +16,14 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "*",
-    "jquery-ui": "*",
+    "jquery": "~2.0.3",
+    "jquery-ui": "~1.10.3",
     "jquery.scrollWindowTo": "https://gist.github.com/adamjacobbecker/6519570/raw/cd741057495d0fb19e545a0f9a098efba3bef9c8/jquery.scrollWindowTo.js",
-    "underscore": "*",
+    "underscore": "~1.5.2",
     "underscore.mixin.deepExtend": "https://gist.github.com/adamjacobbecker/6519561/raw/63682037af9b10200b05c1a3d5890903397b2103/underscore.mixin.deepExtend.js",
-    "backbone": "*",
-    "backbone-deep-model": "*",
-    "rivets": "*",
-    "font-awesome": "~4.0.1"
+    "backbone": "~1.1.0",
+    "backbone-deep-model": "~0.10.4",
+    "rivets": "~0.5.13",
+    "font-awesome": "~3.2.1"
   }
-}
+}

bower_components/backbone-deep-model/.bower.json

@@ -9,6 +9,6 @@
     "commit": "709ca367afa864253517f05690984179a0504664"
   },
   "_source": "git://github.com/powmedia/backbone-deep-model.git",
-  "_target": "*",
+  "_target": "~0.10.4",
   "_originalSource": "backbone-deep-model"
 }

bower_components/backbone/.bower.json

@@ -1,14 +1,14 @@
 {
   "name": "backbone",
   "homepage": "https://github.com/jashkenas/backbone",
-  "version": "1.0.0",
-  "_release": "1.0.0",
+  "version": "1.1.0",
+  "_release": "1.1.0",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.0",
-    "commit": "699fe3271262043bb137bae97bd0003d6d193f27"
+    "tag": "1.1.0",
+    "commit": "0a4399e3de5cb2ab75a0338669582f18c1fae3ae"
   },
   "_source": "git://github.com/jashkenas/backbone.git",
-  "_target": "*",
+  "_target": "~1.1.0",
   "_originalSource": "backbone"
 }

bower_components/backbone/CONTRIBUTING.md

@@ -1,15 +1,20 @@
-## How to contribute to Backbone.js
+## How to Open a Backbone.js Ticket
+
+* Do not use tickets to ask for help with (debugging) your application. Ask on
+the [mailing list](https://groups.google.com/forum/#!forum/backbonejs), 
+in the IRC channel (`#documentcloud` on Freenode), or if you understand your 
+specific problem, on [StackOverflow](http://stackoverflow.com/questions/tagged/backbone.js).
 
 * Before you open a ticket or send a pull request,
-[search](https://github.com/documentcloud/backbone/issues) for previous
+[search](https://github.com/jashkenas/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 or bug fix, be sure to have
-[tests](http://backbonejs.org/test/test.html).
+[tests](http://backbonejs.org/test/).
 
 * Use the same coding style as the rest of the
-[codebase](https://github.com/documentcloud/backbone/blob/master/backbone.js).
+[codebase](https://github.com/jashkenas/backbone/blob/master/backbone.js).
 
 * In your pull request, do not add documentation or rebuild the minified
 `backbone-min.js` file. We'll do that before cutting a new release.

bower_components/backbone/README.md

@@ -1,26 +1,29 @@
-     ____                     __      __                                                 
-    /\  _`\                  /\ \    /\ \                                   __           
-    \ \ \ \ \     __      ___\ \ \/'\\ \ \____    ___     ___      __      /\_\    ____  
-     \ \  _ <'  /'__`\   /'___\ \ , < \ \ '__`\  / __`\ /' _ `\  /'__`\    \/\ \  /',__\ 
+     ____                     __      __
+    /\  _`\                  /\ \    /\ \                                   __
+    \ \ \ \ \     __      ___\ \ \/'\\ \ \____    ___     ___      __      /\_\    ____
+     \ \  _ <'  /'__`\   /'___\ \ , < \ \ '__`\  / __`\ /' _ `\  /'__`\    \/\ \  /',__\
       \ \ \ \ \/\ \ \.\_/\ \__/\ \ \\`\\ \ \ \ \/\ \ \ \/\ \/\ \/\  __/  __ \ \ \/\__, `\
        \ \____/\ \__/.\_\ \____\\ \_\ \_\ \_,__/\ \____/\ \_\ \_\ \____\/\_\_\ \ \/\____/
-        \/___/  \/__/\/_/\/____/ \/_/\/_/\/___/  \/___/  \/_/\/_/\/____/\/_/\ \_\ \/___/ 
-                                                                           \ \____/      
-                                                                            \/___/       
+        \/___/  \/__/\/_/\/____/ \/_/\/_/\/___/  \/___/  \/_/\/_/\/____/\/_/\ \_\ \/___/
+                                                                           \ \____/
+                                                                            \/___/
     (_'_______________________________________________________________________________'_)
     (_.———————————————————————————————————————————————————————————————————————————————._)
-                                               
-                                              
+
+
 Backbone supplies structure to JavaScript-heavy applications by providing models key-value binding and custom events, collections with a rich API of enumerable functions, views with declarative event handling, and connects it all to your existing application over a RESTful JSON interface.
 
 For Docs, License, Tests, pre-packed downloads, and everything else, really, see:
 http://backbonejs.org
 
 To suggest a feature, report a bug, or general discussion:
-http://github.com/documentcloud/backbone/issues/
+http://github.com/jashkenas/backbone/issues
+
+Backbone is an open-sourced component of DocumentCloud:
+https://github.com/documentcloud
 
-All contributors are listed here:
-http://github.com/documentcloud/backbone/contributors
+Many thanks to our contributors:
+http://github.com/jashkenas/backbone/contributors
 
-Special thanks to Robert Kieffer for the original philosophy behind Backbone. 
+Special thanks to Robert Kieffer for the original philosophy behind Backbone.
 http://github.com/broofa