Skip to content

Commit

Permalink
fixes hexojs#6
Browse files Browse the repository at this point in the history
  • Loading branch information
johnwheeler committed Aug 11, 2015
1 parent b0ad136 commit 4389e3e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
14 changes: 12 additions & 2 deletions lib/browsersync.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@

var Promise = require('bluebird');
var injector = require('connect-injector');
var merge = require('merge');
var browserSync;
var opts = {
logSnippet: false
};

module.exports = function(app){
var self = this;
var config = this.config;

if (config.hasOwnProperty('browsersync') && typeof config.browsersync == 'object') {
opts = merge(opts, config.browsersync);
console.log(opts);
}

return startBroserSync({logSnippet: false}).then(function(bs){
return startBrowserSync(opts).then(function(bs){
var snippet = bs.options.get('snippet');
var queue = [];
var timer;
Expand Down Expand Up @@ -46,7 +56,7 @@ module.exports = function(app){
});
};

function startBroserSync(options){
function startBrowserSync(options){
if (!browserSync) browserSync = require('browser-sync');

return new Promise(function(resolve, reject){
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"dependencies": {
"bluebird": "^2.9.4",
"browser-sync": "^2.0.1",
"connect-injector": "^0.4.2"
"connect-injector": "^0.4.2",
"merge": "^1.2.0"
},
"devDependencies": {
"chai": "^1.9.1",
Expand Down

0 comments on commit 4389e3e

Please sign in to comment.