github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
672 Commits 4 Branches 35 Tags
30a89ac5ccb8da53961ed809995fbc1edd48770a
Commit Graph

672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Ashkenas
30a89ac5cc Merge branch 'replaceState' of https://github.com/lmp/backbone 2011-11-23 14:03:39 -05:00
Jeremy Ashkenas
f5acb6d214 hardlining the sidebar line for Lion. 2011-11-23 13:46:53 -05:00
Jeremy Ashkenas
cfc5b1f3c0 updating copyright dates 2011-11-23 13:43:37 -05:00
Jeremy Ashkenas
7f80359e49 Merge branch 'master' of github.com:documentcloud/backbone 2011-11-23 13:30:32 -05:00
Jeremy Ashkenas
66800f5c8e Upgrading our Underscore.js test dep to 1.2.2 2011-11-23 13:30:07 -05:00
Jeremy Ashkenas
b2cf0dc833 Update index.html 2011-11-22 09:10:44 -05:00
Jeremy Ashkenas
6df607090c Merge pull request #755 from alonsogarciapablo/master 
Fix typo in Backbone.Collection documentation
 2011-11-22 06:09:27 -08:00
Pablo Alonso García
9cbf87e9c4 Fix typo in Backbone.Collection documentation 2011-11-22 10:54:44 +01:00
Jeremy Ashkenas
fa96a37e2f tweaking link 2011-11-21 12:51:29 -05:00
Jeremy Ashkenas
da9352945c Adding Slavery Footprint as a Backbone.js example app 2011-11-21 12:50:43 -05:00
Jeremy Ashkenas
61246a7cff Adding Grove.io as an example app 2011-11-21 09:32:03 -05:00
Jeremy Ashkenas
4f9cf93c21 adding foursquare as an example app, plus new logo 2011-11-18 09:37:39 -05:00
Aidan Feldman and Tim Harper
df7c279dc2 Navigate learns to change the route without adding a history entry 
Also, instead of accepting a single boolean for trigger, the navigate
method now accepts an options object, with the following options:

- replace
- trigger

If you pass true instead of an options object, it's interpreted as
{trigger: true}

* pushState support - Aidan Feldman
* hashtag support and IE7 support - Tim Harper
* Tests were a joint effort.
 2011-11-17 15:42:29 -07:00
Jeremy Ashkenas
1d41b4526a merging in the new backbone.js logo 2011-11-14 16:35:09 -05:00
Jeremy Ashkenas
49b532bdf3 removing the ol' upgrading section from the docs. 2011-11-14 15:49:38 -05:00
Jeremy Ashkenas
06e0826150 Adding Do.com as an example app. 2011-11-14 13:50:15 -05:00
Jeremy Ashkenas
478ef5c4b4 Merge pull request #736 from braddunbar/nested-set 
Multiple nested calls to set
 2011-11-09 11:04:46 -08:00
Brad Dunbar
20a2e3408a set _changing = false only if !alreadyChanging 2011-11-09 13:56:43 -05:00
Jeremy Ashkenas
7ece4ef2fd Revert "fixing whitespace consistency for #718" 
This reverts commit a0843bb2ee.
 2011-11-08 21:14:38 -05:00
Tim Branyen
0ccbba7794 Merge pull request #733 from wookiehangover/whitespace 
fixing whitespace consistency for #718
 2011-11-08 16:32:03 -08:00
Sam Breed
a0843bb2ee fixing whitespace consistency for #718 
all functions are formatted as such: `function(args) { ...`
 2011-11-08 17:13:53 -07:00
Tim Branyen
d9f4479845 Merge pull request #721 from TrisMcC/fix-model-trigger 
Trigger error on originalModel not model
 2011-11-08 11:55:27 -08:00
Jeremy Ashkenas
f9ae1a1686 Merge pull request #722 from jasonm/jm-format-function-defs 
Make function definition formatting consistent for docs
 2011-11-04 13:32:27 -07:00
