From aa35c6f0103f9f5ded50adaeaa2975feeab7a744 Mon Sep 17 00:00:00 2001 From: Matthew McClure Date: Sun, 31 May 2015 23:35:26 -0700 Subject: [PATCH 1/3] Use the videojs-font project instead of local fonts --- grunt.js | 663 +++++++++++++++++++++----------------- package.json | 3 +- src/css/font/VideoJS.eot | Bin 4172 -> 0 bytes src/css/font/VideoJS.svg | 40 --- src/css/font/VideoJS.ttf | Bin 4008 -> 0 bytes src/css/font/VideoJS.woff | Bin 4084 -> 0 bytes src/css/video-js.scss | 3 +- 7 files changed, 368 insertions(+), 341 deletions(-) delete mode 100755 src/css/font/VideoJS.eot delete mode 100755 src/css/font/VideoJS.svg delete mode 100755 src/css/font/VideoJS.ttf delete mode 100755 src/css/font/VideoJS.woff diff --git a/grunt.js b/grunt.js index 97862f895b..640f5eb47a 100644 --- a/grunt.js +++ b/grunt.js @@ -18,355 +18,420 @@ module.exports = function(grunt) { grunt.initConfig({ pkg, clean: { - build: ['build/temp/*'], - dist: ['dist/*'] - }, - jshint: { - src: { - src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'], - options: { - jshintrc: '.jshintrc' - } - } - }, - uglify: { - options: { - sourceMap: true, - sourceMapIn: 'build/temp/video.js.map', - sourceMapRoot: '../../src/js', - preserveComments: 'some', - mangle: true, - compress: { - sequences: true, - dead_code: true, - conditionals: true, - booleans: true, - unused: true, - if_return: true, - join_vars: true, - drop_console: true - } + build: ['build/temp/*'], + dist: ['dist/*'] }, - build: { - files: { - 'build/temp/video.min.js': 'build/temp/video.js' + jshint: { + src: { + src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'], + options: { + jshintrc: '.jshintrc' + } } - } - }, - dist: {}, - watch: { - default: { - files: [ 'src/**/*', 'test/unit/**/*.js', 'Gruntfile.js' ], - tasks: 'dev' }, - skin: { - files: ['src/css/**/*'], - tasks: 'sass' - } - }, - connect: { - preview: { + uglify: { options: { - port: 9999, - keepalive: true + sourceMap: true, + sourceMapIn: 'build/temp/video.js.map', + sourceMapRoot: '../../src/js', + preserveComments: 'some', + mangle: true, + compress: { + sequences: true, + dead_code: true, + conditionals: true, + booleans: true, + unused: true, + if_return: true, + join_vars: true, + drop_console: true + } + }, + build: { + files: { + 'build/temp/video.min.js': 'build/temp/video.js' + } } }, - dev: { - options: { - port: 9999, - livereload: true + dist: {}, + watch: { + default: { + files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'], + tasks: 'dev' + }, + skin: { + files: ['src/css/**/*'], + tasks: 'sass' } - } - }, - copy: { - minor: { - files: [ - {expand: true, cwd: 'build/temp/', src: ['*'], dest: 'dist/'+version.majorMinor+'/', filter: 'isFile'} // includes files in path - ] }, - patch: { - files: [ - {expand: true, cwd: 'build/temp/', src: ['*'], dest: 'dist/'+version.full+'/', filter: 'isFile'} // includes files in path - ] + connect: { + preview: { + options: { + port: 9999, + keepalive: true + } + }, + dev: { + options: { + port: 9999, + livereload: true + } + } }, - fonts: { expand: true, cwd: 'src/css/font/', src: ['*'], dest: 'build/temp/font/', filter: 'isFile' }, - swf: { src: './node_modules/videojs-swf/dist/video-js.swf', dest: './build/temp/video-js.swf' }, - novtt: { src: './build/temp/video.js', dest: './build/temp/alt/video.novtt.js' }, - dist: { expand: true, cwd: 'build/temp/', src: ['**/**'], dest: 'dist/', filter: 'isFile' }, - examples: { expand: true, cwd: 'build/examples/', src: ['**/**'], dest: 'dist/examples/', filter: 'isFile' }, - cdn: { expand: true, cwd: 'dist/', src: ['**/**'], dest: 'dist/cdn/', filter: 'isFile' }, - }, - aws_s3: { - options: { - accessKeyId: process.env.VJS_S3_KEY, - secretAccessKey: process.env.VJS_S3_SECRET, - bucket: process.env.VJS_S3_BUCKET, - access: 'public-read', - uploadConcurrency: 5 + copy: { + minor: { + files: [{ + expand: true, + cwd: 'build/temp/', + src: ['*'], + dest: 'dist/' + version.majorMinor + '/', + filter: 'isFile' + } // includes files in path + ] + }, + patch: { + files: [{ + expand: true, + cwd: 'build/temp/', + src: ['*'], + dest: 'dist/' + version.full + '/', + filter: 'isFile' + } // includes files in path + ] + }, + fonts: { + expand: true, + cwd: 'node_modules/videojs-font/fonts/', + src: ['*'], + dest: 'build/temp/font/', + filter: 'isFile' + }, + swf: { + src: './node_modules/videojs-swf/dist/video-js.swf', + dest: './build/temp/video-js.swf' + }, + novtt: { + src: './build/temp/video.js', + dest: './build/temp/alt/video.novtt.js' + }, + dist: { + expand: true, + cwd: 'build/temp/', + src: ['**/**'], + dest: 'dist/', + filter: 'isFile' + }, + examples: { + expand: true, + cwd: 'build/examples/', + src: ['**/**'], + dest: 'dist/examples/', + filter: 'isFile' + }, + cdn: { + expand: true, + cwd: 'dist/', + src: ['**/**'], + dest: 'dist/cdn/', + filter: 'isFile' + }, }, - patch: { - files: [ - { + aws_s3: { + options: { + accessKeyId: process.env.VJS_S3_KEY, + secretAccessKey: process.env.VJS_S3_SECRET, + bucket: process.env.VJS_S3_BUCKET, + access: 'public-read', + uploadConcurrency: 5 + }, + patch: { + files: [{ expand: true, cwd: 'dist/cdn/', src: ['**'], - dest: 'vjs/'+version.full+'/', - params: { CacheControl: 'public, max-age=31536000' } - } - ] - }, - minor: { - files: [ - { + dest: 'vjs/' + version.full + '/', + params: { + CacheControl: 'public, max-age=31536000' + } + }] + }, + minor: { + files: [{ expand: true, cwd: 'dist/cdn/', src: ['**'], - dest: 'vjs/'+version.majorMinor+'/', - params: { CacheControl: 'public, max-age=2628000' } - } - ] - } - }, - fastly: { - options: { - key: process.env.VJS_FASTLY_API_KEY + dest: 'vjs/' + version.majorMinor + '/', + params: { + CacheControl: 'public, max-age=2628000' + } + }] + } }, - minor: { + fastly: { options: { - host: 'vjs.zencdn.net', - urls: [ - version.majorMinor+'/*' - ] + key: process.env.VJS_FASTLY_API_KEY + }, + minor: { + options: { + host: 'vjs.zencdn.net', + urls: [ + version.majorMinor + '/*' + ] + } + }, + patch: { + options: { + host: 'vjs.zencdn.net', + urls: [ + version.full + '/*' + ] + } } }, - patch: { - options: { - host: 'vjs.zencdn.net', - urls: [ - version.full+'/*' - ] + cssmin: { + minify: { + expand: true, + cwd: 'build/temp/', + src: ['video-js.css'], + dest: 'build/temp/', + ext: '.min.css' } - } - }, - cssmin: { - minify: { - expand: true, - cwd: 'build/temp/', - src: ['video-js.css'], - dest: 'build/temp/', - ext: '.min.css' - } - }, - sass: { - dist: { - files: { - 'build/temp/video-js.css': 'src/css/video-js.scss' + }, + sass: { + dist: { + files: { + 'build/temp/video-js.css': 'src/css/video-js.scss' + } } - } - }, - karma: { - // this config file applies to all following configs except if overwritten - options: { - configFile: 'test/karma.conf.js' }, + karma: { + // this config file applies to all following configs except if overwritten + options: { + configFile: 'test/karma.conf.js' + }, - // these are run locally on local browsers - dev: { - browsers: ['Chrome', 'Firefox', 'Safari'] - }, - chromecanary: { browsers: ['ChromeCanary'] }, - chrome: { browsers: ['Chrome'] }, - firefox: { browsers: ['Firefox'] }, - safari: { browsers: ['Safari'] }, - ie: { browsers: ['IE'] }, - phantomjs: { browsers: ['PhantomJS'] }, + // these are run locally on local browsers + dev: { + browsers: ['Chrome', 'Firefox', 'Safari'] + }, + chromecanary: { + browsers: ['ChromeCanary'] + }, + chrome: { + browsers: ['Chrome'] + }, + firefox: { + browsers: ['Firefox'] + }, + safari: { + browsers: ['Safari'] + }, + ie: { + browsers: ['IE'] + }, + phantomjs: { + browsers: ['PhantomJS'] + }, - // this only runs on PRs from the mainrepo on saucelabs - saucelabs: { browsers: ['chrome_sl'] }, - chrome_sl: { browsers: ['chrome_sl'] }, - firefox_sl: { browsers: ['firefox_sl'] }, - safari_sl: { browsers: ['safari_sl'] }, - ipad_sl: { browsers: ['ipad_sl'] }, - android_sl: { browsers: ['android_sl'] }, - ie_sl: { browsers: ['ie_sl'] } - }, - vjsdocs: { - all: { - // TODO: Update vjsdocs to support new build, or switch to jsdoc - src: '', - dest: 'docs/api', - options: { - baseURL: 'https://github.com/videojs/video.js/blob/master/' + // this only runs on PRs from the mainrepo on saucelabs + saucelabs: { + browsers: ['chrome_sl'] + }, + chrome_sl: { + browsers: ['chrome_sl'] + }, + firefox_sl: { + browsers: ['firefox_sl'] + }, + safari_sl: { + browsers: ['safari_sl'] + }, + ipad_sl: { + browsers: ['ipad_sl'] + }, + android_sl: { + browsers: ['android_sl'] + }, + ie_sl: { + browsers: ['ie_sl'] } - } - }, - vjslanguages: { - defaults: { - files: { - 'build/temp/lang': ['lang/*.json'] + }, + vjsdocs: { + all: { + // TODO: Update vjsdocs to support new build, or switch to jsdoc + src: '', + dest: 'docs/api', + options: { + baseURL: 'https://github.com/videojs/video.js/blob/master/' + } } - } - }, - zip: { - dist: { - router: function (filepath) { - var path = require('path'); - return path.relative('dist', filepath); - }, - // compression: 'DEFLATE', - src: ['dist/**/*'], - dest: 'dist/video-js-' + version.full + '.zip' - } - }, - version: { - options: { - pkg: 'package.json' }, - major: { - options: { - release: 'major' - }, - src: ['package.json', 'component.json'] + vjslanguages: { + defaults: { + files: { + 'build/temp/lang': ['lang/*.json'] + } + } }, - minor: { - options: { - release: 'minor' - }, - src: ['package.json', 'component.json'] + zip: { + dist: { + router: function(filepath) { + var path = require('path'); + return path.relative('dist', filepath); + }, + // compression: 'DEFLATE', + src: ['dist/**/*'], + dest: 'dist/video-js-' + version.full + '.zip' + } }, - patch: { + version: { options: { - release: 'patch' + pkg: 'package.json' }, - src: ['package.json', 'component.json'] - }, - prerelease: { - options: { - release: 'prerelease' + major: { + options: { + release: 'major' + }, + src: ['package.json', 'component.json'] }, - src: ['package.json', 'component.json'] - }, - css: { - options: { - prefix: '@version\\s*' + minor: { + options: { + release: 'minor' + }, + src: ['package.json', 'component.json'] }, - src: 'build/temp/video-js.css' - } - }, - 'github-release': { - options: { - repository: 'videojs/video.js', - auth: { - user: process.env.VJS_GITHUB_USER, - password: process.env.VJS_GITHUB_TOKEN - }, - release: { - tag_name: 'v'+ version.full, - name: version.full, - body: require('chg').find(version.full).changesRaw - } - }, - files: { - src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release - } - }, - browserify: { - build: { - files: { - 'build/temp/video.js': ['src/js/video.js'] + patch: { + options: { + release: 'patch' + }, + src: ['package.json', 'component.json'] }, - options: { - browserifyOptions: { - debug: true, - standalone: 'videojs' + prerelease: { + options: { + release: 'prerelease' }, - banner: license, - plugin: [ - [ 'browserify-derequire' ] - ], - transform: [ - require('babelify').configure({ - sourceMapRelative: './src/js', - loose: 'all' - }), - ['browserify-versionify', { - placeholder: '__VERSION__', - version: pkg.version - }], - ['browserify-versionify', { - placeholder: '__VERSION_NO_PATCH__', - version: version.majorMinor - }] - ] + src: ['package.json', 'component.json'] + }, + css: { + options: { + prefix: '@version\\s*' + }, + src: 'build/temp/video-js.css' } }, - test: { - files: { - 'build/temp/tests.js': [ - 'test/globals-shim.js', - 'test/unit/**/*.js' - ] - }, + 'github-release': { options: { - browserifyOptions: { - debug: true, - standalone: 'videojs' + repository: 'videojs/video.js', + auth: { + user: process.env.VJS_GITHUB_USER, + password: process.env.VJS_GITHUB_TOKEN }, - transform: [ - require('babelify').configure(), - 'browserify-istanbul' - ] + release: { + tag_name: 'v' + version.full, + name: version.full, + body: require('chg').find(version.full).changesRaw + } + }, + files: { + src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release } }, - watch: { - files: { - 'build/temp/video.js': ['src/js/video.js'], - 'build/temp/tests.js': [ - 'test/globals-shim.js', - 'test/unit/**/*.js' - ] + browserify: { + build: { + files: { + 'build/temp/video.js': ['src/js/video.js'] + }, + options: { + browserifyOptions: { + debug: true, + standalone: 'videojs' + }, + banner: license, + plugin: [ + ['browserify-derequire'] + ], + transform: [ + require('babelify').configure({ + sourceMapRelative: './src/js', + loose: 'all' + }), ['browserify-versionify', { + placeholder: '__VERSION__', + version: pkg.version + }], + ['browserify-versionify', { + placeholder: '__VERSION_NO_PATCH__', + version: version.majorMinor + }] + ] + } }, - options: { - watch: true, - keepAlive: true, - browserifyOptions: { - standalone: 'videojs' + test: { + files: { + 'build/temp/tests.js': [ + 'test/globals-shim.js', + 'test/unit/**/*.js' + ] }, - banner: license, - transform: ['babelify'], - plugin: [ - [ 'browserify-derequire' ] - ] + options: { + browserifyOptions: { + debug: true, + standalone: 'videojs' + }, + transform: [ + require('babelify').configure(), + 'browserify-istanbul' + ] + } + }, + watch: { + files: { + 'build/temp/video.js': ['src/js/video.js'], + 'build/temp/tests.js': [ + 'test/globals-shim.js', + 'test/unit/**/*.js' + ] + }, + options: { + watch: true, + keepAlive: true, + browserifyOptions: { + standalone: 'videojs' + }, + banner: license, + transform: ['babelify'], + plugin: [ + ['browserify-derequire'] + ] + } } - } - }, - exorcise: { - build: { - options: {}, - files: { - 'build/temp/video.js.map': ['build/temp/video.js'], + }, + exorcise: { + build: { + options: {}, + files: { + 'build/temp/video.js.map': ['build/temp/video.js'], + } } - } - }, - coveralls: { - options: { - // warn instead of failing when coveralls errors - // we've seen coveralls 503 relatively frequently - force: true }, - all: { - src: 'test/coverage/lcov.info' - } - }, - concat: { - vtt: { + coveralls: { options: { - separator: '\n', + // warn instead of failing when coveralls errors + // we've seen coveralls 503 relatively frequently + force: true }, - src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'], - dest: 'build/temp/video.js', + all: { + src: 'test/coverage/lcov.info' + } }, - } + concat: { + vtt: { + options: { + separator: '\n', + }, + src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'], + dest: 'build/temp/video.js', + }, + } }); // load all the npm grunt tasks diff --git a/package.json b/package.json index 8d9fb364b6..50f7feb38e 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,8 @@ "sinon": "~1.9.1", "time-grunt": "^1.1.1", "uglify-js": "~2.3.6", - "videojs-doc-generator": "0.0.1" + "videojs-doc-generator": "0.0.1", + "videojs-font": "^1.1.0" }, "standard": { "ignore": [ diff --git a/src/css/font/VideoJS.eot b/src/css/font/VideoJS.eot deleted file mode 100755 index 5d29e5adf14d69062fdf651bd8fd69e9cf3b4bd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4172 zcmb7HU2Gd!6+Xu^{z)7=b(-v>`;%BlsIFvqT9?Oy4lvHM09PkTLey<^e1UI z5pAU{Ql$}Ep)Pr#AY38s!|nq}D5+NLLn863Jnc&bViAcJo+`Qot1W1?qC70B!*^%K zahz@!xSD(Kx#ym9?!D*l-Z{R9=%?*OOfG6JOgC9zj!!h>1+86P_;~*D?m40$mFNOZ z(+thiF**r?Abka+b99w1(iD9Ym@sH&09^*tLPoS&JR zcD?OCK-Bh6%;(MnA^p}R5d|_B_n*IX<<)1&w}$Zq#y2j`pP5SU8vt+MeT<*KH1+BN z9iXq{RB?>suS{KLqRg!f;~6PPAgSlVlQm9Ra;e9l*tttDC$jZALeb zZ%%CfVDm4VAN_4_HBgOJ`>M(6NL8;sS3O=mTm63Zovp`PTi~S~JcV66z2G@m9jzMG zqdRzb>)xMFMCGUy`FrHokzYivMbeS(u77vA)Q{8;)qkiTsQ1)Asee#^u6|ElaCT}f z^nWx=jNP^G&;ib#f5uWtLofdgw@d}D@KxdPdqer<`+T*wQNhT7j@S4t=uCl{L%pG1 zy|>S!ggV37-jSRh8cij*QrqBkZKER+>EN{0f|=7=q@#fp*3ih$>%2m3uyP90AO~U~ z1w!9l^tGm<-N|IP zJj6rh9M}zrGr^q(xQK2E{e9r?1BUKOr1LT_(tg-!r-BkeXv?vV>doq2zSea(F@EOE z_@Pt5Oz^q1UMT3%;n0y=Bm9!uEv#`gpFCL5^@1XhB32uIKuH+5E>7X~x*6}*O^vfP z(Kq=FQ=N=g>YPYvJLE@pdD$+_DH&)=ZO#rXe%#Mi0W~CxRqgFJM-I+0M^6bG~$6ol@qlF-$J4y%g>-jr2%xwaIFL_%B= zZEdMk+Su4IMazqkjxDl6745R7nHow_!`Tq02G(1%);mC7_=L5*3CoSLh)#|BQqS^e z?(;knhDM$?AyPymJuJmFEgonwTH4ys1S(=^K^CrgZ@2u0KkN$xd?nF@n@6y9k;;6B z%hY!b&)8<27HLr%e4^~%OLCc^rO|*#5 z#`*W-zQ{jK1D3L(=Dbh?v=2var~c zzY#~ZjU^PJH+egrWC~G?5@Kx}Zf`wliuBzSSl0BKrWw2A3yUl+EpfUYtc@ru*=y~L zUA!)uqFvHeZ)3k2jMa$NJ8R{#*lXjCkq|A&UGRuc+331yYPCf(*WfAS*|Wt?iT0fig))7wcTzT+Gm(^T$&T-WU7F-2woxG=BSirXG>;n_S@o(qmt*QE>mGO9?=Kod zhidP3&&(9(PWih6;ek-5yY|LU1_#CFhIL$U?fU|~or7Ipynt)qM0Txv#+9Op zl!l|1Uy22@C$R4MBS+3dm(Xo->k(r84m=kA%1VAfv2XkQ5Txd^s@Ga1q2rj=17v`y zSR9`Y270`{f_~F#Z3LH%V#$~uj|_G81Y>*jLelQGu~^RoU0=nS3RY|eaZ_}OlUacv zE?mXB*j2op6h$<;Xbq8b5q7NA*6a07I$hGVWne8}0~y(c9OUQU;T>~=P6-=|_mZAJ z%)_{t+fj#kG=)6uQM@qUK+4n3o^TI$ipP~e^>B>GP=N{~P3Ht_UJd8QIF}k`@AmC0 zo?34*4@&GxyL?j4*U{?p$R*k1YwhsCz%I?j(x6SCxxBLe$pmlqWHLRX-f{cg_!5#= zJ|;;n#p9PhC%fHf{2s+6Nyp$biT{NrXUprsuZRdP)W`E5zwnLrLyySs0)puG@BKB` z=wbN>usr^ApgX&O$NFDz5d6TBqE&SWu(*6x22y+?@I4W|B`+3i}H8m-^dT$;&)OUqL02NG6V`lKT(48wxb6Y8OVWM zfX5wJ0^IMwGT@>EyK$!k9oU2XHR8ancx#_Q7G}8x7$MV!ZJ9P~%d}xzrVZONZCGT6 zXB=KzX7dm5C;uon(UdMs&&(e?x$D2X`JcOqfu6Viy01_if8{gy{}%t^Q*;IWG;pWs W8rq{c-aLH?Rs5kNrHT`NYWWYsG~Rvy diff --git a/src/css/font/VideoJS.svg b/src/css/font/VideoJS.svg deleted file mode 100755 index d9a39d7b6f..0000000000 --- a/src/css/font/VideoJS.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/css/font/VideoJS.ttf b/src/css/font/VideoJS.ttf deleted file mode 100755 index bf0b443c68b534b965ea7591b47f05a697ed0266..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4008 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 Date: Sun, 31 May 2015 23:39:19 -0700 Subject: [PATCH 2/3] deleted old references to the font --- src/css/_variables.scss | 1 - src/css/components/_icons.scss | 79 ---------------------------------- 2 files changed, 80 deletions(-) delete mode 100644 src/css/components/_icons.scss diff --git a/src/css/_variables.scss b/src/css/_variables.scss index 80e28b1a71..48d3a2eeea 100644 --- a/src/css/_variables.scss +++ b/src/css/_variables.scss @@ -4,7 +4,6 @@ $secondary-text: #F4A460; // currently just used for visited links in errors and $primary-bg: #000; $secondary-bg: lighten($primary-bg, 35%); -$icon-font-family: 'VideoJS'; $text-font-family: Arial, Helvetica, sans-serif; $base-font-size: 10px; diff --git a/src/css/components/_icons.scss b/src/css/components/_icons.scss deleted file mode 100644 index 88cfa134b7..0000000000 --- a/src/css/components/_icons.scss +++ /dev/null @@ -1,79 +0,0 @@ -@font-face { - font-family: $icon-font-family; - src: url('font/VideoJS.eot'); -} -@font-face { - font-family: $icon-font-family; - src: url(data:application/x-font-ttf;charset=utf-8;base64,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) format('truetype'), - url(data:application/font-woff;charset=utf-8;base64,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) format('woff'); - font-weight: normal; - font-style: normal; -} - -// http://sass-lang.com/documentation/file.SASS_REFERENCE.html#maps -$icons: ( - play: "\25b6", - pause: "\e830", - volume-mute: "\e84b", - volume-low: "\e84a", - volume-mid: "\e849", - volume-high: "\e84c", - fullscreen-enter: "\e64b", - fullscreen-exit: "\e64c", - square: "\e601", - spinner: "\e650", - subtitles: "\e80d", - captions: "\e81e", - chapters: "\e891", - share: "\e61a", - cog: "\e8b1", - circle: "\e692", - circle-outline: "\e6f2", - circle-inner-circle: "\e603" -); - -// NOTE: This is as complex as we want to get with SCSS functionality. -// -// Now that we have a map of icons above, we can iterate over that map and create an icon class -// for each icon in that list. The iterator below produces CSS classes like this: -// -// .vjs-icon-play { -// font-family: VideoJS; -// font-weight: normal; -// font-style: normal; -// } -// .vjs-icon-play:before { content: "\25b6"; } -// -// We can then use @extend in the codebase when we need to add an icon to a class. @extend builds up -// the selectors for you so you can avoid duplication. This is generally a bad idea, but since each -// icon should only be extended one or two other places, we'll roll with it. -@each $name, $content in $icons { - .vjs-icon-#{$name} { - font-family: $icon-font-family; - font-weight: normal; - font-style: normal; - - &:before { - content: $content; - } - } -} - -// $icon-play: "\25b6"; -// $icon-pause: "\e830"; -// $icon-volume-mute: "\e84b"; -// $icon-volume-low: "\e84a"; -// $icon-volume-mid: "\e849"; -// $icon-volume-high: "\e84c"; -// $icon-fullscreen-enter: "\e64b"; -// $icon-fullscreen-exit: "\e64c"; -// $icon-square: "\e009"; -// $icon-spinner: "\e650"; -// $icon-subtitles: "\e80d"; -// $icon-captions: "\e81e"; -// $icon-chapters: "\e891"; -// $icon-share: "\e61a"; -// $icon-cog: "\e8b1"; -// $icon-circle: "\e692"; -// $icon-circle-outline: "\e6f2"; -// $icon-circle-inner-circle: "\e603"; From 9887e730a29b37b947ac031ce859254ccc9089d0 Mon Sep 17 00:00:00 2001 From: Matthew McClure Date: Mon, 1 Jun 2015 10:37:13 -0700 Subject: [PATCH 3/3] reverted grunt.js formatting changes --- grunt.js | 663 +++++++++++++++++++++++++------------------------------ 1 file changed, 299 insertions(+), 364 deletions(-) diff --git a/grunt.js b/grunt.js index 640f5eb47a..85f4314877 100644 --- a/grunt.js +++ b/grunt.js @@ -18,420 +18,355 @@ module.exports = function(grunt) { grunt.initConfig({ pkg, clean: { - build: ['build/temp/*'], - dist: ['dist/*'] + build: ['build/temp/*'], + dist: ['dist/*'] + }, + jshint: { + src: { + src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'], + options: { + jshintrc: '.jshintrc' + } + } + }, + uglify: { + options: { + sourceMap: true, + sourceMapIn: 'build/temp/video.js.map', + sourceMapRoot: '../../src/js', + preserveComments: 'some', + mangle: true, + compress: { + sequences: true, + dead_code: true, + conditionals: true, + booleans: true, + unused: true, + if_return: true, + join_vars: true, + drop_console: true + } }, - jshint: { - src: { - src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'], - options: { - jshintrc: '.jshintrc' - } + build: { + files: { + 'build/temp/video.min.js': 'build/temp/video.js' } + } + }, + dist: {}, + watch: { + default: { + files: [ 'src/**/*', 'test/unit/**/*.js', 'Gruntfile.js' ], + tasks: 'dev' }, - uglify: { + skin: { + files: ['src/css/**/*'], + tasks: 'sass' + } + }, + connect: { + preview: { options: { - sourceMap: true, - sourceMapIn: 'build/temp/video.js.map', - sourceMapRoot: '../../src/js', - preserveComments: 'some', - mangle: true, - compress: { - sequences: true, - dead_code: true, - conditionals: true, - booleans: true, - unused: true, - if_return: true, - join_vars: true, - drop_console: true - } - }, - build: { - files: { - 'build/temp/video.min.js': 'build/temp/video.js' - } + port: 9999, + keepalive: true } }, - dist: {}, - watch: { - default: { - files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'], - tasks: 'dev' - }, - skin: { - files: ['src/css/**/*'], - tasks: 'sass' + dev: { + options: { + port: 9999, + livereload: true } + } + }, + copy: { + minor: { + files: [ + {expand: true, cwd: 'build/temp/', src: ['*'], dest: 'dist/'+version.majorMinor+'/', filter: 'isFile'} // includes files in path + ] }, - connect: { - preview: { - options: { - port: 9999, - keepalive: true - } - }, - dev: { - options: { - port: 9999, - livereload: true - } - } + patch: { + files: [ + {expand: true, cwd: 'build/temp/', src: ['*'], dest: 'dist/'+version.full+'/', filter: 'isFile'} // includes files in path + ] }, - copy: { - minor: { - files: [{ - expand: true, - cwd: 'build/temp/', - src: ['*'], - dest: 'dist/' + version.majorMinor + '/', - filter: 'isFile' - } // includes files in path - ] - }, - patch: { - files: [{ - expand: true, - cwd: 'build/temp/', - src: ['*'], - dest: 'dist/' + version.full + '/', - filter: 'isFile' - } // includes files in path - ] - }, - fonts: { - expand: true, - cwd: 'node_modules/videojs-font/fonts/', - src: ['*'], - dest: 'build/temp/font/', - filter: 'isFile' - }, - swf: { - src: './node_modules/videojs-swf/dist/video-js.swf', - dest: './build/temp/video-js.swf' - }, - novtt: { - src: './build/temp/video.js', - dest: './build/temp/alt/video.novtt.js' - }, - dist: { - expand: true, - cwd: 'build/temp/', - src: ['**/**'], - dest: 'dist/', - filter: 'isFile' - }, - examples: { - expand: true, - cwd: 'build/examples/', - src: ['**/**'], - dest: 'dist/examples/', - filter: 'isFile' - }, - cdn: { - expand: true, - cwd: 'dist/', - src: ['**/**'], - dest: 'dist/cdn/', - filter: 'isFile' - }, + fonts: { expand: true, cwd: './node_modules/videojs-font/fonts/', src: ['*'], dest: 'build/temp/font/', filter: 'isFile' }, + swf: { src: './node_modules/videojs-swf/dist/video-js.swf', dest: './build/temp/video-js.swf' }, + novtt: { src: './build/temp/video.js', dest: './build/temp/alt/video.novtt.js' }, + dist: { expand: true, cwd: 'build/temp/', src: ['**/**'], dest: 'dist/', filter: 'isFile' }, + examples: { expand: true, cwd: 'build/examples/', src: ['**/**'], dest: 'dist/examples/', filter: 'isFile' }, + cdn: { expand: true, cwd: 'dist/', src: ['**/**'], dest: 'dist/cdn/', filter: 'isFile' }, + }, + aws_s3: { + options: { + accessKeyId: process.env.VJS_S3_KEY, + secretAccessKey: process.env.VJS_S3_SECRET, + bucket: process.env.VJS_S3_BUCKET, + access: 'public-read', + uploadConcurrency: 5 }, - aws_s3: { - options: { - accessKeyId: process.env.VJS_S3_KEY, - secretAccessKey: process.env.VJS_S3_SECRET, - bucket: process.env.VJS_S3_BUCKET, - access: 'public-read', - uploadConcurrency: 5 - }, - patch: { - files: [{ + patch: { + files: [ + { expand: true, cwd: 'dist/cdn/', src: ['**'], - dest: 'vjs/' + version.full + '/', - params: { - CacheControl: 'public, max-age=31536000' - } - }] - }, - minor: { - files: [{ + dest: 'vjs/'+version.full+'/', + params: { CacheControl: 'public, max-age=31536000' } + } + ] + }, + minor: { + files: [ + { expand: true, cwd: 'dist/cdn/', src: ['**'], - dest: 'vjs/' + version.majorMinor + '/', - params: { - CacheControl: 'public, max-age=2628000' - } - }] - } + dest: 'vjs/'+version.majorMinor+'/', + params: { CacheControl: 'public, max-age=2628000' } + } + ] + } + }, + fastly: { + options: { + key: process.env.VJS_FASTLY_API_KEY }, - fastly: { + minor: { options: { - key: process.env.VJS_FASTLY_API_KEY - }, - minor: { - options: { - host: 'vjs.zencdn.net', - urls: [ - version.majorMinor + '/*' - ] - } - }, - patch: { - options: { - host: 'vjs.zencdn.net', - urls: [ - version.full + '/*' - ] - } + host: 'vjs.zencdn.net', + urls: [ + version.majorMinor+'/*' + ] } }, - cssmin: { - minify: { - expand: true, - cwd: 'build/temp/', - src: ['video-js.css'], - dest: 'build/temp/', - ext: '.min.css' + patch: { + options: { + host: 'vjs.zencdn.net', + urls: [ + version.full+'/*' + ] } - }, - sass: { - dist: { - files: { - 'build/temp/video-js.css': 'src/css/video-js.scss' - } + } + }, + cssmin: { + minify: { + expand: true, + cwd: 'build/temp/', + src: ['video-js.css'], + dest: 'build/temp/', + ext: '.min.css' + } + }, + sass: { + dist: { + files: { + 'build/temp/video-js.css': 'src/css/video-js.scss' } + } + }, + karma: { + // this config file applies to all following configs except if overwritten + options: { + configFile: 'test/karma.conf.js' }, - karma: { - // this config file applies to all following configs except if overwritten - options: { - configFile: 'test/karma.conf.js' - }, - // these are run locally on local browsers - dev: { - browsers: ['Chrome', 'Firefox', 'Safari'] - }, - chromecanary: { - browsers: ['ChromeCanary'] - }, - chrome: { - browsers: ['Chrome'] - }, - firefox: { - browsers: ['Firefox'] - }, - safari: { - browsers: ['Safari'] - }, - ie: { - browsers: ['IE'] - }, - phantomjs: { - browsers: ['PhantomJS'] - }, - - // this only runs on PRs from the mainrepo on saucelabs - saucelabs: { - browsers: ['chrome_sl'] - }, - chrome_sl: { - browsers: ['chrome_sl'] - }, - firefox_sl: { - browsers: ['firefox_sl'] - }, - safari_sl: { - browsers: ['safari_sl'] - }, - ipad_sl: { - browsers: ['ipad_sl'] - }, - android_sl: { - browsers: ['android_sl'] - }, - ie_sl: { - browsers: ['ie_sl'] - } + // these are run locally on local browsers + dev: { + browsers: ['Chrome', 'Firefox', 'Safari'] }, - vjsdocs: { - all: { - // TODO: Update vjsdocs to support new build, or switch to jsdoc - src: '', - dest: 'docs/api', - options: { - baseURL: 'https://github.com/videojs/video.js/blob/master/' - } - } - }, - vjslanguages: { - defaults: { - files: { - 'build/temp/lang': ['lang/*.json'] - } + chromecanary: { browsers: ['ChromeCanary'] }, + chrome: { browsers: ['Chrome'] }, + firefox: { browsers: ['Firefox'] }, + safari: { browsers: ['Safari'] }, + ie: { browsers: ['IE'] }, + phantomjs: { browsers: ['PhantomJS'] }, + + // this only runs on PRs from the mainrepo on saucelabs + saucelabs: { browsers: ['chrome_sl'] }, + chrome_sl: { browsers: ['chrome_sl'] }, + firefox_sl: { browsers: ['firefox_sl'] }, + safari_sl: { browsers: ['safari_sl'] }, + ipad_sl: { browsers: ['ipad_sl'] }, + android_sl: { browsers: ['android_sl'] }, + ie_sl: { browsers: ['ie_sl'] } + }, + vjsdocs: { + all: { + // TODO: Update vjsdocs to support new build, or switch to jsdoc + src: '', + dest: 'docs/api', + options: { + baseURL: 'https://github.com/videojs/video.js/blob/master/' } - }, - zip: { - dist: { - router: function(filepath) { - var path = require('path'); - return path.relative('dist', filepath); - }, - // compression: 'DEFLATE', - src: ['dist/**/*'], - dest: 'dist/video-js-' + version.full + '.zip' + } + }, + vjslanguages: { + defaults: { + files: { + 'build/temp/lang': ['lang/*.json'] } + } + }, + zip: { + dist: { + router: function (filepath) { + var path = require('path'); + return path.relative('dist', filepath); + }, + // compression: 'DEFLATE', + src: ['dist/**/*'], + dest: 'dist/video-js-' + version.full + '.zip' + } + }, + version: { + options: { + pkg: 'package.json' }, - version: { + major: { options: { - pkg: 'package.json' + release: 'major' }, - major: { - options: { - release: 'major' - }, - src: ['package.json', 'component.json'] + src: ['package.json', 'component.json'] + }, + minor: { + options: { + release: 'minor' }, - minor: { - options: { - release: 'minor' - }, - src: ['package.json', 'component.json'] + src: ['package.json', 'component.json'] + }, + patch: { + options: { + release: 'patch' }, - patch: { - options: { - release: 'patch' - }, - src: ['package.json', 'component.json'] + src: ['package.json', 'component.json'] + }, + prerelease: { + options: { + release: 'prerelease' }, - prerelease: { - options: { - release: 'prerelease' - }, - src: ['package.json', 'component.json'] + src: ['package.json', 'component.json'] + }, + css: { + options: { + prefix: '@version\\s*' }, - css: { - options: { - prefix: '@version\\s*' - }, - src: 'build/temp/video-js.css' + src: 'build/temp/video-js.css' + } + }, + 'github-release': { + options: { + repository: 'videojs/video.js', + auth: { + user: process.env.VJS_GITHUB_USER, + password: process.env.VJS_GITHUB_TOKEN + }, + release: { + tag_name: 'v'+ version.full, + name: version.full, + body: require('chg').find(version.full).changesRaw } }, - 'github-release': { + files: { + src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release + } + }, + browserify: { + build: { + files: { + 'build/temp/video.js': ['src/js/video.js'] + }, options: { - repository: 'videojs/video.js', - auth: { - user: process.env.VJS_GITHUB_USER, - password: process.env.VJS_GITHUB_TOKEN + browserifyOptions: { + debug: true, + standalone: 'videojs' }, - release: { - tag_name: 'v' + version.full, - name: version.full, - body: require('chg').find(version.full).changesRaw - } - }, - files: { - src: [`dist/video-js-${version.full}.zip`] // Files that you want to attach to Release + banner: license, + plugin: [ + [ 'browserify-derequire' ] + ], + transform: [ + require('babelify').configure({ + sourceMapRelative: './src/js', + loose: 'all' + }), + ['browserify-versionify', { + placeholder: '__VERSION__', + version: pkg.version + }], + ['browserify-versionify', { + placeholder: '__VERSION_NO_PATCH__', + version: version.majorMinor + }] + ] } }, - browserify: { - build: { - files: { - 'build/temp/video.js': ['src/js/video.js'] - }, - options: { - browserifyOptions: { - debug: true, - standalone: 'videojs' - }, - banner: license, - plugin: [ - ['browserify-derequire'] - ], - transform: [ - require('babelify').configure({ - sourceMapRelative: './src/js', - loose: 'all' - }), ['browserify-versionify', { - placeholder: '__VERSION__', - version: pkg.version - }], - ['browserify-versionify', { - placeholder: '__VERSION_NO_PATCH__', - version: version.majorMinor - }] - ] - } + test: { + files: { + 'build/temp/tests.js': [ + 'test/globals-shim.js', + 'test/unit/**/*.js' + ] }, - test: { - files: { - 'build/temp/tests.js': [ - 'test/globals-shim.js', - 'test/unit/**/*.js' - ] + options: { + browserifyOptions: { + debug: true, + standalone: 'videojs' }, - options: { - browserifyOptions: { - debug: true, - standalone: 'videojs' - }, - transform: [ - require('babelify').configure(), - 'browserify-istanbul' - ] - } + transform: [ + require('babelify').configure(), + 'browserify-istanbul' + ] + } + }, + watch: { + files: { + 'build/temp/video.js': ['src/js/video.js'], + 'build/temp/tests.js': [ + 'test/globals-shim.js', + 'test/unit/**/*.js' + ] }, - watch: { - files: { - 'build/temp/video.js': ['src/js/video.js'], - 'build/temp/tests.js': [ - 'test/globals-shim.js', - 'test/unit/**/*.js' - ] + options: { + watch: true, + keepAlive: true, + browserifyOptions: { + standalone: 'videojs' }, - options: { - watch: true, - keepAlive: true, - browserifyOptions: { - standalone: 'videojs' - }, - banner: license, - transform: ['babelify'], - plugin: [ - ['browserify-derequire'] - ] - } + banner: license, + transform: ['babelify'], + plugin: [ + [ 'browserify-derequire' ] + ] } - }, - exorcise: { - build: { - options: {}, - files: { - 'build/temp/video.js.map': ['build/temp/video.js'], - } + } + }, + exorcise: { + build: { + options: {}, + files: { + 'build/temp/video.js.map': ['build/temp/video.js'], } + } + }, + coveralls: { + options: { + // warn instead of failing when coveralls errors + // we've seen coveralls 503 relatively frequently + force: true }, - coveralls: { + all: { + src: 'test/coverage/lcov.info' + } + }, + concat: { + vtt: { options: { - // warn instead of failing when coveralls errors - // we've seen coveralls 503 relatively frequently - force: true + separator: '\n', }, - all: { - src: 'test/coverage/lcov.info' - } + src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'], + dest: 'build/temp/video.js', }, - concat: { - vtt: { - options: { - separator: '\n', - }, - src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'], - dest: 'build/temp/video.js', - }, - } + } }); // load all the npm grunt tasks