Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(104)

Delta Between Two Patch Sets: bin/merge-files

Issue 7384059: Created Y.SubApp class by extending Y.App
Left Patch Set: Created Y.SubApp class by extending Y.App Created 12 years, 1 month ago
Right Patch Set: Created Y.SubApp class by extending Y.App Created 12 years, 1 month ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « app/modules-debug.js ('k') | test/index.html » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #!/usr/bin/env node 1 #!/usr/bin/env node
2 2
3 /* 3 /*
4 * We aggregate and minimize the JavaScript sources in order to improve the 4 * We aggregate and minimize the JavaScript sources in order to improve the
5 * load speed of the application. 5 * load speed of the application.
6 * 6 *
7 * We don't want to use the YUI combo loader feature because we want to be able 7 * We don't want to use the YUI combo loader feature because we want to be able
8 * to run from only static files and we want to be able to run behind a 8 * to run from only static files and we want to be able to run behind a
9 * firewall without access to the internet. 9 * firewall without access to the internet.
10 * 10 *
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 var filesToLoad = merge.getYUIFiles(reqs); 68 var filesToLoad = merge.getYUIFiles(reqs);
69 69
70 // Merge third-party files to the filesToLoad list 70 // Merge third-party files to the filesToLoad list
71 filesToLoad.js.push.apply(filesToLoad.js, [ 71 filesToLoad.js.push.apply(filesToLoad.js, [
72 'app/assets/javascripts/d3.v2.min.js', 72 'app/assets/javascripts/d3.v2.min.js',
73 'app/assets/javascripts/d3-components.js', 73 'app/assets/javascripts/d3-components.js',
74 'app/assets/javascripts/reconnecting-websocket.js', 74 'app/assets/javascripts/reconnecting-websocket.js',
75 'app/assets/javascripts/routing.js', 75 'app/assets/javascripts/routing.js',
76 'app/assets/javascripts/gallery-ellipsis.js', 76 'app/assets/javascripts/gallery-ellipsis.js',
77 'app/assets/javascripts/gallery-markdown.js', 77 'app/assets/javascripts/gallery-markdown.js',
78 'app/assets/javascripts/gallery-timer.js']); 78 'app/assets/javascripts/gallery-timer.js',
79 'app/assets/javascripts/sub-app.js']);
79 80
80 merge.combineJs(filesToLoad.js, 'build-shared/juju-ui/assets/all-yui.js'); 81 merge.combineJs(filesToLoad.js, 'build-shared/juju-ui/assets/all-yui.js');
81 82
82 var cssFiles = filesToLoad.css; 83 var cssFiles = filesToLoad.css;
83 cssFiles.push('app/assets/stylesheets/bootstrap-2.0.4.css'); 84 cssFiles.push('app/assets/stylesheets/bootstrap-2.0.4.css');
84 cssFiles.push('app/assets/stylesheets/bootstrap-responsive-2.0.4.css'); 85 cssFiles.push('app/assets/stylesheets/bootstrap-responsive-2.0.4.css');
85 merge.combineCSS(cssFiles, 86 merge.combineCSS(cssFiles,
86 'build-shared/juju-ui/assets/combined-css/all-static.css'); 87 'build-shared/juju-ui/assets/combined-css/all-static.css');
87 }); 88 });
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b