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
2,736 Commits 4 Branches 35 Tags
f752362cfb9db8abe4e2fb054a68cdfe5ca7c1b9
Commit Graph

2736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Ashkenas
f752362cfb Merge pull request #3431 from yokangy/patch-1 
Add missing articles ('a', 'the')
 2015-01-01 15:56:33 -05:00
Y Kang
585e2441f6 Add missing articles ('a', 'the') 
In the definition for the 'Error' event, the singular nouns 'request' and 'server' require articles. I've also removed the word 'remote' from 'remote server' as the definitions for the 'Request' and 'Sync' events only refer to 'the server'.
 2015-01-01 11:11:54 -08:00
Adam Krebs
29244e4175 Merge pull request #3307 from gf3/model-matches 
Add `Model::matches` as special-cased proxy to `_.matches`
 2014-12-15 12:15:33 -05:00
Jeremy Ashkenas
d04b0f793b Revert "Fix fetch success callback to not reset model/collection if HTTP "304 Not Modified" is received." 
This reverts commit ea24e0a20d.
 2014-12-11 15:57:54 -05:00
Jeremy Ashkenas
3c8da29e02 Merge pull request #3410 from kperry42/http304-fetch 
Fix fetch() to properly handle HTTP 304 "Not Modified"
 2014-12-11 15:53:17 -05:00
Kevin Perry
ea24e0a20d Fix fetch success callback to not reset model/collection if HTTP "304 Not Modified" is received. 2014-12-11 14:33:42 -05:00
Adam Krebs
54a4c17343 Merge pull request #3407 from brianjscoles/master 
spelling: change "overriden" to "overridden" in two places. #2325 redux.
 2014-12-08 07:36:20 -05:00
Brian Scoles
232fb0d40b change "overriden" to "overridden" in two places. 2014-12-07 22:30:28 -08:00
Jeremy Ashkenas
70636d6d85 Merge pull request #3401 from megawac/npm-files 
Specify npm included files explictly in package.json
 2014-12-01 12:09:32 -05:00
Brad Dunbar
151d252186 Merge pull request #3359 from braddunbar/transition-params 
Transition with search params.
 2014-11-30 08:40:17 -05:00
Graeme
85058d4824 Specify npm included files explictly in package.json 2014-11-28 22:01:32 -05:00
Brad Dunbar
7e67491049 Leave out unnecessary trailing slash. 2014-11-26 16:49:50 -05:00
Brad Dunbar
62b1f25aec Add a comment about iframe history. 2014-11-16 10:26:38 -05:00
Brad Dunbar
efb60cc223 Ensure iframe hash is set. 2014-11-16 10:16:26 -05:00
Jeremy Ashkenas
84db2ba31c Merge pull request #3383 from fastest963/addNegative 
Collection.add accepts negative indexes for the `at` option
 2014-11-14 17:02:47 -05:00
James Hartig
c3b09ddb98 Collection.add accepts negative indexes for the at option 2014-11-14 16:06:14 -05:00
Adam Krebs
0519e7df6f Code style cleanup in collection tests and add an extra sort test 2014-11-13 12:06:44 -05:00
Adam Krebs
158334f002 Cleanup redundant variables in sort 2014-11-13 12:06:07 -05:00
Adam Krebs
bc88f125f1 Merge pull request #3381 from fastest963/orderSort 
Order should trigger a sort iff order was changed
 2014-11-13 11:43:29 -05:00
James Hartig
787ee49d7e Order should trigger a sort iff order was changed 2014-11-13 11:39:11 -05:00
Jeremy Ashkenas
433219af8f Merge pull request #3378 from robrobbins/patch-collection-test 
Collection spec is listening for "error", when it should be "invalid"
 2014-11-12 17:29:07 -05:00
robrobbins
f2fe23e339 use number of assertions, not another var 2014-11-12 15:12:05 -07:00
Adam Krebs
388d819a89 bump underscore dependency to 1.6.0 due to #3331 2014-11-12 15:21:31 -05:00
Adam Krebs
819e174d03 Merge pull request #3331 from megawac/where 
Use matches in .where
 2014-11-12 15:20:29 -05:00
Adam Krebs
962a3ebc30 Fix unescaped script tag in backbone.localstorage. Closes #3379 2014-11-12 14:06:31 -05:00
Jeremy Ashkenas
b4df22e298 Merge pull request #3374 from romamatusevich/master 
Make backbone-min.js available for bower
 2014-11-12 13:01:20 -05:00
robrobbins
51d076c9be listen for invalid, not error 2014-11-11 12:45:52 -07:00
Roma Matusevich
fb55f3824f Make backbone-min.js available for bower 2014-11-08 13:03:39 +03:00
Adam Krebs
40ea6f1526 Merge pull request #3368 from megawac/lto-ret 
Return the result of listenTo in listenToOnce
 2014-11-03 12:26:09 -05:00
Graeme Yeates
acf52d0428 Return the result of listenTo in listenToOnce 2014-11-03 12:20:28 -05:00
Jeremy Ashkenas
bd2242994b Merge pull request #3366 from akre54/listentoonce-is-borked 
Fix listenToOnce memory leak
 2014-11-03 12:01:47 -05:00
Justin Ridgewell
ac1de4deef Off wrapping callback, not the original 2014-11-03 09:52:14 -05:00
Justin Ridgewell
2450b70af8 Test that listenToOnce is only called once 2014-11-03 09:52:14 -05:00
Justin Ridgewell
fab32cc93a Remove duplicated tests 2014-11-03 09:52:14 -05:00
Adam Krebs
3e567611b6 remove double event binding. Simply stashing the original callback works as intended 2014-11-03 09:52:14 -05:00
Adam Krebs
740946142e check for cleaned up references in listenToOnce with stopListening 2014-11-03 09:52:14 -05:00
Adam Krebs
3c0cafbf8c move listenTo and listenToOnce in with the rest of the Backbone Events code 2014-11-03 09:52:14 -05:00
Justin Ridgewell
711b658fe3 Invert the for loop 2014-11-03 09:52:13 -05:00
Justin Ridgewell
e7126ec636 Clean up references on both listener and listened objects 2014-11-03 09:52:13 -05:00
Justin Ridgewell
b3ab6117c0 Test both _listeningTo and _events are empty 2014-11-03 09:52:13 -05:00
Justin Ridgewell
55bdc3f1c0 Remove duplicated context 
We’re binding, no need to add a context to it.
 2014-11-03 09:52:13 -05:00
Justin Ridgewell
3461128256 Register stopListening once instead of wrapping 2014-11-03 09:52:13 -05:00
Justin Ridgewell
7bf1f2a51e Return this from #listenTo 2014-11-03 09:52:13 -05:00
Adam Krebs
83c0b38bc7 de-duplicate some of the listenToOnce wrapCallback logic 2014-11-03 09:52:13 -05:00
Adam Krebs
c6a1df5084 use clearer event names 2014-11-03 09:52:13 -05:00
Adam Krebs
caee4648b1 implement listenToOnce via listenTo 2014-11-03 09:52:12 -05:00
Adam Krebs
89995f079f use on in all cases of listenTo 2014-11-03 09:52:12 -05:00
Adam Krebs
b12a310e3a fix listenToOnce with event maps 2014-11-03 09:52:12 -05:00
Adam Krebs
d84e15b08c test for correct context in event maps 2014-11-03 09:52:12 -05:00
Jmeas
459dc24f80 Fixes listenToOnce memory leak. 2014-11-03 09:52:12 -05:00