Jason Morrison
becb826168 Make function definition formatting consistent 2011-11-04 16:22:05 -04:00
Tristan McCann
da51087dbf Trigger error on originalModel not model 
The original model that the 'sync' request was called in should be the
object that is taking the 'error' trigger.

After a 'fetch' request on a collection, 'model' is the jQuery xhr
object, which does not have a 'trigger' method.
 2011-11-04 16:02:03 -04:00
Jeremy Ashkenas
7070c27d1c Merge pull request #717 from JustinDrake/patch-1 
Making unbind and trigger more compatible with each other
 2011-11-03 17:43:19 -07:00
Justin
f17747e041 This means that after unbinding every event, a trigger call will return faster, because !(calls = this._callbacks) will evaluate to true. 2011-11-03 22:30:36 +00:00
Jeremy Ashkenas
eec7d2ac14 Adding AudioVroom as an example app. 2011-10-31 15:45:43 -04:00
Jeremy Ashkenas
3392d5fba9 relying on _.escape, and fixing a lint problem. 2011-10-31 12:35:02 -04:00
Jeremy Ashkenas
18be7107c7 fixing broken comparison. 2011-10-31 11:56:53 -04:00
Jeremy Ashkenas
35600be547 Merge branch 'events' of https://github.com/braddunbar/backbone 2011-10-31 11:49:04 -04:00
Jeremy Ashkenas
39061ff48a Merge branch 'master' of github.com:documentcloud/backbone 2011-10-31 11:00:02 -04:00
Jeremy Ashkenas
5ebbeb0ce2 Fixes #659 2011-10-31 10:59:54 -04:00
Jeremy Ashkenas
fdbd3ee0bd Merge pull request #705 from oldAdam/master 
Fix Todos example
 2011-10-31 07:44:47 -07:00
Brad Dunbar
6da0683605 create empty tail as an invariant 2011-10-31 10:36:30 -04:00
Brad Dunbar
de2430554e implement callbacks as linked list 2011-10-31 07:15:03 -04:00
Kyle Chaplin
0cd5b938d3 Fix Todos example by importing the currently shipped version of jQuery that is located in /test/vendor. 2011-10-30 14:18:42 -05:00
Tim Branyen
2156b9e28f Merge pull request #699 from jasonm/jm-bump-qunit 
Update QUnit to 1.1.0 (newest stable)
 2011-10-29 14:03:11 -07:00
Tim Branyen
9982e314cb Merge pull request #700 from iros/673 
#673 - Adding index as a property on the options object that gets passed
 2011-10-29 13:30:58 -07:00
Irene Ros
80769fcf99 #673 - Adding index as a property on the options object that gets passed when the add/remove callbacks get triggered on a collection. 2011-10-29 16:29:18 -04:00
Tim Branyen
fbffb36819 Merge pull request #698 from alexgraul/master 
Fix for Issue #690
 2011-10-29 13:21:15 -07:00
Alex Graul
afc2d99b46 nicer again 2011-10-29 16:19:04 -04:00
Jason Morrison
6717e42849 Bump jQuery test suite dependency from 1.5 to 1.6.4 2011-10-29 16:18:19 -04:00
Alex Graul
79eea1dc3c better method names 2011-10-29 16:16:02 -04:00
Jason Morrison
c336e4b3d5 Update QUnit 2011-10-29 16:12:36 -04:00
Jason Morrison
e2f1350266 gitignore vim swapfiles 2011-10-29 16:11:47 -04:00
Jeremy Ashkenas
b2407efb43 Merge branch 'router_no_callback' of https://github.com/derickbailey/backbone 2011-10-29 15:53:32 -04:00
Alex Graul
970ce0762c fix for wrapped errors inside success callbacks on save, issue #690 2011-10-29 15:51:41 -04:00
Jeremy Ashkenas
8478567ecb Needs testing, but fixes #686, fixes #592, and probably others -- allow you to override any $.ajax options. 2011-10-29 14:15:33 -04:00
Jeremy Ashkenas
c37e2f9bd1 Merge branch 'master' of https://github.com/alexgraul/backbone 2011-10-29 13:28:02 -04:00