Skip to content

Commit

Permalink
Merge pull request #65 from pattern-lab/plnode1-5
Browse files Browse the repository at this point in the history
Plnode1 5
  • Loading branch information
Brian Muenzenmeyer committed Oct 3, 2014
2 parents fadde70 + 0da26a1 commit ecf078f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 13 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.

PL-node-v0.1.5
- ADD: Live reload support for grunt serve task
- THX: thanks @marcinmodestowicz for the configuration fix. VERY useful :)

PL-node-v0.1.4
- FIX: Resolved issue with nested pattern rendering
- FIX: Supporting flat pattern name regex's in unix-systems
Expand Down
11 changes: 6 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ module.exports = function(grunt) {
// tasks: ['default']
// },
all: {
options: {
livereload: true
},
files: [
'source/_patterns/**/*.mustache',
'source/_patterns/**/*.json',
Expand Down Expand Up @@ -81,7 +84,8 @@ module.exports = function(grunt) {
port: 9001,
base: './public',
hostname: 'localhost',
keepalive: true
open: true,
livereload: 35729
}
}
}
Expand All @@ -99,9 +103,6 @@ module.exports = function(grunt) {
//travis CI task
grunt.registerTask('travis', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'nodeunit']);

grunt.registerTask('serve', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'connect:app']);
//need to get livereload working
//http://www.thecrumb.com/2014/03/16/using-grunt-for-live-reload-revisited/
//http://rhumaric.com/2013/07/renewing-the-grunt-livereload-magic/
grunt.registerTask('serve', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'connect', 'watch']);

};
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ Pattern states should be lowercase and use hyphens where spaces are present.
```

##### Server
Running `grunt serve` will compile the patternlab front end and host it on <a href="http://localhost:9001">http://localhost:9001</a> by default. This can be changed in the `Gruntfile.js`

**Next steps: Livereload and watches**
Running `grunt serve` will compile the patternlab front end and host it on <a href="http://localhost:9001">http://localhost:9001</a> by default. Page will reload on any saved source code change.

### Under Active Development

Expand Down
2 changes: 1 addition & 1 deletion builder/object_factory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* patternlab-node - v0.1.4 - 2014
* patternlab-node - v0.1.5 - 2014
*
* Brian Muenzenmeyer, and the web community.
* Licensed under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion builder/patternlab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* patternlab-node - v0.1.4 - 2014
* patternlab-node - v0.1.5 - 2014
*
* Brian Muenzenmeyer, and the web community.
* Licensed under the MIT license.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "patternlab-node",
"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
"version": "0.1.4",
"version": "0.1.5",
"devDependencies": {
"grunt": "~0.4.0",
"grunt-contrib-watch": "~0.2.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-contrib-sass": "~0.2.2",
"grunt-contrib-copy": "~0.4.0",
"grunt-contrib-jshint": "~0.4.0",
Expand Down
2 changes: 1 addition & 1 deletion public/listeners/synclisteners.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var wsnConnected = false;
var wsc;
var wscConnected = false;
var dataPrevious = 0;
var host = (window.location.host != "") ? window.location.host : "127.0.0.1";
var host = (window.location.host !== '') ? window.location.hostname : '127.0.0.1';

// handle page updates from one browser to another
function connectNavSync() {
Expand Down

0 comments on commit ecf078f

Please sign in to comment.