Merge branch 'release-0.7.12'

dmolsen · dmolsen · commit ff3143133311 · 2014-03-24T16:46:41.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.7.12
+ - FIX: making sure only the hostname shows up for the websocket servers. no ports.
+ - THX: thanks to @levito for the pull request
+
 PL-v0.7.11
  - FIX: migrator now orders migrations properly for ubuntu
  - THX: thanks to @krulik for reporting the issue & @paulovieira for confirming the fix
diff --git a/core/builder.php b/core/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.7.11
+ * Pattern Lab Builder CLI - v0.7.12
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/config/config.ini.default b/core/config/config.ini.default
@@ -3,7 +3,7 @@
  * If config.ini doesn't exist Pattern Lab will try to create a new version
  */
 
-v  = "0.7.11"
+v  = "0.7.12"
 
 // file extensions to ignore when building or watching the source dir, separate with a comma
 ie = "scss,DS_Store,less"
diff --git a/core/lib/PatternLab/Builder.php b/core/lib/PatternLab/Builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.7.11
+ * Pattern Lab Builder Class - v0.7.12
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Configurer.php b/core/lib/PatternLab/Configurer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Configurer Class - v0.7.11
+ * Pattern Lab Configurer Class - v0.7.12
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Console.php b/core/lib/PatternLab/Console.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Console Class - v0.7.11
+ * Pattern Lab Console Class - v0.7.12
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Generator.php b/core/lib/PatternLab/Generator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.7.11
+ * Pattern Lab Generator Class - v0.7.12
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Migrator.php b/core/lib/PatternLab/Migrator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Migrator Class - v0.7.11
+ * Pattern Lab Migrator Class - v0.7.12
  *
  * Copyright (c) 2014 Dave Olsen http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Watcher.php b/core/lib/PatternLab/Watcher.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.7.11
+ * Pattern Lab Watcher Class - v0.7.12
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/styleguide/js/synclisteners.js b/core/styleguide/js/synclisteners.js
@@ -1,4 +1,3 @@
-
 /*!
  * Sync Listeners, v0.1
  *
@@ -17,7 +16,7 @@ var wsn;
 var wsnConnected = false;
 var wsc;
 var wscConnected = false;
-var host = (window.location.host !== "") ? window.location.host : "127.0.0.1";
+var host = (window.location.hostname !== "") ? window.location.hostname : "127.0.0.1";
 
 // handle page updates from one browser to another
 function connectPageFollowSync() {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/*!`
`4`		`- * Pattern Lab Builder CLI - v0.7.11`
	`4`	`+ * Pattern Lab Builder CLI - v0.7.12`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com`
`7`	`7`	`* Licensed under the MIT license`