Skip to content

Commit f9267ee

Browse files
committed
update header
1 parent c1cf817 commit f9267ee

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Diff for: extension.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function activate(context) {
1515
error('No folders are open')
1616
} else {
1717
environment = new Environment('DevelopmentServer');
18-
app.start(environment)
18+
app.start(environment, { toolbar: true })
1919
.then(message => {
2020
if (message) {
2121
info(message);
@@ -33,7 +33,7 @@ function activate(context) {
3333
error('No folders are open')
3434
} else {
3535
environment = new Environment('DevelopmentServer');
36-
app.start(environment, { record: false })
36+
app.start(environment, { toolbar: false })
3737
.then(message => {
3838
if (message) {
3939
info(message);

Diff for: middleware/record.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ const utils = require('../utils'),
1111
* @author huk/2016.10.17
1212
*/
1313
module.exports = exports = function(app, config, environment) {
14-
var header = '<script src="/developmentServer/extend.js"></script><script src="/developmentServer/livereload.js"></script><link rel="stylesheet" media="screen" href="/developmentServer/toolbar/toolbar.css">',
14+
var toolbar = '<script src="/developmentServer/extend.js"></script><link rel="stylesheet" media="screen" href="/developmentServer/toolbar/toolbar.css">',
15+
live = '<script src="/developmentServer/livereload.js"></script>',
16+
// var header = '<script src="/developmentServer/extend.js"></script><script src="/developmentServer/livereload.js"></script><link rel="stylesheet" media="screen" href="/developmentServer/toolbar/toolbar.css">',
1517
ignore = [/\.js(\?.*)?$/, /\.css(\?.*)?$/, /\.svg(\?.*)?$/, /\.ico(\?.*)?$/,
1618
/\.woff(\?.*)?$/, /\.png(\?.*)?$/, /\.jpg(\?.*)?$/, /\.jpeg(\?.*)?$/, /\.gif(\?.*)?$/, /\.pdf(\?.*)?$/,
1719
/\.json(\?.*)?$/
@@ -63,13 +65,16 @@ module.exports = exports = function(app, config, environment) {
6365
var rule = /<head>/;
6466
if (rule.test(body)) {
6567
body = body.replace(rule, function(w) {
66-
return w + header;
68+
return w + live + (config.toolbar ? toolbar : '');
6769
});
6870
}
6971
return body;
7072
}
7173

7274
function injectBody(body, host) {
75+
if (!config.toolbar) {
76+
return body;
77+
}
7378
var _body = body;
7479
let content = utils.readFile(path.join(utils.getCurrentPath(), "extend/toolbar/toolbar.html"))
7580
rules.some(function(rule) {

Diff for: utils/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ class Utils {
232232
* @memberOf Utils
233233
*/
234234
registeMiddleWares(app, config, environment, middlewares) {
235-
//var isUndefined = this.isUndefined;
236235
middlewares.forEach(item => {
237236
if (this.isUndefined(config[item]) || config[item]) {
238237
const middleware = this.checkAndImportModule(item.path, `../middleware/${item}`);

0 commit comments

Comments
 (0)