Skip to content

Commit

Permalink
update history
Browse files Browse the repository at this point in the history
  • Loading branch information
endor committed Feb 22, 2014
1 parent 966e3d5 commit d456f7b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ New:
- Allow template paths with query parameters [trengrj]
- Allow JSON paths with query parameters [vicb]
- Support for new Google Analytics [erpheus]
- More documentation for contextMatchesOptions [PhilippSoehnlein]

Fixed:

Expand Down
4 changes: 2 additions & 2 deletions lib/sammy.js
Original file line number Diff line number Diff line change
Expand Up @@ -1242,8 +1242,8 @@ $.extend(Sammy.DefaultLocationProxy.prototype , {
// app.contextMatchesOptions(context, {except: {path: ['#/mypath', '#/otherpath']}}); //=> false
// app.contextMatchesOptions(context, {except: {path: ['#/otherpath', '#/thirdpath']}}); //=> true
// // match all except multiple paths and verbs
// app.contextMatchesOptions(context, {except: {path: ['#/mypath', '#/otherpath'], verb: ['get', 'get']}}); //=> false
// app.contextMatchesOptions(context, {except: {path: ['#/otherpath', '#/thirdpath'], verb: ['get', 'get']}}); //=> true
// app.contextMatchesOptions(context, {except: {path: ['#/mypath', '#/otherpath'], verb: ['get', 'post']}}); //=> false
// app.contextMatchesOptions(context, {except: {path: ['#/otherpath', '#/thirdpath'], verb: ['get', 'post']}}); //=> true
//
contextMatchesOptions: function(context, match_options, positive) {
var options = match_options;
Expand Down

0 comments on commit d456f7b

Please sign in to comment.