Commit Graph

2505 Commits

Author SHA1 Message Date
Jimmy Yuen Ho Wong
fca75fb6bd Fix up global in view test 2014-03-04 23:04:59 +02:00
Adam Krebs
7339bed6c5 Merge branch 'master' into view-native-hooks 2014-03-04 23:00:05 +02:00
Jeremy Ashkenas
e0233d8062 Merge pull request #3041 from braddunbar/iframe-cleanup
Fix #3015 - History#stop cleans up iframe.
2014-03-04 11:40:19 -05:00
Brad Dunbar
b362ea0fcc Fix #3015 - History#stop cleans up iframe. 2014-03-04 11:35:31 -05:00
Jeremy Ashkenas
5552443175 Merge pull request #3040 from braddunbar/underscore-methods
Update collection docs on underscore methods.
2014-03-04 10:57:33 -05:00
Brad Dunbar
05fbaad186 Update collection docs on underscore methods. 2014-03-04 10:55:13 -05:00
Adam Krebs
0fca38cd82 view test cleanup 2014-03-04 14:45:22 +02:00
Adam Krebs
70933e51cf fix merge conflict 2014-03-04 14:19:35 +02:00
Adam Krebs
a9d066a84e test view.$ interface and rename _createContext to _setEl in view test 2014-03-04 14:17:42 +02:00
Adam Krebs
01f794fe99 Merge remote-tracking branch 'wyuenho/view-native-hooks' into view-native-hooks
Conflicts:
	backbone.js
	test/view.js
2014-03-04 14:15:16 +02:00
Adam Krebs
f13181fbc0 rename _createContext to _setEl 2014-03-04 13:42:42 +02:00
Jimmy Yuen Ho Wong
fd6425441d Rename delegate's method param to listener to tell people it's ok to attach an unbound function as handler 2014-03-04 13:42:42 +02:00
Adam Krebs
446ee523fa save a var in _createContext 2014-03-04 13:42:42 +02:00
Adam Krebs
e30e6b9344 small cleanup in _createContext 2014-03-04 13:42:42 +02:00
Adam Krebs
3edf74c37b return this from delegate 2014-03-04 13:42:42 +02:00
Jimmy Yuen Ho Wong
5dc2d093fb Call _createContext only once during new View 2014-03-04 13:42:42 +02:00
Jimmy Yuen Ho Wong
20935c85ee Fix test for fc95eae 2014-03-04 13:42:41 +02:00
Adam Krebs
72b88b5835 Revert "Speed up method calls in delegateEvents and delegate"
This reverts commit 846de91c88.

Conflicts:
	backbone.js
2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
12abe8eef6 Comment for 2 arg form inside _delegate 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
25c0beed0f Fix typo 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
9868bfb862 No reason jQuery can't be a little faster too 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
390275b82f Fix comment 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
18d17db554 Disallow chaining in hook calls 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
6ebb6e1752 _createContext is side-effect only 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
9028e338c3 Shortened _createContext 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
1e9cd4a350 Revert introduction of _undelegate 2014-03-04 13:42:41 +02:00
Jimmy Yuen Ho Wong
d78fb34aff Prefix all hooks with _ and introduce _undelegate 2014-03-04 13:42:40 +02:00
Jimmy Yuen Ho Wong
5f66f9af18 Rename make to _createContext and have _ensureElement and setElement delegate to it 2014-03-04 13:42:40 +02:00
Jimmy Yuen Ho Wong
ad44cb41b6 Further isolate $.remove by exposing removeElement in case subclasses forgot to clean up 2014-03-04 13:42:40 +02:00
Jimmy Yuen Ho Wong
3369bf486b Speed up method calls in delegateEvents and delegate 2014-03-04 13:42:40 +02:00
Jimmy Yuen Ho Wong
be1cba3331 Move delegate up and move check into undelegateEvents 2014-03-04 13:42:40 +02:00
Adam Krebs
4e5b28221c save two lines in View#make: jquery handles nulls nicely 2014-03-04 13:42:40 +02:00
Adam Krebs
90c36cadac add View#delegate as a single event listener version of delegateEvents for easier overriding 2014-03-04 13:42:40 +02:00
Adam Krebs
0cdb38b03f revert c1e62cda: add View#make back in for overriding 2014-03-04 13:42:40 +02:00
Jimmy Yuen Ho Wong
7eedd4bc0a View conformance tests 2014-03-04 15:00:14 +08:00
Adam Krebs
41283909e6 Merge pull request #3037 from rsofaer/update-docs-rails-4
Change the reference to rails in the 'sync' docs to reflect Rails 4
2014-03-04 02:20:17 +02:00
Raphael Sofaer
7a52396a1b Change the reference to rails in the 'sync' docs to reflect Rails 4 2014-03-03 11:11:18 -08:00
Jeremy Ashkenas
36e4925b9c #2985 -- use 'change-id' as the event name 2014-03-03 13:00:04 -05:00
Jeremy Ashkenas
60b9cc1d18 Merge pull request #2985 from caseywebdev/generate-id
Re #2976 Allow `id` values to be generated from a function given attrs
2014-03-03 12:56:08 -05:00
Jeremy Ashkenas
0c1838be63 Merge pull request #3032 from akre54/clone-opts
Pass along model and comparator to cloned collection
2014-03-03 08:23:55 -05:00
Adam Krebs
16e548397e pass along model and comparator to cloned collection. Fixes #3013 2014-03-02 23:13:17 +02:00
Jimmy Yuen Ho Wong
6433043649 Rename delegate's method param to listener to tell people it's ok to attach an unbound function as handler 2014-03-03 05:07:28 +08:00
brad dunbar
bdc5c63944 Merge pull request #3029 from Crisfole/update/underscore
Add new `_.partition`
2014-02-28 13:59:42 -05:00
Jeremy Ashkenas
7612699f52 Merge pull request #3030 from caseywebdev/_-guard
Re #3029 Guard against unavailable edge underscore proxies
2014-02-28 13:48:19 -05:00
Casey Foster
83c81005fe Re #3029 Guard against unavailable edge underscore proxies 2014-02-28 12:26:26 -06:00
Christopher Pfohl
fa7e617edf Add new _.partition 2014-02-28 08:50:09 -05:00
Adam Krebs
6fec7a5772 save a var in _createContext 2014-02-27 23:24:20 +02:00
Jeremy Ashkenas
1853297cc9 Merge pull request #3006 from akre54/history-native-hooks
History native calls
2014-02-27 13:05:33 -05:00
Casey Foster
5bc7333a2a Re #2976 Allow id values to be generated from a function given attrs 2014-02-27 10:55:53 -06:00
Adam Krebs
933c02e6a1 small cleanup in _createContext 2014-02-27 18:36:15 +02:00