Commit Graph

2568 Commits

Author SHA1 Message Date
Brad Dunbar
623207831e Fix #3078 - Router#execute receives route name. 2014-03-23 17:36:20 -04:00
Adam Krebs
06f19f45af fix tagName test description 2014-03-23 01:59:42 +02:00
Adam Krebs
66d57adb51 Add comment about overriding _createElement 2014-03-21 10:49:00 +02:00
Adam Krebs
c10267db3f view test reorg 2014-03-21 01:44:48 +02:00
Adam Krebs
7287d0b3f3 Merge pull request #3085 from nhunzaker/master
Proposal: View.prototype._createElement to allow for overrideable DOM element creation
2014-03-20 23:38:47 +00:00
Nate Hunzaker
a04d7da6e4 DOM element creation should be overrideable
- Add test for _createElement
- Send tag name to _createElement
2014-03-20 19:34:13 -04:00
Jeremy Ashkenas
ed3a17d09b Merge pull request #3084 from andyw8/patch-1
Remove broken link to Diaspora example
2014-03-20 12:41:12 -04:00
Andy Waite
6f5e409cf3 Remove link to Diaspora example
Clicking on the link has no effect since there is no corresponding example.
2014-03-20 16:38:09 +00:00
Casey Foster
ee0ea61d27 Merge pull request #3082 from appleboy/patch
test node 0.10.x version on travis.
2014-03-20 10:09:44 -05:00
Bo-Yi Wu
c4766c9e58 test node 0.10.x version on travis.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2014-03-20 23:05:18 +08:00
brad dunbar
28ac874608 Merge pull request #3036 from tgriesser/create-model-fix
Fixes #3028 assign collection in _prepareModel
2014-03-18 17:28:15 -04:00
Tim Griesser
f5dba8edf4 Fixes #3028 assign collection in prepareModel 2014-03-18 17:25:57 -04:00
Jeremy Ashkenas
3994c1cb85 Merge pull request #3003 from akre54/view-native-hooks
View hooks for native and non-jQuery libraries
2014-03-16 19:13:18 -04:00
Jeremy Ashkenas
2543be20f2 Merge pull request #3048 from braddunbar/error
Pass along `textStatus` and `errorThrown`.
2014-03-15 14:32:53 -04:00
Adam Krebs
1d6eb7ade8 Merge pull request #20 from braddunbar/view-hooks
Add #_setAttributes and clean up #setElement.
2014-03-15 07:57:05 +00:00
brad dunbar
e0b84c4878 Merge pull request #3067 from shidel-dev/master
broken link for tilemill example
2014-03-14 17:37:39 -04:00
shidel.dev
b44ee9900e broken link for tilemill example 2014-03-14 16:31:00 -05:00
Brad Dunbar
7180d5ce0a Add #_setAttributes and clean up #setElement. 2014-03-14 12:27:16 -04:00
Adam Krebs
155a738ad8 Merge pull request #19 from braddunbar/view-hooks
A little clarification.
2014-03-14 16:02:51 +00:00
Brad Dunbar
72f7da4208 A little clarification.
* Rename #_remove as #_removeElement.
* Add #_setAttributes instead of using #setElement.
* Slim down tests a bit.
* #delegate returns this.
2014-03-14 11:56:16 -04:00
Adam Krebs
b79bd78abc Merge pull request #18 from wyuenho/view-native-hooks
Return undefined from delegate
2014-03-14 15:22:28 +00:00
Jimmy Yuen Ho Wong
ad39972d5d Return undefined from delegate 2014-03-14 18:04:18 +08:00
Jeremy Ashkenas
ba88916067 Merge pull request #3063 from janaspage/correct-split-infinitives
Correct split infinitives.
2014-03-14 00:01:15 -04:00
Adam Krebs
4e8caf4471 no need for repeated comment on remove 2014-03-14 06:38:18 +04:00
Adam Krebs
3f79ea88bf fix leftover merge conflict 2014-03-14 06:36:20 +04:00
Adam Krebs
f67c7a11c3 test delegate returns listener 2014-03-14 06:35:20 +04:00
Adam Krebs
06586f3283 shorter comment 2014-03-14 06:23:24 +04:00
Adam Krebs
c5c0d2ef0c Merge branch 'master' into view-native-hooks
Conflicts:
	backbone.js
2014-03-14 06:20:59 +04:00
Janas Page
3580496c91 Correct split infinitives.
Can improve readability, especially for English-as-a-second-language readers.
2014-03-13 18:18:19 -07:00
Jeremy Ashkenas
b5f1574b27 Merge pull request #3060 from braddunbar/delegate-events
Always delegate in #setElement.
2014-03-13 18:38:01 -04:00
Adam Krebs
264bd9b3da comments cleanup 2014-03-13 20:33:48 +04:00
Adam Krebs
764eef407b shorter undelegate 2014-03-13 15:27:35 +04:00
Adam Krebs
291f3bcde4 nicer jq test 2014-03-13 12:59:36 +04:00
Adam Krebs
b59b621b29 shorter delegate method thanks to jQuery empty selector checks 2014-03-13 12:55:57 +04:00
Brad Dunbar
ab802ba4a0 Always delegate in #setElement. 2014-03-13 01:00:33 -04:00
Adam Krebs
3850d37def add missing semi 2014-03-12 19:55:08 +04:00
Adam Krebs
d99e43b564 test for undelegate with handler and selector, and use an element that exists in the DOM for bubbling 2014-03-12 15:20:40 +04:00
Adam Krebs
d21fd79d8f remove namespace test from custom events test. 2014-03-12 15:16:33 +04:00
Adam Krebs
be11f3a010 add an undelegate method to View and pass back the listener from delegate 2014-03-12 11:07:33 +04:00
Adam Krebs
20ed07489e rename _setEl to _setElement for parity 2014-03-11 11:29:07 +04:00
Adam Krebs
b377e308ad Merge remote-tracking branch 'wyuenho/view-native-hooks' into view-native-hooks
Conflicts:
	backbone.js
2014-03-11 11:27:30 +04:00
Jeremy Ashkenas
6e5d3e9c57 Merge pull request #3054 from caseywebdev/deps
Update devDependencies
2014-03-10 14:58:05 -04:00
Casey Foster
7a0f833fad Update devDependencies
PhantomJS fixed the really annoying "CoreText performance note:" message in
1.9.3 or so.
2014-03-10 13:51:27 -05:00
Jimmy Yuen Ho Wong
393a209ca8 Merge _remove and remove tests and remove _setEl tests 2014-03-10 21:18:14 +08:00
Jimmy Yuen Ho Wong
b840669fa7 Rename _removeElement to _remove and test _remove for event undelegation 2014-03-10 21:18:13 +08:00
Adam Krebs
58c9a2abc6 remove undelegateEvents call from remove 2014-03-10 21:18:13 +08:00
Adam Krebs
c0a5f9d16b Merge pull request #3053 from sfishel18/master
Remove un-used local variables
2014-03-10 05:33:38 +00:00
Simon Fishel
6b0314e0e4 remove un-used local variables 2014-03-09 20:41:01 -07:00
Adam Krebs
d9f6c64719 remove undelegateEvents call from remove 2014-03-09 11:31:40 +04:00
Brad Dunbar
cbaa8d144b Pass along textStatus and errorThrown. 2014-03-06 17:07:53 -05:00