Commit Graph

2715 Commits

Author SHA1 Message Date
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
Jmeas
71cecdc1e2 Failing spec for listenToOnce 2014-11-03 09:52:12 -05:00
Adam Krebs
854a2a4f99 Merge pull request #3362 from jmm/jmm/docs-trailing-whitespace
Remove trailing whitespace (line containing only space chars).
2014-10-30 17:44:48 -04:00
Jesse McCarthy
8997f6949d Remove trailing whitespace (line containing only space chars). 2014-10-30 17:05:54 -04:00
Adam Krebs
5b97de0a3d Merge pull request #3360 from morganrallen/localStorageDoc
fixed camel case filename for doc run script
2014-10-29 09:14:50 -04:00
Morgan 'ARR\!' Allen
81eb7fd3cb fixed camel case filename for doc run script 2014-10-27 18:52:45 -07:00
Jeremy Ashkenas
eda14bdfb9 Merge pull request #3357 from braddunbar/trailing-slash
Update trailing slash for search params.
2014-10-23 18:25:02 -04:00
Brad Dunbar
23599e7472 Update trailing slash for search params. 2014-10-23 18:16:29 -04:00
Jeremy Ashkenas
687ebf679f Merge pull request #3354 from janaspage/patch-3
Un-split an infinitive verb tense.
2014-10-22 15:25:00 -04:00
Janas Page
c568fee881 Un-split infinitive [v 2]. 2014-10-22 12:15:24 -07:00
Janas Page
188bd820d5 Un-split an infinitive verb tense.
Just grammar.
2014-10-22 11:13:51 -07:00
Adam Krebs
f1a742d6f0 Merge pull request #3351 from janaspage/patch-2
Hyphenate compound modifier.
2014-10-21 17:20:44 -04:00
Janas Page
45c80b74dc Hyphenate compound modifier.
It's a single adjective: the compound word "two-way" (as opposed to two adjectives: "two" and "way").
2014-10-21 14:19:35 -07:00
Adam Krebs
ace13558ac Merge pull request #3326 from biversen21/master
Update backbone.js comment for clarity
2014-10-20 14:52:02 -04:00
Adam Krebs
0a51e22c05 Merge pull request #3336 from admangum/issue_3306
clone options passed to reset
2014-10-09 15:56:57 -04:00
admangum
dae5424bd5 clone options passed to reset 2014-10-09 12:31:35 -07:00
Adam Krebs
833ab6f327 don't just test for the presence of options, test that it points to the same object as passed in. 2014-10-03 14:03:55 -04:00
Adam Krebs
8a73ff87bc Merge pull request #3329 from hmil/fix-options-success
fix flawed test
2014-10-03 13:57:16 -04:00
Hadrien Milano
cdce75ef76 fix wrong test: collection.model must be a function 2014-10-03 17:59:35 +02:00