File tree Expand file tree Collapse file tree 2 files changed +18
-11
lines changed
Expand file tree Collapse file tree 2 files changed +18
-11
lines changed Original file line number Diff line number Diff line change @@ -4,23 +4,29 @@ node_js:
44matrix :
55 include :
66 - node_js : " 0.10"
7- env : UNDERSCORE=1.4.4 BACKBONE=1.0 MAINRUN=false
7+ env : UNDERSCORE=1.4.4 BACKBONE=1.0
88 - node_js : " 0.10"
9- env : UNDERSCORE=1.5 BACKBONE=1.0 MAINRUN=false
9+ env : UNDERSCORE=1.5 BACKBONE=1.0
1010 - node_js : " 0.10"
11- env : UNDERSCORE=1.6 BACKBONE=1.0 MAINRUN=false
11+ env : UNDERSCORE=1.7 BACKBONE=1.1
1212 - node_js : " 0.10"
13- env : UNDERSCORE=1.4.4 BACKBONE=1.1.0 MAINRUN=false
13+ env : UNDERSCORE=1.7 BACKBONE=1.0
1414 - node_js : " 0.10"
15- env : UNDERSCORE=1.5 BACKBONE=1.1 MAINRUN=false
15+ env : UNDERSCORE=1.6 BACKBONE=1.0
16+ - node_js : " 0.10"
17+ env : UNDERSCORE=1.4.4 BACKBONE=1.1.0
18+ - node_js : " 0.10"
19+ env : UNDERSCORE=1.5 BACKBONE=1.1
20+ - node_js : " 0.10"
21+ env : LODASH=2.4 BACKBONE=1.1
22+ - node_js : " 0.10"
23+ env : LODASH=3.0 BACKBONE=1.1
24+ - node_js : " 0.10"
25+ env : LODASH=3.1 BACKBONE=1.0
1626env : MAINRUN=true
1727before_install :
1828 - npm config set ca ""
1929install :
20- - npm install -g grunt-cli
21- - npm install
22- # Which matrix settings -- otherwise default
23- - if [[ $MAINRUN == false ]]; then npm install backbone@$BACKBONE; fi
24- - if [[ $MAINRUN == false ]]; then npm install underscore@$UNDERSCORE; fi
30+ - curl -L https://rawgit.com/marionettejs/travis-ci-setup/master/ci.sh | bash
2531after_success :
2632 - if [[ $MAINRUN == true ]]; then npm run-script coverage; fi
Original file line number Diff line number Diff line change @@ -132,7 +132,8 @@ _.extend(Radio, {
132132
133133 // Log information about the channel and event
134134 log : function ( channelName , eventName ) {
135- var args = _ . rest ( arguments , 2 ) ;
135+ if ( typeof console === 'undefined' ) { return ; }
136+ var args = _ . drop ( arguments , 2 ) ;
136137 console . log ( '[' + channelName + '] "' + eventName + '"' , args ) ;
137138 } ,
138139
You can’t perform that action at this time.
0 commit comments