github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-08 03:00:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
694 Commits 4 Branches 35 Tags
fd78dbf14eeacd69836ed4f681192ab91ee2a361
Commit Graph

694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Gieseke
fd78dbf14e Only remove single '#' when getting URL fragment. 
Firefox has a bug that auto-decodes the hash fragment
(https://bugzilla.mozilla.org/show_bug.cgi?id=483304), which makes
it impossible to have a hash like '#%23backbone.js'.
 2011-12-04 14:31:01 +01:00
Jeremy Ashkenas
8adac9136c Merge pull request #769 from lmp/master 
Bugfix: replace hash should not append hash mark to javascript:0
 2011-11-30 16:00:13 -08:00
Tim Harper
1a06f9a215 Bugfix: replace hash should not append hash mark to javascript:0 
It's invalid to do so. Instead it should replace the entire URL,
javascript:0 included.

This gets rid of a javascript error that was emitted in IE7 every time
navigate was used with replace: true
 2011-11-30 13:33:40 -07:00
Jeremy Ashkenas
e8c1ce7158 Merge pull request #761 from d2s/master 
Update two links at index.html to latest URLs
 2011-11-24 10:50:19 -08:00
Daniel Schildt
db8d85e26b Update two links at index.html to latest URLs 
- Link to Jake was broken.
- PhantomJS has official website with better information.
 2011-11-24 18:23:48 +02:00
Jeremy Ashkenas
c785ecb15a Merge pull request #759 from lmp/master 
Update remaining call to _updateLocationHash to _updateHash
 2011-11-23 14:35:37 -08:00
Jeremy Ashkenas
9fc7443d34 merging in #758 -- although the API leaves something to be desired. 2011-11-23 17:32:04 -05:00
Tim Harper
42ee70e9d9 Update remaining call to _updateLocationHash to _updateHash 
(Finish refactoring job from 1332246b8f)
 2011-11-23 15:31:58 -07:00
Jeremy Ashkenas
43c815aedb Merge branch 'master' of https://github.com/TMaYaD/backbone 2011-11-23 17:03:44 -05:00
Jeremy Ashkenas
6687cde196 merging in #739 -- a massive simplification. 2011-11-23 16:48:39 -05:00
TMaYaD
2d2198c354 Return the jquery object for el when this.$ is called without argument 2011-11-24 02:38:08 +05:30
Jeremy Ashkenas
bc9fbcbefb Merge branch 'set-unset-clear' of https://github.com/braddunbar/backbone 2011-11-23 15:57:24 -05:00
Jeremy Ashkenas
41853416a7 Fixes #674 -- pass options through to validate() 2011-11-23 15:48:55 -05:00
Jeremy Ashkenas
1332246b8f merging in #750 -- support for replaceSTate 2011-11-23 14:59:14 -05:00
Jeremy Ashkenas
30a89ac5cc Merge branch 'replaceState' of https://github.com/lmp/backbone 2011-11-23 14:03:39 -05:00
Jeremy Ashkenas
f5acb6d214 hardlining the sidebar line for Lion. 2011-11-23 13:46:53 -05:00
Jeremy Ashkenas
cfc5b1f3c0 updating copyright dates 2011-11-23 13:43:37 -05:00
Jeremy Ashkenas
7f80359e49 Merge branch 'master' of github.com:documentcloud/backbone 2011-11-23 13:30:32 -05:00
Jeremy Ashkenas
66800f5c8e Upgrading our Underscore.js test dep to 1.2.2 2011-11-23 13:30:07 -05:00
Jeremy Ashkenas
b2cf0dc833 Update index.html 2011-11-22 09:10:44 -05:00
Jeremy Ashkenas
6df607090c Merge pull request #755 from alonsogarciapablo/master 
Fix typo in Backbone.Collection documentation
 2011-11-22 06:09:27 -08:00
Pablo Alonso García
9cbf87e9c4 Fix typo in Backbone.Collection documentation 2011-11-22 10:54:44 +01:00
Jeremy Ashkenas
fa96a37e2f tweaking link 2011-11-21 12:51:29 -05:00
Jeremy Ashkenas
da9352945c Adding Slavery Footprint as a Backbone.js example app 2011-11-21 12:50:43 -05:00
Jeremy Ashkenas
61246a7cff Adding Grove.io as an example app 2011-11-21 09:32:03 -05:00
Jeremy Ashkenas
4f9cf93c21 adding foursquare as an example app, plus new logo 2011-11-18 09:37:39 -05:00
Aidan Feldman and Tim Harper
df7c279dc2 Navigate learns to change the route without adding a history entry 
Also, instead of accepting a single boolean for trigger, the navigate
method now accepts an options object, with the following options:

- replace
- trigger

If you pass true instead of an options object, it's interpreted as
{trigger: true}

* pushState support - Aidan Feldman
* hashtag support and IE7 support - Tim Harper
* Tests were a joint effort.
 2011-11-17 15:42:29 -07:00
Brad Dunbar
7658021e98 simpler arg parsing 2011-11-16 14:13:15 -05:00
Jeremy Ashkenas
1d41b4526a merging in the new backbone.js logo 2011-11-14 16:35:09 -05:00
Jeremy Ashkenas
49b532bdf3 removing the ol' upgrading section from the docs. 2011-11-14 15:49:38 -05:00
Jeremy Ashkenas
06e0826150 Adding Do.com as an example app. 2011-11-14 13:50:15 -05:00
Brad Dunbar
d87144d6cb unset accepts var args 2011-11-11 10:55:36 -05:00
Brad Dunbar
0c08ab8185 bail immediately if !this._changed 2011-11-10 13:47:11 -05:00
Brad Dunbar
93ad86cfa9 add tests for #730 and #565 2011-11-10 13:45:27 -05:00
Brad Dunbar
66d209d4f9 unit test for ignore values when unsetting 2011-11-10 10:10:17 -05:00
Brad Dunbar
12b11410d0 ignore values when unsetting 2011-11-10 09:59:49 -05:00
Brad Dunbar
368953eb3a implement unset/clear in terms of set 2011-11-10 09:33:08 -05:00
Brad Dunbar
3f004196bd assert that change is only triggered once 2011-11-09 14:05:58 -05:00
Jeremy Ashkenas
478ef5c4b4 Merge pull request #736 from braddunbar/nested-set 
Multiple nested calls to set
 2011-11-09 11:04:46 -08:00
Brad Dunbar
20a2e3408a set _changing = false only if !alreadyChanging 2011-11-09 13:56:43 -05:00
Jeremy Ashkenas
7ece4ef2fd Revert "fixing whitespace consistency for #718" 
This reverts commit a0843bb2ee.
 2011-11-08 21:14:38 -05:00
Tim Branyen
0ccbba7794 Merge pull request #733 from wookiehangover/whitespace 
fixing whitespace consistency for #718
 2011-11-08 16:32:03 -08:00
Sam Breed
a0843bb2ee fixing whitespace consistency for #718 
all functions are formatted as such: `function(args) { ...`
 2011-11-08 17:13:53 -07:00
Tim Branyen
d9f4479845 Merge pull request #721 from TrisMcC/fix-model-trigger 
Trigger error on originalModel not model
 2011-11-08 11:55:27 -08:00
Jeremy Ashkenas
f9ae1a1686 Merge pull request #722 from jasonm/jm-format-function-defs 
Make function definition formatting consistent for docs
 2011-11-04 13:32:27 -07:00
Jason Morrison
becb826168 Make function definition formatting consistent 2011-11-04 16:22:05 -04:00
Tristan McCann
da51087dbf Trigger error on originalModel not model 
The original model that the 'sync' request was called in should be the
object that is taking the 'error' trigger.

After a 'fetch' request on a collection, 'model' is the jQuery xhr
object, which does not have a 'trigger' method.
 2011-11-04 16:02:03 -04:00
Jeremy Ashkenas
7070c27d1c Merge pull request #717 from JustinDrake/patch-1 
Making unbind and trigger more compatible with each other
 2011-11-03 17:43:19 -07:00
Justin
f17747e041 This means that after unbinding every event, a trigger call will return faster, because !(calls = this._callbacks) will evaluate to true. 2011-11-03 22:30:36 +00:00
Jeremy Ashkenas
eec7d2ac14 Adding AudioVroom as an example app. 2011-10-31 15:45:43 -04:00