doc/Makefile - Issue 1926683002: docserver: Load JS async defer since it really isn't required and it was blocking the loading of th…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: doc/Makefile

Issue 1926683002: docserver: Load JS async defer since it really isn't required and it was blocking the loading of th… (Closed) Base URL: https://skia.googlesource.com/buildbot@master

Patch Set: consolidate js Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | doc/res/js/docs.js » ('j') | doc/res/js/docs.js » ('J')

OLD	NEW
1 BOWER_DIR=third_party/bower_components	1 BOWER_DIR=third_party/bower_components

2	2

3 # The list of files we want to go into core.js, which is concat'd and	3 # The list of files we want to go into core.js, which is concat'd and

4 # minified. These files should be either present in the project, brought	4 # minified. These files should be either present in the project, brought

5 # into third_party/bower_compoents via bower, or in node_modules.	5 # into third_party/bower_compoents via bower, or in node_modules.

6 CORE_SOURCE_FILES = node_modules/native-promise-only/npo.js \	6 CORE_SOURCE_FILES = node_modules/native-promise-only/npo.js \

7 ${BOWER_DIR}/google-code-prettify/bin/prettify.min.js \	7 ${BOWER_DIR}/google-code-prettify/bin/prettify.min.js \

8 » ../res/js/common.js	8 » ../res/js/common.js \

9	9 » ./res/js/docs.js

10	10

11 default: core_js res/css/docs.css	11 default: core_js res/css/docs.css

12 go install -v ./go/docserver	12 go install -v ./go/docserver

13	13

14 res/css/docs.css: node_modules/lastupdate res/css/main.css ${BOWER_DIR}/google-c ode-prettify/bin/prettify.min.css	14 res/css/docs.css: node_modules/lastupdate res/css/main.css ${BOWER_DIR}/google-c ode-prettify/bin/prettify.min.css

15 cat res/css/main.css ${BOWER_DIR}/google-code-prettify/bin/prettify.min. css \| ./node_modules/.bin/autoprefixer -o res/css/docs.css	15 cat res/css/main.css ${BOWER_DIR}/google-code-prettify/bin/prettify.min. css \| ./node_modules/.bin/autoprefixer -o res/css/docs.css

16	16

17 release: default	17 release: default

18 ./build_release	18 ./build_release

19	19

20 include ../webtools/webtools.mk	20 include ../webtools/webtools.mk

OLD	NEW