Commit Graph

735 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
Brad Dunbar
b362ea0fcc Fix #3015 - History#stop cleans up iframe. 2014-03-04 11:35:31 -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
Jimmy Yuen Ho Wong
20935c85ee Fix test for fc95eae 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
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
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
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
Adam Krebs
16e548397e pass along model and comparator to cloned collection. Fixes #3013 2014-03-02 23:13:17 +02: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
Brad Dunbar
f7c71996de Tweak and merge. 2014-02-25 11:22:33 -05:00
Ville Lautanala
a31d86390b Check that model exists before trying to verify uniqueness
When calling fetch with {add: false} and model does not exist in
collection, model uniqueness check tries to access id of undefined. This
verifies that model is set before checking for existing models.
2014-02-25 01:18:58 +02:00
Brad Dunbar
e88d34dd18 Tweak a bit. 2014-02-22 13:30:21 -05:00
Maksim Horbachevsky
520218769b Do not trigger router/history events if Router#execute returns false 2014-02-22 17:46:02 +03:00
Jimmy Yuen Ho Wong
3cef7fa7b6 Fix test for fc95eae 2014-02-22 00:02:37 +08:00
Brad Dunbar
5b49aae75f Handle newlines in route params. 2014-02-20 05:53:34 -05:00
Jimmy Yuen Ho Wong
09d376237b _createContext is side-effect only 2014-02-20 14:18:21 +08:00
Jimmy Yuen Ho Wong
8ab8646361 Prefix all hooks with _ and introduce _undelegate 2014-02-20 05:31:36 +08:00
Jimmy Yuen Ho Wong
33e23df577 Rename make to _createContext and have _ensureElement and setElement delegate to it 2014-02-20 05:11:11 +08:00
Adam Krebs
e9543ee591 add View#delegate as a single event listener version of delegateEvents for easier overriding 2014-02-18 17:34:54 -05:00
Adam Krebs
02d270f455 revert c1e62cda: add View#make back in for overriding 2014-02-18 17:09:01 -05:00
Adam Krebs
494e021a65 bump test underscore to 1.6.0 and remove shim config from test-amd.html. closes #2999 2014-02-16 02:35:42 -05:00
Casey Foster
990ab04a45 Fix #2976 Do not add multiple models with same id 2014-02-03 13:19:27 -06:00
Brad Dunbar
12fe2d0208 Add a route test for unicode paths. 2014-01-14 16:37:57 -05:00
brad dunbar
d6ac995c9f Merge pull request #2890 from braddunbar/search-params
Search params
2014-01-06 14:21:47 -08:00
Brad Dunbar
066acdc7ed Search params. 2013-11-23 13:12:01 -05:00
Ryan Mohr
814d36205c Added query string parsing support for pushState with hashChange
Also includes rename of Backbone.qs to
Backbone.History.parseQueryString.
2013-11-22 10:19:50 -10:00
Ryan Mohr
05b1df09ca Fragment now includes query string and hash for pushState.
Hash is only included when wantsHashChange.
2013-11-22 10:13:15 -10:00
Ryan Mohr
ddbdd0660c Removed fragment stripper. Changes to query params will trigger route change. 2013-11-21 14:04:03 -10:00
Ryan Mohr
6fb8e7af33 Query string now parsed if Backbone.qs defined 2013-11-21 14:03:56 -10:00
Ryan Mohr
a50317b511 All routes can now optionally be queried.
The raw query string will be passed as last argument.
2013-11-21 14:03:49 -10:00
Adam Krebs
a06d4176d9 copy most recent qunit fixtures from test/index.html so tests pass 2013-11-21 10:53:36 -05:00
Adam Krebs
c84c0f7a63 Shim for AMD underscore test dependency to export _ object 2013-11-21 10:31:29 -05:00
Adam Krebs
25d5679024 Move favicon.ico to root directory so it shows up on all pages. Closes #2883 2013-11-20 09:32:14 -05:00
Brad Dunbar
56e3221325 Tweak fixture attachment. 2013-11-19 17:37:09 -05:00
kupriyanenko
ba9eeb52ba Add support for runnig tests with jQuery-compatible libraries 2013-11-18 00:32:20 +02:00
Adam Krebs
d9faafd838 Fix AMD tests. jQuery is modern enough that we dont need a shim. Remove JSLitmus, and add in stubbed xhr environment file 2013-11-07 09:47:30 -05:00
Jeremy Ashkenas
ab5d2eb4c6 Adding AMD support to Backbone. 2013-11-07 09:18:59 -03:00
jrburke
ea29bd9119 UMD wrapper for AMD, node and browser globals. 2013-11-06 16:25:24 -08:00
Casey Foster
47331efca8 Fix #2846 nested "change" events trigger with correct options 2013-11-06 14:38:41 -06:00
Adam Krebs
bd662597ca Merge pull request #2851 from braddunbar/old-ie-tests
Fix #2850 - Use `hashChange: false` where appropriate.
2013-11-05 08:31:41 -08:00
Brad Dunbar
9c448381dc Style tweak, remove jQuery dependency. 2013-11-04 16:08:26 -05:00
Brad Dunbar
c6908e6edf Fix #2850 - Use hashChange: false where appropriate. 2013-11-04 15:40:50 -05:00