diff --git a/chai.md b/chai.md index d5f3db3e8..18ebf4691 100644 --- a/chai.md +++ b/chai.md @@ -84,6 +84,9 @@ layout: default .exist + expect(-> ...) + .throw /not a function/ + ### Chai-jQuery global.jQuery = ...; diff --git a/ffmpeg.md b/ffmpeg.md index 8c726ef19..7ee2bb158 100644 --- a/ffmpeg.md +++ b/ffmpeg.md @@ -24,12 +24,20 @@ layout: default -ac 1 # audio channels (1=mono, 2=stereo) -an # no audio -vol N # volume (256=normal) - + + -acodec + -vcodec + ### Ringtone conversion using ffmpeg ffmpeg -i foo.mp3 -ac 1 -ab 128000 -f mp4 -acodec libfaac -y target.m4r -### To webm +### To web - ffmpeg -i input.mp4 -vcodec libvpx -acoder libvorbis output.webm + ffmpeg -i input.mov -vcodec h264 -acodec aac -strict -2 output.mp4 + ffmpeg -i input.mov -vcodec libvpx -acodec libvorbis output.webm + diff --git a/jscoverage.md b/jscoverage.md index 13368c16b..5e7a0f44e 100644 --- a/jscoverage.md +++ b/jscoverage.md @@ -16,7 +16,8 @@ Set up the `coverage` task so you can do `npm run coverage` later. ### test/setup.js Instead of requiring `YOURFILE.js`, use `-cov.js` when it's necessary. It's -preferred to do this in the test files (rather than the main entry points). +preferred to do this in the test files (rather than the main entry points) so +not to mess with browserify. var cov = (!! process.env.COVERAGE); global.Mylib = require(cov ? 'mylib' : 'mylib-cov');